Changeset 921 for LATMOS-Accounts

Timestamp:

04/17/12 17:49:50 (12 years ago)

Author:

nanardon

Message:

• use either owner or user in zone files

File:

• LATMOS-Accounts/lib/LATMOS/Accounts/BuildNet.pm (modified) (1 diff)

LATMOS-Accounts/lib/LATMOS/Accounts/BuildNet.pm

@@ -300 +300 @@
     my ($self, $nethost) = @_;
 
-    my @desc;
-    if (my $owner = $nethost->get_attributes('owner')) {
+    my $user;
+    if (my $owner = $nethost->get_attributes('user')) {
         if (my $user = $self->_base->get_object('user', $owner)) {
-            push(@desc, $user->get_attributes('displayName'));
-        }
-    }
-    push(@desc, $nethost->get_attributes('description'));
+            $user = $user->get_attributes('displayName'); 
+        }
+    }
+    if ((!$user) && (my $owner = $nethost->get_attributes('owner'))) {
+        if (my $user = $self->_base->get_object('user', $owner)) {
+            $user = $user->get_attributes('displayName'); 
+        }
+    }
+    my @desc = ($user, $nethost->get_attributes('description'));
 
     return to_ascii(join(', ', grep { $_ } @desc) || '');