Changeset 144

Timestamp:

05/19/09 18:41:18 (15 years ago)

Author:

nanardon

Message:

• make AttrForm? model usable also for object creation

Location:

LATMOS-Accounts-Web

Files:

• lib/LATMOS/Accounts/Web/Controller/Create.pm (modified) (2 diffs)
• lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (6 diffs)
• root/html/create/user.tt (modified) (2 diffs)

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

@@ -31 +31 @@
     my ( $self, $c ) = @_;
 
+    my $base = $c->model('Accounts')->db;
+    $c->stash->{form} = $c->model('AttrForms', undef, 'user', $base);
     for ($c->req->param('step') || '') {
         /^1$/ and do {
@@ -38 +40 @@
         };
         /^2$/ and do {
-            my $base = $c->model('Accounts')->db;
             $base->create_c_object('user', $c->req->params->{id}, %{ $c->req->params });
             $base->commit;

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

@@ -101 +101 @@
 }
 
+# call either OBJ or type + base
+
 sub ACCEPT_CONTEXT {
-    my ($self, $c, $form, $object) = @_;
-    $form or return $self;
-    $forms->{$form} or return;
-    $self->{c} = $c;
-    $self->{form} = $form;
-    $self->{object} = $object or return;
-    $self
+    my ($self, $c, $form, $object, $base) = @_;
+    my $new = {};
+    $new->{c} = $c;
+    $new->{form} = $form;
+    $new->{object} = $object if (ref $object);
+    $new->{base} = $base || ($object ? $object->base : undef) or return $self;
+    $new->{otype} = ref $object ? $object->type : $object;
+    bless($new, 'LATMOS::Accounts::Web::Model::AttrForms');
+}
+
+sub base {
+    my ( $self ) = @_;
+    $self->{base}
+}
+
+sub otype {
+    my ($self) = @_;
+    $self->{otype};
 }
 
@@ -118 +131 @@
 sub attributes {
     my ($self) = @_;
-    grep { $self->{object}->get_field_name($_, 'a') }
+    grep { $self->base->get_field_name($self->otype, $_, 'a') }
     @{ $forms->{$self->{form}}->{attrs} };
 }
@@ -127 +140 @@
 }
 
+sub attr_raw_value {
+    my ($self, $attr) = @_;
+    return $self->{c}->req->param($attr) ||
+        ($self->{object} ? $self->{object}->get_c_field($attr) : '')
+}
+
 sub attr_field {
     my ($self, $attr, $type) = @_;
-    $type ||= $self->{object}->get_field_name($attr, 'w')
+    $type ||= $self->base->get_field_name($self->otype, $attr, 'w')
         ? $attrs->{$attr}[1] || ''
         : 'label';
@@ -139 +158 @@
             '<textarea name="%s">%s</textarea>',
             $self->escape($attr),
-            $self->escape($self->{object}->get_c_field($attr)),
+            $self->escape($self->attr_raw_value($attr)),
         );
         /^label$/ and return $self->escape(
-            $self->{object}->get_c_field($attr)
+            $self->attr_raw_value($attr)
         );
         /^select:([^:]+):(.*)$/ and do {
@@ -149 +168 @@
             my $select = sprintf('<select name="%s">',
                 $self->escape($attr)) . "\n";
-            my $value = $self->{object}->get_c_field($attr);
+            my $value = $self->attr_raw_value($attr);
             foreach my $id ($self->{object}->base->list_objects($otype)) {
                 my $obj = $self->{object}->base->get_object($otype, $id) or next;
@@ -168 +187 @@
         '<input type="text" name="%s" value="%s">',
         $attr,
-        $self->escape(
-            $self->{c}->req->param($attr) ||
-            $self->{object}->get_c_field($attr)
-        )
+        $self->escape($self->attr_raw_value($attr))
     );
 }

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

@@ -3 +3 @@
 <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
+Login: <input type="text" name="id" value="[% c.req.param('id') | html %]"><br>
 Nom: <input type="text" name="sn" value="[% c.req.param('sn') | html %]"><br>
 Prenom: <input type="text" name="givenName" value="[% c.req.param('givenName') | html %]"><br>
@@ -13 +13 @@
 <form action="[% c.uri_for('/create', 'user') %]" method="POST">
 <input type="hidden" name="step" value="1">
-Nom: <input type="text" name="sn"><br>
-Prénom: <input type="text" name="givenName"><br>
+[% form.attr_label('sn') %] [% form.attr_field('sn') %]<br>
+[% form.attr_label('givenName') %] [% form.attr_field('givenName') %]<br>
 <input type="submit">
 </form>