Changeset 1662

Timestamp:

01/26/16 18:42:54 (8 years ago)

Author:

nanardon

Message:

Split the users/ code

Location:

trunk/LATMOS-Accounts-Web

Files:

• MANIFEST (modified) (3 diffs)
• lib/LATMOS/Accounts/Web/Controller/Users (added)
• lib/LATMOS/Accounts/Web/Controller/Users.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Web/Controller/Users/Employment.pm (added)
• root/html/users/Display.tt (moved) (moved from trunk/LATMOS-Accounts-Web/root/html/users/default.tt) (1 diff)
• root/html/users/address.tt (modified) (5 diffs)
• root/html/users/employment.tt (modified) (1 diff)
• root/html/users/menu.tt (deleted)
• root/html/users/my.tt (modified) (1 diff)
• root/html/users/object_header.tt (modified) (1 diff)
• t/controller_Users-Employment.t (added)

trunk/LATMOS-Accounts-Web/MANIFEST

@@ -54 +54 @@
 lib/LATMOS/Accounts/Web/Controller/Summary/Tree.pm
 lib/LATMOS/Accounts/Web/Controller/Users.pm
+lib/LATMOS/Accounts/Web/Controller/Users/Employment.pm
 lib/LATMOS/Accounts/Web/I18N/fr.po
 lib/LATMOS/Accounts/Web/I18N/messages.pot
@@ -138 +139 @@
 root/html/summary/rh/index.tt
 root/html/summary/tree/index.tt
+root/html/users/Display.tt
 root/html/users/address.tt
 root/html/users/address_form.tt
-root/html/users/default.tt
 root/html/users/employment.tt
 root/html/users/groups.tt
 root/html/users/index.tt
 root/html/users/mail.tt
-root/html/users/menu.tt
 root/html/users/my.tt
 root/html/users/object_header.tt
@@ -312 +312 @@
 t/controller_Summary-Offices.t
 t/controller_Summary-Rh.t
+t/controller_Users-Employment.t
 t/controller_Users.t
 t/model_Accounts.t

trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Users.pm

@@ -34 +34 @@
 }
 
+sub users :PathPart('users') Chained('/') CaptureArgs(1) {
+    my ( $self, $c, $username ) = @_;
+
+    $c->stash->{subform} = (split('/', ($c->req->path ||'')))[2];
+
+    my $base = $c->model('Accounts')->db;
+
+    $c->stash->{page}{title} = "Utilisateur :: $username";
+    $c->stash->{username} = $username;
+    $c->stash->{user} = $base->get_object('user', $username) or do {
+        $c->forward('/no_object');
+        return;
+    };
+    $c->stash->{page}{title} = "Utilisateur :: $username";
+
+    if ($c->req->param('make_active')) {
+        $c->stash->{user}->set_c_fields('unexported' => undef);
+        $base->commit;
+    }
+    if ($c->req->param('make_inactive')) {
+        $c->stash->{user}->set_c_fields('unexported' => 1);
+        $base->commit;
+    }
+    if ($c->req->param('delete')) {
+        $base->delete_object('user', $username);
+        $base->commit;
+        $c->res->redirect('/users');
+        return;
+    }
+}
+
+sub Display :PathPart('') Chained('users') Args(0) {
+    my ( $self, $c ) = @_;
+
+    if ($c->config->{features}->{user_employment}) {
+        #Replace standard RH form by employment
+        $c->detach('/users/employment/index');
+        return 1;
+    }
+
+    $c->stash->{form} = $c->model('AttrForms', 'user', $c->stash->{user});
+    $c->stash->{form}->set_attrs;
+
+}
+
+sub Sys :PathPart('sys') Chained('users') Args(0) {
+    my ( $self, $c ) = @_;
+
+    $c->stash->{template} = 'users/Display.tt';
+
+    $c->stash->{form} = $c->model('AttrForms', 'usersys', $c->stash->{user});
+    $c->stash->{form}->set_attrs;
+
+}
+
+sub Mail :PathPart('mail') Chained('users') Args(0) {
+    my ($self, $c) = @_;
+
+    my $base = $c->model('Accounts')->db;
+
+    $c->stash->{db} = $base;
+    $c->stash->{template} = 'users/mail.tt';
+
+    if ($c->req->param('usermail')) {
+
+        my %expaliases = map { $_ => 1 } $c->req->param('expaliases');
+        foreach my $alias ($c->stash->{user}->get_attributes('aliases'), $c->stash->{user}->id) {
+            my $oalias = $base->get_object('aliases', $alias) or next;
+            if (($expaliases{ $alias } || 0) xor ($oalias->get_c_field('exported') || 0)) {
+                $oalias->set_c_fields('unexported' => ($expaliases{ $alias } ? undef : 1)) or do {
+                    $base->rollback;
+                    last;
+                };
+            }
+        }
+        $c->stash->{user}->set_c_fields(
+            mail => $c->req->param('mail') || undef,
+            aliases => [ grep { $_ } $c->req->param('aliases') ],
+            revaliases => $c->req->param('revaliases') || undef,
+            forward => $c->req->param('forward') || undef,
+        ) or do {
+            $base->rollback;
+            last;
+        };
+
+        $base->commit;
+    }
+}
+
+sub Password :PathPart('passwd') Chained('users') Args(0) {
+    my ($self, $c) = @_;
+    my $username = $c->stash->{username};
+
+    my $base = $c->model('Accounts')->db;
+
+    $c->stash->{template} = 'users/passwd.tt';
+    if ($c->req->param('passwd')) {
+        if ($base->check_acl($c->stash->{user}, 'userPassword', 'w')) {
+            if ($c->req->param('passwd') eq ($c->req->param('cpasswd') || '')) {
+                $c->stash->{pmerror} = $c->forward('change_password',
+                    [ $username, $c->req->param('passwd') ] ) || 'Mot de passe changé';
+            } else {
+                $c->stash->{pmerror} = 'Mot de passe différents';
+            }
+        }
+    }
+}
+
+sub Groups :PathPart('groups') Chained('users') Args(0) {
+    my ($self, $c) = @_;
+    my $username = $c->stash->{username};
+    $c->stash->{template} = 'users/groups.tt';
+
+    my $base = $c->model('Accounts')->db;
+
+    # list of group for which users can be added
+    my %ingroups = map { $_ => 1 } @{ $c->stash->{user}->get_c_field('memberOf') || []};
+    if ($c->req->param('addgroup')) {
+        $c->stash->{user}->set_c_fields('memberOf', [ keys %ingroups, $c->req->param('addgroup') ]);
+        $c->stash->{user}->base->commit;
+        # reread:
+        %ingroups = map { $_ => 1 } @{ $c->stash->{user}->get_c_field('memberOf') || []};
+    } elsif ($c->req->param('delgroup')) {
+        $c->stash->{user}->set_c_fields('memberOf',
+            [ grep { $_ ne $c->req->param('delgroup') } keys %ingroups ]
+        );
+        $c->stash->{user}->base->commit;
+        %ingroups = map { $_ => 1 } @{ $c->stash->{user}->get_c_field('memberOf') || []};
+    }
+
+    $c->stash->{othergroups} = [ grep { ! $ingroups{$_} } $base->list_objects('group') ];
+}
+
+sub AddressCommon :PathPart('') Chained('users') CaptureArgs(0) {
+    my ($self, $c) = @_;
+
+    my $username = $c->stash->{username};
+
+    my $base = $c->model('Accounts')->db;
+
+
+    if ($c->req->param('main')) {
+        if (my $ad = $base->get_object('address',
+                $c->req->param('main'))) {
+            $ad->base->commit;
+        }
+    }
+    $c->stash->{template} = 'users/address.tt';
+}
+
+sub Address :PathPart('address') Chained('AddressCommon') Args(0) {
+    my ($self, $c) = @_;
+
+    my $base = $c->model('Accounts')->db;
+    my $username = $c->stash->{username};
+
+    if ($c->req->param('del_addr')) {
+        $base->delete_object('address', $c->req->param('del_addr'));
+        $base->commit;
+    } elsif ($c->req->param('add_addr')) {
+        my $addname = $username . join('', map
+            {('a'..'z')[rand(26)]}(0..4));
+        if ($base->create_c_object('address',
+                $addname,
+                user => $username,
+            )) {
+            $base->commit;
+            $c->res->redirect($c->uri_for($username, 'address',
+                    $addname));
+            return;
+        }
+    }
+    my ($main) = $c->stash->{user}->get_attributes('otheraddress');
+    if ($main) {
+        $c->detach('AddressDisplay', [ $main ]);
+    }
+}
+
+sub AddressDisplay :PathPart('address') Chained('AddressCommon') Args(1) {
+    my ($self, $c, $arg) = @_;
+
+    my $base = $c->model('Accounts')->db;
+
+    $c->stash->{address} = $base->get_object('address', $arg);
+    $c->stash->{form} = $c->model('AttrForms', 'address',
+        $c->stash->{address});
+    $c->stash->{form}->set_attrs;
+}
+
+sub my :PathPart('my') Chained('users') Args(0) {
+    my ($self, $c) = @_;
+}
 
 sub change_password : Private {
@@ -63 +255 @@
 }
 
-sub default : LocalPath {
-    my ( $self, $c, undef, $username, $subform, $arg ) = @_;
-
-    if ($c->config->{features}->{user_employment}) {
-        # Replace standard RH form by employment
-        $subform ||= 'employment';
-    }
-
-    my $base = $c->model('Accounts')->db;
-
-    $c->stash->{page}{title} = "Utilisateur :: $username";
-    $c->stash->{username} = $username;
-    $c->stash->{user} = $base->get_object('user', $username) or do {
-        $c->forward('/no_object');
-        return;
-    };
-    $c->stash->{subform} = $subform || '';
-    $c->stash->{page}{title} = "Utilisateur :: $username";
-
-    if ($c->req->param('make_active')) {
-        $c->stash->{user}->set_c_fields('unexported' => undef);
-        $base->commit;
-    }
-    if ($c->req->param('make_inactive')) {
-        $c->stash->{user}->set_c_fields('unexported' => 1);
-        $base->commit;
-    }
-    if ($c->req->param('delete')) {
-        $base->delete_object('user', $username);
-        $base->commit;
-        $c->res->redirect('/users');
-    }
-
-
-    for ($subform || '') {
-        # Exceptions...
-        /^employment$/ and do {
-            if (my $delemp = $c->req->param('delemployment')) {
-                $base->delete_object('employment', $delemp);
-                $base->commit;
-            }
-            $arg ||= $c->stash->{user}->get_attributes('currentEmployment') ||
-                     $c->stash->{user}->get_attributes('nextEmployment');
-
-            $c->stash->{employment} = $base->get_object('employment', $arg) unless($arg =~ /^\@/);
-            $c->stash->{forme} = $c->model('AttrForms', 'employment',
-                $c->stash->{employment} ? $c->stash->{employment} : 'employment', $base);
-            $c->stash->{forme}->set_attrs if($c->stash->{employment});
-            $c->stash->{template} = 'users/employment.tt';
-            if ($arg) {
-                if ($arg =~ m/^\@/) {
-                    $c->stash->{newemployment} = 1;
-                    if ($arg =~ m/\@duplicate/i) {
-                        my $oldempl = $c->model('Accounts')->db->get_object('employment', 
-                            $c->req->param('source')
-                            ? $c->req->param('source')
-                            : ($c->stash->{user}->listEmployment)[0])
-                            or return;
-                        foreach (qw(company managerContact contratType department)) {
-                            $c->req->params->{$_} = $oldempl->get_attributes($_);
-                        }
-                        if (my $lastday = $oldempl->get_attributes('lastday')) {
-                            my $time = DateTime->from_epoch(epoch => str2time($lastday));
-                            $time->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-                            $time->add( days => 1 );
-                            $c->req->params->{firstday} = $time->ymd;
-                        }
-                    } elsif ($arg =~ m/\@create/i) {
-
-                        for (1) {
-                            my $frtoen = $c->req->param('firstday');
-                            # Date::Parse understand only mm/dd/yyyy...
-                            $frtoen =~ s:^(\d+)/(\d+)/(\d+):$2/$1/$3:;
-                            my $time = str2time($frtoen) or last;
-                            my $lastd = DateTime->from_epoch( epoch => $time )
-                                ->set_time_zone( DateTime::TimeZone->new( name => 'local' ) );
-
-                            my ($empl) = $c->stash->{user}->listEmployment;
-                            if ($empl) {
-                                my $obj = $c->model('Accounts')->db->get_object('employment', $empl);
-                                if (!$obj->get_attributes('lastday')) {
-                                    $obj->set_c_fields(lastday => $lastd->subtract(days => 1)->ymd('-'));
-                                } 
-                            }
-
-                            my $id = $username . '-' . $lastd->ymd('-');
-                            $c->req->params->{user} = $username;
-                            if ($id = $c->stash->{forme}->set_attrs([ 'user',
-                                        map { $_->name } $c->stash->{forme}->write_attributes], $id)) {
-                                $c->res->redirect($c->uri_for('/users', $username, 'employment', $id));
-                                return 1;
-                            }
-                        }
-                    }
-                }
-            }
-            
-        };
-        /^passwd$/ and do {
-            $c->stash->{template} = 'users/passwd.tt';
-            if ($c->req->param('passwd')) {
-                if ($base->check_acl($c->stash->{user}, 'userPassword', 'w')) {
-                    if ($c->req->param('passwd') eq ($c->req->param('cpasswd') || '')) {
-                        $c->stash->{pmerror} = $c->forward('change_password',
-                            [ $username, $c->req->param('passwd') ] ) || 'Mot de passe changé';
-                    } else {
-                        $c->stash->{pmerror} = 'Mot de passe différents';
-                    }
-                }
-            }
-            last;
-        };
-        /^groups$/ and do {
-            $c->stash->{template} = 'users/groups.tt';
-            # list of group for which users can be added
-            my %ingroups = map { $_ => 1 } @{ $c->stash->{user}->get_c_field('memberOf') || []};
-            if ($c->req->param('addgroup')) {
-                $c->stash->{user}->set_c_fields('memberOf', [ keys %ingroups, $c->req->param('addgroup') ]);
-                $c->stash->{user}->base->commit;
-                # reread:
-                %ingroups = map { $_ => 1 } @{ $c->stash->{user}->get_c_field('memberOf') || []};
-            } elsif ($c->req->param('delgroup')) {
-                $c->stash->{user}->set_c_fields('memberOf',
-                    [ grep { $_ ne $c->req->param('delgroup') } keys %ingroups ]
-                );
-                $c->stash->{user}->base->commit;
-                %ingroups = map { $_ => 1 } @{ $c->stash->{user}->get_c_field('memberOf') || []};
-            }
-
-            $c->stash->{othergroups} = [ grep { ! $ingroups{$_} } $base->list_objects('group') ];
-            last;
-        };
-        /^address$/ and do {
-            if ($arg) {
-                $c->stash->{address} = $base->get_object('address', $arg);
-            } else {
-
-                if ($c->req->param('del_addr')) {
-                    $base->delete_object('address', $c->req->param('del_addr'));
-                    $base->commit;
-                } elsif ($c->req->param('add_addr')) {
-                    my $addname = $username . join('', map
-                        {('a'..'z')[rand(26)]}(0..4));
-                    if ($base->create_c_object('address',
-                        $addname,
-                        user => $username,
-                    )) {
-                        $base->commit;
-                        $c->res->redirect($c->uri_for($username, 'address',
-                                $addname));
-                        return;
-                    }
-                } elsif ($c->req->param('main')) {
-                    if (my $ad = $base->get_object('address',
-                            $c->req->param('main'))) {
-                        $ad->base->commit;
-                    }
-                }
-
-                my ($main) = $c->stash->{user}->get_attributes('otheraddress');
-                $c->stash->{address} = $base->get_object('address', $main);
-            }
-            if ($c->stash->{address}) {
-                $c->stash->{form} = $c->model('AttrForms', 'address',
-                    $c->stash->{address});
-                $c->stash->{form}->set_attrs;
-            }
-            $c->stash->{template} = 'users/address.tt';
-
-            last;
-        };
-        /^mail$/ and do {
-
-            $c->stash->{db} = $base;
-            $c->stash->{template} = 'users/mail.tt';
-
-            if ($c->req->param('usermail')) {
-
-                my %expaliases = map { $_ => 1 } $c->req->param('expaliases');
-                foreach my $alias ($c->stash->{user}->get_attributes('aliases'), $c->stash->{user}->id) {
-                    my $oalias = $base->get_object('aliases', $alias) or next;
-                    if (($expaliases{ $alias } || 0) xor ($oalias->get_c_field('exported') || 0)) {
-                        $oalias->set_c_fields('unexported' => ($expaliases{ $alias } ? undef : 1)) or do {
-                            $base->rollback;
-                            last;
-                        };
-                    }
-                }
-                $c->stash->{user}->set_c_fields(
-                    mail => $c->req->param('mail') || undef,
-                    aliases => [ grep { $_ } $c->req->param('aliases') ],
-                    revaliases => $c->req->param('revaliases') || undef,
-                    forward => $c->req->param('forward') || undef,
-                ) or do {
-                    $base->rollback;
-                    last;
-                };
-
-                $base->commit;
-            }
-
-            last;
-        };
-        /^my$/ and do {
-            $c->stash->{db} = $base;
-            $c->stash->{template} = 'users/my.tt';
-        };
-        /^dump$/ and do {
-            $c->stash->{db} = $base;
-            $c->stash->{template} = 'users/dump.tt'
-            #$c->res->body($c->stash->{user}->dump({only_rw => 1}));
-        };
-
-        $c->stash->{form} = $c->model('AttrForms', 'user' . $c->stash->{subform}, $c->stash->{user});
-        $c->stash->{form}->set_attrs;
-    }
-}
-
 =head1 AUTHOR
 

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

@@ -9 +9 @@
 [% INCLUDE 'includes/form.tt'
     form = form
-    form_uri = c.uri_for(username, subform) %]
+    form_uri = c.uri_for('/' _ c.req.path) %]
 </div>
 [% END %]

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

@@ -16 +16 @@
             [% loop.count %]:
             [% IF address.id != idaddress %]
-            <a href="[% c.uri_for(username, subform, idaddress) %]">
+            <a href="[% c.uri_for(username, 'address', idaddress) %]">
             [% END %]
 
@@ -35 +35 @@
 
         [% IF laddress.base.check_acl(laddress, '@DELETE', 'w') %]
-        <form action="[% c.uri_for(username, subform) %]" method="POST"
+        <form action="[% c.uri_for(username, 'address') %]" method="POST"
             style="display:inline">
         <input type="hidden" name="del_addr" value="[% laddress.id | html %]">
@@ -49 +49 @@
         [% IF NOT laddress.get_c_field('isMainAddress') %]
         <td>
-        <form action="[% c.uri_for(username, subform) %]" method="POST"
+        <form action="[% c.uri_for('/users', username, 'address') %]" method="POST"
             style="display:inline;">
         <input type="hidden" name="main" value="[% laddress.id | html %]">
@@ -68 +68 @@
           c.model('Accounts').db.check_acl('address', '@CREATE', 'w') %]
     <tr><td colspan=3 align="center">
-    <form action="[% c.uri_for(username, subform) %]" method="POST">
+    <form action="[% c.uri_for('/users', username, 'address') %]" method="POST">
     <input type="hidden" name="add_addr" value="1">
     <input type="submit" value="Ajouter une addresse">
@@ -80 +80 @@
 [% IF address %]
 
-<form action="[% c.uri_for(username, subform, address.id) %]" method="POST">
+<form action="[% c.uri_for('/users', username, 'address', address.id) %]" method="POST">
 [% INCLUDE 'users/address_form.tt' %]
 </form>

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

@@ -48 +48 @@
 
 <div style="display: inline-block;">
-    <form action="[% c.uri_for(username, subform, employment.id || '@create') %]" method="POST">
+    <form action="[% c.uri_for('/users', username, 'employment', employment.id || '@create') %]" method="POST">
     <table border=1>
     [% FOREACH attr =  form.attributes %]

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

@@ -7 +7 @@
 
 <div id="objectform" class="objectform">
-
+[% db = c.model('Accounts').db %]
 
 [% FOREACH h = db.search_objects('group', 'managedBy=' _ username) %]

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

@@ -55 +55 @@
 
 <div id="omenu">
-        <a href="[% c.uri_for(username) %]"><span [% 'id="oactive"' IF subform == '' %]>Statut RH</span></a>
+        <a href="[% c.uri_for(username) %]"><span [% 'id="oactive"' IF subform == '' || subform == 'employment' %]>Statut RH</span></a>
         <a href="[% c.uri_for(username, 'sys') %]"><span [% 'id="oactive"' IF subform == 'sys' %]>SystÚme</span></a>
         <a href="[% c.uri_for(username, 'groups') %]"><span [% 'id="oactive"' IF subform == 'groups' %]>Groupes</span></a>