Changeset 331

Timestamp:

08/12/09 15:51:54 (15 years ago)

Author:

nanardon

Message:

• fix variable name

Location:

LATMOS-Accounts/lib/LATMOS/Accounts/Bases

Files:

• Objects.pm (modified) (3 diffs)
• Sql/User.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Objects.pm

@@ -192 +192 @@
 sub get_c_field {
     my ($self, $cfield) = @_;
-    $self->base->check_acl($self, $cfield, 'r') or return;
-    $self->_get_c_field($cfield);
+    my $return;
+    eval {
+        $self->base->check_acl($self, $cfield, 'r') or die "Permission denied";
+        $return = $self->_get_c_field($cfield);
+    };
+    $return
 }
 
 sub _get_c_field {
     my ($self, $cfield) = @_;
-    my $field = $self->base->get_field_name($self->type, $cfield, 'r') or return;
-    $self->get_field($field);
+    my $return;
+    eval {
+        my $field = $self->base->get_field_name($self->type, $cfield, 'r') or
+            die "Unknow attribute $cfield";
+        $return = $self->get_field($field);
+    };
+    $return
 }
 
@@ -222 +231 @@
     my ($self, %cdata) = @_;
     my %data;
-    foreach my $cfield (keys %cdata) {
-        $self->base->check_acl($self, $cfield, 'w') or return;
-    }
+    eval {
+        foreach my $cfield (keys %cdata) {
+            $self->base->check_acl($self, $cfield, 'w') or 
+                die "permission denied";
+        }
+    };
+    return if($@);
     $self->_set_c_fields(%cdata);
 }
@@ -290 +303 @@
         foreach my $field (@parsed_filter) {
             my $value = $field->{val};
-            $base->get_field_name($class->type, $field->{attr}, 'r') or next;
+            $base->get_field_name($class->type, $field->{attr}, 'r') or die
+            "Unsupported attribute $field->{attr}\n";
             my $fval = $obj->_get_c_field($field->{attr}) || '';
             if ($value eq '*') {

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

@@ -52 +52 @@
     my ($class, $for, $base) = @_;
     return (
-        $self->SUPER::_inline_fields($for, $base),
+        $class->SUPER::_inline_fields($for, $base),
         uidNumber => 'uidnumber',
         gidNumber => 'gidnumber',