Changeset 1087


Ignore:
Timestamp:
07/30/12 18:38:08 (12 years ago)
Author:
nanardon
Message:
  • add noInheritPuppet attribute (class definition from puppet zone are ignored)
Location:
trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/NetHosts.pm

    r884 r1087  
    2727    $c->stash->{ofilter} = $c->model('AttrFilter', 'nethost'); 
    2828    my $start = $c->req->param('start'); 
    29     $c->stash->{uparams} = { %{ $c->req->params || {} } }; 
    30     my %initials; 
    31     my @userlist; 
    32     foreach (map { $_->id } @{ $c->stash->{objectslist} }) { 
    33         $initials{substr($_, 0, 1)} = 1; 
    34         if ($start) { 
    35             if (index($_, $start) == 0) { 
    36                 push(@userlist, $_); 
    37             } 
    38         } 
    39     } 
    40     if (@{ $c->stash->{objectslist} } < 20) { 
    41         @userlist = map { $_->id } @{ $c->stash->{objectslist} }; 
    42     } else { 
    43         $c->stash->{initials} = [ sort keys %initials ]; 
    44     } 
    45     $c->stash->{page}{title} = 'Listes des hÃŽtes réseau (' . scalar(@{ 
    46                 $c->stash->{objectslist} }) . ')'; 
    47     $c->stash->{nethostlist} = \@userlist; 
    4829} 
    4930 

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

    r1080 r1087  
    118118            macaddr 
    119119            puppetClass 
     120            noInheritPuppet 
    120121            noDynamic 
    121122            cname 

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

    r1064 r1087  
    8080            }, 
    8181            exported => { formtype => 'CHECKBOX', }, 
     82            noInheritPuppet => { formtype => 'CHECKBOX', }, 
    8283            otherName => { 
    8384                multiple => 1, 

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

    r1069 r1087  
    774774            my %classes = map { $_ => 1 } grep { $_ } ( 
    775775                $obj->get_attributes('puppetClass'), 
    776                 @puppetclasses, 
     776                ($obj->get_attributes('noInheritPuppet') ? () : @puppetclasses), 
    777777            ); 
    778778            my $desc = $self->_comment_nethost($obj); 

  • trunk/LATMOS-Accounts/sqldata/attributes.csv

    r1064 r1087  
    3838"nethost","serialNumber","" 
    3939"nethost","puppetClass","" 
     40"nethost","noInheritPuppet","" 
    4041"netzone","group","" 
    4142"netzone","net","" 
Note: See TracChangeset for help on using the changeset viewer.