Merge branch 'development' into documentacion

Solvosoft · Nov 22, 2023 · c65d698 · c65d698
2 parents a4b6216 + e32ba8f
commit c65d698
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 6 deletions.
diff --git a/src/auth_and_perms/templates/auth_and_perms/list_organizations.html b/src/auth_and_perms/templates/auth_and_perms/list_organizations.html
@@ -99,7 +99,7 @@
                     </li>
                     {% endif %}
                     {% if perms.auth_and_perms.change_rol %}
-                    <li class="list-group-item">
+                    <li class="list-group-item" title="{% trans 'Change parent of organization' %}">
                         <a class="loglist" href="{% url 'auth_and_perms:list_rol_by_org' node.0.pk %}"  title="{% trans 'Rol List' %}">
                             <i class="fa fa-list-alt"></i></a>
                     </li>
@@ -108,20 +108,21 @@
 
                     {% if perms.laboratory.change_organizationstructure %}
                     <li class="list-group-item">
-                        <span class="orgbyuser" data-formaction="{% url 'laboratory:update_organization' node.0.pk %}" data-org="{{node.0.pk}}" data-display="{{node.0.node}}">
+                        <span class="orgbyuser" data-formaction="{% url 'laboratory:update_organization' node.0.pk %}"
+																														data-org="{{node.0.pk}}" data-display="{{node.0.node}}" title="{% trans 'Change parent of organization' %}">
                             <i class="fa fa-sort-amount-desc text-secondary"></i></span>
                     </li>
                     {% endif %}
                     {% if perms.laboratory.add_organizationstructure %}
                     <li class="list-group-item">
                         <span class="addOrgStructure" data-parent="{{node.0.pk}}"><i
-                                class="fa fa-plus  text-secondary"></i></span>
+                                class="fa fa-plus  text-secondary" title="{% trans 'Add organization' %}"></i></span>
                     </li>
                     {% endif %}
                     {% if perms.laboratory.delete_organizationstructure %}
                     <li class="list-group-item">
                         <a href="{% url 'laboratory:delete_organization' node.0.pk %}"><i
-                                class="fa fa-minus text-danger"></i></a>
+                                class="fa fa-minus text-danger" title="{% trans 'Delete organization' %}"></i></a>
                     </li>
                     {% endif %}
                 </ul>

diff --git a/src/laboratory/templates/laboratory/organizationstructure_confirm_delete.html b/src/laboratory/templates/laboratory/organizationstructure_confirm_delete.html
@@ -6,8 +6,9 @@
 
 <form action="" method="post">{% csrf_token %}
 <p>{% trans 'Are you sure you want to delete' %} "{{ object }}"?</p>
+	<p>{% trans 'This action will delete its descendants organizations too.' %}</p>
 <input class="btn btn-danger" type="submit" value="{% trans 'Confirm' %}" />
 </form>
 <br> <br>
 
-{% endblock%}
+{% endblock%}
diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po
@@ -521,7 +521,7 @@ msgid "Relate Organization with Permission objects"
 msgstr "Relaciona Organizaciones con objetos de permisos"
 
 msgid "Change parent of organization"
-msgstr "Cambia padre en de la organización"
+msgstr "Cambia padre de la organización"
 
 msgid "Name:"
 msgstr "Nombre:"
@@ -4167,3 +4167,9 @@ msgstr "Actualizar consejo de prudencia"
 
 msgid "Update the Danger indication"
 msgstr "Actualizar indicacion de peligro"
+
+msgid "Delete organization"
+msgstr "Eliminar organización"
+
+msgid "This action will delete its descendants organizations too."
+msgstr "Esta acción también eliminará sus organizaciones descendientes."