Changeset 2471

Timestamp:

05/17/21 11:25:26 (3 years ago)

Author:

nanardon

Message:

Don't deref if olias don't exists

Location:

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

Files:

• Sql.pm (modified) (2 diffs)
• Sql/objects.pm (modified) (1 diff)

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

@@ -252 +252 @@
     my ($self, $otype, $oalias) = @_;
     $oalias or return;
-    if ( my $obj = $self->get_object($otype, $oalias ) ) {
-        return $obj;
-    } elsif (my ($aliasotype, $aliasoname, $aliasattr) = $oalias =~ m/^([^\/]+)\.([^\.]+)\.(.*)$/) {
+    if (my ($aliasotype, $aliasoname, $aliasattr) = $oalias =~ m/^([^\/]+)\.([^\.]+)\.(.*)$/) {
         my $attribute = $self->attribute($aliasotype, $aliasattr) or do {
             $self->log(LA_DEBUG, "Oalias %s (%s): can fetch attibute %s/%s",
@@ -282 +280 @@
         return $self->get_object($refotype, $rvalue);
     } else {
-        return;
+        return $self->get_object( $otype, $oalias )
     }
 }

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

@@ -623 +623 @@
         my @deref;
         foreach my $v (ref $res ? @{ $res } : $res) {
-            my $derefobj = $self->base->_derefObject($ref, $v);
+            my $derefobj = $self->base->get_object($ref, $v);
             push(@deref, $derefobj->id) if ($derefobj);
         }