Changeset 1347 for trunk

Timestamp:

05/29/15 19:19:25 (9 years ago)

Author:

nanardon

Message:

Ensure gidNumber for user accept both group name and number

Location:

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql

Files:

• User.pm (modified) (4 diffs)
• objects.pm (modified) (1 diff)

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/User.pm

@@ -132 +132 @@
                 mandatory => 1,
                 can_values => sub {
+                    map { $_->id, $_->get_attributes('gidNumber') }
+                    map { $base->get_object('group', $_) }
+                    $base->list_objects('group')
+                },
+                can_values => sub {
                     my $sth = $base->db->prepare_cached(
                         q{
-                        select gidnumber from "group" where exported = true
+                        select name, gidnumber from "group" where exported = true
                         }
                     );
@@ -140 +145 @@
                     my @res;
                     while (my $res = $sth->fetchrow_hashref) {
+                        push(@res, $res->{name});
                         push(@res, $res->{gidnumber});
                     }
@@ -150 +156 @@
                     return $gr;
                 },
+                input => sub {
+                    my ($val) = @_;
+                    $val =~ /^\d+$/ and return $val;
+                    my ($gr) = $base->search_objects('group', "name=$val") or return;
+                    return $base->get_object('group', $gr)->get_attributes('gidNumber');
+                },
                 reference => 'group',
             },
@@ -155 +167 @@
             gidnumber => { inline => 1, hide => 1,
                 can_values => sub {
-                    map { $_->get_attributes('gidNumber') }
+                    map { $_->id, $_->get_attributes('gidNumber') }
                     map { $base->get_object('group', $_) }
                     $base->list_objects('group')
+                },
+                display => sub {
+                    my ($self, $val) = @_;
+                    my ($gr) = $self->base->search_objects('group', "gidNumber=$val")
+                        or return;
+                    return $gr;
+                },
+                input => sub {
+                    my ($val) = @_;
+                    $val =~ /^\d+$/ and return $val;
+                    my ($gr) = $base->search_objects('group', "name=$val") or return;
+                    return $base->get_object('group', $gr)->get_attributes('gidNumber');
                 },
                 mandatory => 1,

trunk/LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/objects.pm

@@ -192 +192 @@
         my $attr = $base->attribute($class->type, $_) or next;
         $_ =~ /^exported$/ and $data{$_} = $data{$_} ? 1 : 0;
+        warn my $formatted = ref($data{$_})
+            ? map { $attr->input($_) } @{ $data{$_} }
+            : $attr->input($data{$_});
         if ($attr->{inline}) {
-            $first{$_} = $data{$_};
+            $first{$_} = $formatted;
         } else {
-            $second{$_} = $data{$_};
+            $second{$_} = $formatted;
         }
     }