Changeset 176

Timestamp:

05/24/09 15:42:28 (15 years ago)

Author:

nanardon

Message:

• end user creation

Location:

LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Create.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Web/Model/Accounts.pm (modified) (1 diff)
• lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (1 diff)
• root/html/create/user.tt (modified) (1 diff)
• root/static/icons/dialog-cancel.png (added)

LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Create.pm

@@ -4 +4 @@
 use warnings;
 use base 'LATMOS::Accounts::Web::Controller';
+use LATMOS::Accounts::Utils;
 
 =head1 NAME
@@ -36 +37 @@
         /^1$/ and do {
             $c->stash->{step} = 2;
-            $c->req->params->{id} = lc($c->req->param('sn'));
+            my $acc = $c->model('Accounts')->accounts;
+            foreach ($acc->Parameters('_defattr_')) {
+                if (/^user\.(.*)/) {
+                    $c->req->params->{$1} ||= $acc->val('_defattr_', $_);
+                }
+            }
+            $c->req->params->{exported} = 1;
+            if (! $c->req->params->{id}) {
+                for (1) {
+                    my $login;
+                    if ($c->req->param('sn')) {
+                        $login = lc(to_ascii($c->req->param('sn')));
+                        length($login) > 10 and $login = substr($login, 0, 8);
+                        $base->get_object('user', $login) or do {
+                            $c->req->params->{id} = $login;
+                            last;
+                        };
+                        if ($c->req->param('givenName')) {
+                            length($login) > 8 and $login = substr($login, 0, 8);
+                            $login .= substr(lc(to_ascii($c->req->param('givenName'))), 0, 1);
+                            $base->get_object('user', $login) or do {
+                                $c->req->params->{id} = $login;
+                                last;
+                            };
+                        }
+                    }
+                }
+            }
             last;
         };
         /^2$/ and do {
-            $base->create_c_object('user', $c->req->params->{id}, %{ $c->req->params });
+            $c->stash->{step} = 2;
+            $base->get_object('user', $c->req->params->{id}) and do {
+                $c->stash->{idexists} = 1;
+                return;
+            };
+            $base->create_c_object('user', $c->req->params->{id},
+                %{ $c->req->params },
+                exported => $c->req->param('exported') ? 1 : 0,
+            )
+             or return;
             $base->commit;
             $c->res->redirect($c->uri_for('/users', $c->req->params->{id}));

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

@@ -23 +23 @@
 }
 
+sub accounts {
+    my ($self) = @_;
+    LATMOS::Accounts
+        ->new(LATMOS::Accounts::Web->config->{config})
+}
+
 sub db {
     my ($self) = @_;
-    my $base = LATMOS::Accounts
-        ->new(LATMOS::Accounts::Web->config->{config})
+    my $base = $self->accounts
         ->default_base;
     $base->{wexported} = 1;

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

@@ -97 +97 @@
         attrs => [ qw(
             gidNumber description
+            manager
             sutype exported
         ) ],

LATMOS-Accounts-Web/root/html/create/user.tt

@@ -1 +1 @@
 <!-- $Id$ -->
-[% IF step %]
 <form action="[% c.uri_for('/create', 'user') %]" method="POST">
-<input type="hidden" name="step" value="2">
-Login: <input type="text" name="id" value="[% c.req.param('id') | html %]"><br>
-[% form.attr_label('sn') %] [% form.attr_field('sn') %]<br>
-[% form.attr_label('givenName') %] [% form.attr_field('givenName') %]<br>
-[% form.attr_label('gidNumber') %] [% form.attr_field('gidNumber') %]<br>
-<input type="submit">
-</form>
+<table border="0">
+<tr><td>[% IF idexists %]<img src="[% c.uri_for('/static', 'icons', 'dialog-cancel.png') %]">[% END %]
+Login:</th><td><input type="text" name="id" value="[% c.req.param('id') | html %]"></td></tr>
+<tr><td>[% form.attr_label('sn') %]</td><td>[% form.attr_field('sn') %]</td></tr>
+<tr><td>[% form.attr_label('givenName') %]</td><td>[% form.attr_field('givenName') %]</td></tr>
+<tr><td>[% form.attr_label('description') %]</td><td>[% form.attr_field('description') %]</td></tr>
+[% IF ! step %]
+
+<input type="hidden" name="step" value="1">
 
 [% ELSE %]
-<form action="[% c.uri_for('/create', 'user') %]" method="POST">
-<input type="hidden" name="step" value="1">
-[% form.attr_label('sn') %] [% form.attr_field('sn') %]<br>
-[% form.attr_label('givenName') %] [% form.attr_field('givenName') %]<br>
-<input type="submit">
-</form>
+
+<input type="hidden" name="step" value="2">
+<tr><td>[% form.attr_label('gidNumber') %]</td><td>[% form.attr_field('gidNumber') %]</td></tr>
+<tr><td>[% form.attr_label('uidNumber') %]</td><td>[% form.attr_field('uidNumber') %]</td></tr>
+<tr><td>[% form.attr_label('exported') %]</td><td>[% form.attr_field('exported') %]</td></tr>
 
 [% END %]
+<tr><td colspan="2"><input type="submit"></td></tr>
+</table>
+
+</form>