Changeset 1613 for trunk

Timestamp:

01/08/16 17:10:14 (9 years ago)

Author:

nanardon

Message:

Some fix on employment form

Location:

trunk

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFormsA.pm (modified) (1 diff)
• LATMOS-Accounts-Web/root/html/users/employment.tt (modified) (3 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Address.pm (modified) (1 diff)
• LATMOS-Accounts/po/fr.po (modified) (4 diffs)
• LATMOS-Accounts/po/messages.pot (modified) (4 diffs)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm

@@ -126 +126 @@
             department
             managerContact
-            hosted
         ) ],
     },

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrFormsA.pm

@@ -89 +89 @@
         ($hint ? sprintf('title="%s"', $self->escape($hint)) : ''),
         $self->escape($self->htmlname),
-        $self->escape($self->{label} || $self->htmlname),
+        $self->escape($self->label || $self->htmlname),
     );
 }

trunk/LATMOS-Accounts-Web/root/html/users/employment.tt

@@ -43 +43 @@
 <tr>
     <th>
-        [% form.attr_label(attr) %]
+        [% thisform.attr_label(attr) |html %]
         [% IF thisform.attr_hint(attr) %]
         <span
@@ -100 +100 @@
     </a>
     [% IF co.get_attributes('state') > 0 %]
-<!--
     <form method=POST action="[% c.uri_for('/users', username, 'employment') %]"
         onSubmit="return confirm('Détruire le statut commençant [% co.get_attributes('firstday') %] ?') ? true : false">
@@ -106 +105 @@
     <input type=submit value="Supprimer">
     </form>
--->
     [% END %]
 

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Address.pm

@@ -305 +305 @@
                     }
                 },
-                label => l('o'),
+                label => l('Company'),
             },
             isMainAddress => {

trunk/LATMOS-Accounts/po/fr.po

@@ -23 +23 @@
 #: lib/LATMOS/Accounts/Bases/Objects.pm:654
 #: lib/LATMOS/Accounts/Bases/Objects.pm:691
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:625
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:675
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:633
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:683
 msgid "Attribute %s is not readable"
-msgstr ""
+msgstr "Attribut %s n'est pas lisible"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Aliases.pm:161
@@ -55 +55 @@
 msgstr "Commentaire"
 
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307
 #: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:121
 #: lib/LATMOS/Accounts/Bases/Sql/User.pm:1133
@@ -322 +323 @@
 #: lib/LATMOS/Accounts/Bases/Objects.pm:658
 #: lib/LATMOS/Accounts/Bases/Objects.pm:695
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:629
-#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:679
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:637
+#: lib/LATMOS/Accounts/Bases/Sql/objects.pm:687
 msgid "Permission denied to read attribute %s"
-msgstr ""
+msgstr "Permission non accordé pour lire l'attribut %s"
 
 #: lib/LATMOS/Accounts/Bases/Sql/Address.pm:315
@@ -447 +448 @@
 msgstr "Page Web"
 
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307
-msgid "o"
-msgstr ""
+#~ msgid "o"
+#~ msgstr "Société"

trunk/LATMOS-Accounts/po/messages.pot

@@ -25 +25 @@
 
 #. ($attribute)
-#: lib/LATMOS/Accounts/Bases/Objects.pm:654 lib/LATMOS/Accounts/Bases/Objects.pm:691 lib/LATMOS/Accounts/Bases/Sql/objects.pm:625 lib/LATMOS/Accounts/Bases/Sql/objects.pm:675
+#: lib/LATMOS/Accounts/Bases/Objects.pm:654 lib/LATMOS/Accounts/Bases/Objects.pm:691 lib/LATMOS/Accounts/Bases/Sql/objects.pm:633 lib/LATMOS/Accounts/Bases/Sql/objects.pm:683
 msgid "Attribute %s is not readable"
 msgstr ""
@@ -50 +50 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Bases/Sql/Employment.pm:121 lib/LATMOS/Accounts/Bases/Sql/User.pm:1133 lib/LATMOS/Accounts/Bases/Sql/User.pm:765
+#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307 lib/LATMOS/Accounts/Bases/Sql/Employment.pm:121 lib/LATMOS/Accounts/Bases/Sql/User.pm:1133 lib/LATMOS/Accounts/Bases/Sql/User.pm:765
 msgid "Company"
 msgstr ""
@@ -287 +287 @@
 
 #. ($attribute)
-#: lib/LATMOS/Accounts/Bases/Objects.pm:658 lib/LATMOS/Accounts/Bases/Objects.pm:695 lib/LATMOS/Accounts/Bases/Sql/objects.pm:629 lib/LATMOS/Accounts/Bases/Sql/objects.pm:679
+#: lib/LATMOS/Accounts/Bases/Objects.pm:658 lib/LATMOS/Accounts/Bases/Objects.pm:695 lib/LATMOS/Accounts/Bases/Sql/objects.pm:637 lib/LATMOS/Accounts/Bases/Sql/objects.pm:687
 msgid "Permission denied to read attribute %s"
 msgstr ""
@@ -398 +398 @@
 msgid "Web Page"
 msgstr ""
-
-#: lib/LATMOS/Accounts/Bases/Sql/Address.pm:307
-msgid "o"
-msgstr ""