Changeset 1252 for branches

Timestamp:

09/25/14 10:08:30 (10 years ago)

Author:

nanardon

Message:

merge latest fixes from trunk

Location:

branches/4.0

Files:

• . (copied) (copied from tags/4.0.0) (1 prop)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm (modified) (2 diffs)
• LATMOS-Accounts-Web/root/html/search/index.tt (modified) (1 diff)
• LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm (modified) (3 diffs)
• LATMOS-Accounts/man/man5/latmos-accounts.ini.pod (modified) (1 diff)

branches/4.0/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web.pm

@@ -290 +290 @@
             label => 'Renvois',
         },
+        managedAlsoBy => {
+            label => 'Resp. Adj.',
+        },
+        autoMemberFilter => {
+            label => 'Filtre d\'appatenance',
+        },
     },
 );

branches/4.0/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Root.pm

@@ -4 +4 @@
 use warnings;
 use base 'Catalyst::Controller';
-use utf8;
+no utf8;
 
 #
@@ -43 +43 @@
     } else {
         # No need to login for About section
-        if (!$c->authenticate({ username => $c->req->param('login'), password =>
+        if (!$c->authenticate({ username => $c->req->param('username'), password =>
                     $c->req->param('password') }, 'la')) {
             $c->forward('auth_required');

branches/4.0/LATMOS-Accounts-Web/root/html/search/index.tt

@@ -7 +7 @@
 
 [% IF filter.objectslist.size > 0 %]
-[% IF filter.objectslist.size > 10 %]
+[% IF filter.objectslist.size > 50 %]
 <p>[% filter.objectslist.size %] [% otype %]...</p>
 [% ELSE %]
 
-<h3>[% c.forward('/obj_to_label', [ otype ]) | html %]</h3>
+<h3>[% c.forward('/obj_to_label', [ otype ]) | html %] ([% filter.objectslist.size %])</h3>
 <table>
 [% FOREACH name = filter.objectslist %]

branches/4.0/LATMOS-Accounts/lib/LATMOS/Accounts/Task/Buildnet.pm

@@ -319 +319 @@
     my ($self, $ozone, $output) = @_;
 
-    if (!$self->_la->val('network', 'checkzone')) {
+    if (!$self->_la->val('_network_', 'checkzone')) {
         return 1;
     }
@@ -327 +327 @@
     print $fh $output;
     close($fh);
+
+    my $named_checkzone = $self->_la->val('_network_', 'named-checkzone',
+        '/usr/sbin/named-checkzone');
 
     my $msg;
     my $res = exec_command(sprintf(
             "%s -k fail '%s' '%s'",
-            '/usr/sbin/named-checkzone',
+            $named_checkzone,
             $ozone->id,
             $filename,
@@ -355 +358 @@
         if ($ozone->get_attributes('description'));
     push @output, sprintf('Generated by %s', q$Id: BuildNet.pm 6283 2011-05-20 10:16:51Z nanardon $ );
-    push @output, sprintf('  The %s', scalar(localtime) );
+    push @output, sprintf('          the %s', scalar(localtime) );
     push @output, sprintf('Network: %s', join(', ', $ozone->get_attributes('net')))
         if ($ozone->get_attributes('net'));

branches/4.0/LATMOS-Accounts/man/man5/latmos-accounts.ini.pod

@@ -99 +99 @@
 analysis.
 
+=head2 named-checkzone
+
+The binary location of named-checkzone, default is C</usr/sbin/named-checkzone>.
+
 =head2 BASES SECTIONS