Changeset 1865 for trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts

Timestamp:

12/21/16 15:07:28 (8 years ago)

Author:

nanardon

Message:

Merge branch

Location:

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web

Files:

• Controller/OAliases.pm (added)
• I18N/fr.po (modified) (10 diffs)
• I18N/messages.pot (modified) (10 diffs)
• Model/AttrFilter.pm (modified) (1 diff)
• Model/AttrForms.pm (modified) (1 diff)

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/fr.po

@@ -34 +34 @@
 msgstr "%1 ans"
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:51
-#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:79
-#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:84
-#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:97
+#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:126
+#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:131
+#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:145
+#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:77
 #: lib/LATMOS/Accounts/Web/Controller/Json/Expire.pm:44
 msgid "(none)"
@@ -49 +49 @@
 msgid "About"
 msgstr "À propos"
+
+#: root/html/summary/accage/index.tt:5
+msgid "Active/Non active"
+msgstr ""
 
 #: lib/LATMOS/Accounts/Web/Controller/Json/Timeline.pm:127
@@ -64 +68 @@
 msgstr "Arrivée"
 
-#: root/html/includes/sidebar.tt:16
+#: root/html/includes/sidebar.tt:15
 msgid "Change my password"
 msgstr "Changer mon mot de passe"
 
-#: root/html/includes/sidebar.tt:9
+#: root/html/includes/sidebar.tt:8
 msgid "Connected as"
 msgstr "Connecté en tant que"
 
-#: root/html/includes/sidebar.tt:38
+#: root/html/includes/sidebar.tt:37
 msgid "Create"
 msgstr "Créer"
@@ -85 +89 @@
 msgstr "Statut actuel"
 
-#: root/html/summary/employment/index.tt:6
+#: root/html/summary/accage/index.tt:7 root/html/summary/employment/index.tt:6
 msgid "Department"
 msgstr "Départment"
@@ -101 +105 @@
 msgstr "Expiration"
 
+#: root/html/summary/employment/index.tt:12
+msgid "Filter"
+msgstr ""
+
 #: root/html/users/employment.tt:91
 msgid "From"
 msgstr "Du"
 
-#: root/html/includes/wrapper.tt:56
+#: root/html/includes/wrapper.tt:57
 msgid "IT management"
 msgstr "Gestion informatique"
@@ -113 +121 @@
 msgstr "Départ"
 
-#: root/html/includes/sidebar.tt:21
+#: root/html/includes/sidebar.tt:20
 msgid "Logout"
 msgstr "Se déconnecter"
@@ -121 +129 @@
 msgstr "Nouveau statut"
 
+#: root/html/summary/accage/index.tt:13
+msgid "Show inactive accounts"
+msgstr ""
+
 #: root/html/users/employment.tt:94
 msgid "Since"
 msgstr "A partir du"
+
+#: root/html/summary/employment/index.tt:10
+msgid "Site"
+msgstr ""
 
 #: root/html/summary/employment/index.tt:3
@@ -129 +145 @@
 msgstr "Trié par"
 
-#: root/html/summary/employment/index.tt:11
+#: root/html/summary/employment/index.tt:19
 msgid "Stacked"
 msgstr "Cumulé"
@@ -137 +153 @@
 msgstr "Statistiques"
 
-#: root/html/groups/dpmt.tt:91 root/html/summary/employment/index.tt:8
+#: root/html/groups/dpmt.tt:91 root/html/summary/accage/index.tt:9
+#: root/html/summary/employment/index.tt:8
 msgid "Status"
 msgstr "Statut"
 
-#: root/html/includes/sidebar.tt:58
+#: root/html/includes/sidebar.tt:57
 msgid "Status evolution"
 msgstr "Évolution des status"
@@ -153 +170 @@
 msgstr "Aujourd'hui"
 
-#: root/html/includes/sidebar.tt:50
+#: root/html/includes/sidebar.tt:49
 msgid "Tools"
 msgstr "Outils"
 
-#: root/html/includes/sidebar.tt:28
+#: root/html/includes/sidebar.tt:27
 msgid "View"
 msgstr "Voir"

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/I18N/messages.pot

@@ -31 +31 @@
 msgstr ""
 
-#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:51 lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:79 lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:84 lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:97 lib/LATMOS/Accounts/Web/Controller/Json/Expire.pm:44
+#: lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:126 lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:131 lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:145 lib/LATMOS/Accounts/Web/Controller/Json/Employment.pm:77 lib/LATMOS/Accounts/Web/Controller/Json/Expire.pm:44
 msgid "(none)"
 msgstr ""
@@ -41 +41 @@
 #: root/html/includes/sidebar.tt:76
 msgid "About"
+msgstr ""
+
+#: root/html/summary/accage/index.tt:5
+msgid "Active/Non active"
 msgstr ""
 
@@ -55 +59 @@
 msgstr ""
 
-#: root/html/includes/sidebar.tt:16
+#: root/html/includes/sidebar.tt:15
 msgid "Change my password"
 msgstr ""
 
-#: root/html/includes/sidebar.tt:9
+#: root/html/includes/sidebar.tt:8
 msgid "Connected as"
 msgstr ""
 
-#: root/html/includes/sidebar.tt:38
+#: root/html/includes/sidebar.tt:37
 msgid "Create"
 msgstr ""
@@ -75 +79 @@
 msgstr ""
 
-#: root/html/summary/employment/index.tt:6
+#: root/html/summary/accage/index.tt:7 root/html/summary/employment/index.tt:6
 msgid "Department"
 msgstr ""
@@ -91 +95 @@
 msgstr ""
 
+#: root/html/summary/employment/index.tt:12
+msgid "Filter"
+msgstr ""
+
 #: root/html/users/employment.tt:91
 msgid "From"
 msgstr ""
 
-#: root/html/includes/wrapper.tt:56
+#: root/html/includes/wrapper.tt:57
 msgid "IT management"
 msgstr ""
@@ -103 +111 @@
 msgstr ""
 
-#: root/html/includes/sidebar.tt:21
+#: root/html/includes/sidebar.tt:20
 msgid "Logout"
 msgstr ""
@@ -111 +119 @@
 msgstr ""
 
+#: root/html/summary/accage/index.tt:13
+msgid "Show inactive accounts"
+msgstr ""
+
 #: root/html/users/employment.tt:94
 msgid "Since"
+msgstr ""
+
+#: root/html/summary/employment/index.tt:10
+msgid "Site"
 msgstr ""
 
@@ -119 +135 @@
 msgstr ""
 
-#: root/html/summary/employment/index.tt:11
+#: root/html/summary/employment/index.tt:19
 msgid "Stacked"
 msgstr ""
@@ -127 +143 @@
 msgstr ""
 
-#: root/html/groups/dpmt.tt:91 root/html/summary/employment/index.tt:8
+#: root/html/groups/dpmt.tt:91 root/html/summary/accage/index.tt:9 root/html/summary/employment/index.tt:8
 msgid "Status"
 msgstr ""
 
-#: root/html/includes/sidebar.tt:58
+#: root/html/includes/sidebar.tt:57
 msgid "Status evolution"
 msgstr ""
@@ -143 +159 @@
 msgstr ""
 
-#: root/html/includes/sidebar.tt:50
+#: root/html/includes/sidebar.tt:49
 msgid "Tools"
 msgstr ""
 
-#: root/html/includes/sidebar.tt:28
+#: root/html/includes/sidebar.tt:27
 msgid "View"
 msgstr ""

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

@@ -46 +46 @@
             foreach my $attr (@{ $c->config->{objects}{$otype}{quick_search} || [ 'name' ]}) {
                 foreach ($base->search_objects(
-                        $otype, "$attr~" . $c->req->params->{'q'})) {
+                        $otype, "$attr~" . $c->req->params->{'q'},
+                                'oalias=NULL',
+                    )) {
                     $objs{$_} = 1;
                 }

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

@@ -102 +102 @@
         attrs => [ qw(
             isMainAddress
+            expire
             telephoneNumber
             streetAddress