Ignore:
Timestamp:
09/28/12 08:08:47 (12 years ago)
Author:
nanardon
Message:

fix conflict

Location:
trunk/LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r1081 r1162  
    3232 
    3333    my $db = $c->model('Accounts')->db; 
    34     if ($c->req->param('delete')) { 
    35         $db->delete_object('aliases', $alias); 
    36         $db->commit; 
    37         $c->res->redirect($c->uri_for('/aliases')); 
    38         return; 
    39     } 
     34 
    4035    my $oalias = $db->get_object('aliases', $alias); 
    4136    $c->stash->{aliasesname} = $alias; 
    … …  
    4439 
    4540    $c->stash->{form} = $c->model('AttrForms', 'aliases', $oalias); 
    46     $c->stash->{form}->set_attrs; 
     41 
     42    if ($c->req->param('make_active')) { 
     43        $c->stash->{aliases}->set_c_fields('exported' => 1); 
     44        $db->commit; 
     45    } 
     46    elsif ($c->req->param('make_inactive')) { 
     47        $c->stash->{aliases}->set_c_fields('exported' => 0); 
     48        $db->commit; 
     49    } 
     50    elsif ($c->req->param('delete')) { 
     51        $db->delete_object('aliases', $alias); 
     52        $db->commit; 
     53        $c->res->redirect('/aliases'); 
     54        return; 
     55    } 
     56    else { 
     57        $c->stash->{form}->set_attrs; 
     58    } 
    4759} 
    4860 

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

    r1092 r1162  
    4141        return; 
    4242    }; 
     43 
     44    if ($c->req->param('make_active')) { 
     45        $c->stash->{group}->set_c_fields('exported' => 1); 
     46        $base->commit; 
     47    } 
     48    if ($c->req->param('make_inactive')) { 
     49        $c->stash->{group}->set_c_fields('exported' => 0); 
     50        $base->commit; 
     51    } 
     52    if ($c->req->param('delete')) { 
     53        $base->delete_object('group', $groupname); 
     54        $base->commit; 
     55        $c->res->redirect('/groups'); 
     56    } 
    4357 
    4458    $c->stash->{subform} = $subform || ''; 

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

    r1087 r1162  
    6969            $base->rollback; 
    7070        } 
    71     } elsif ($c->req->param('delete')) { 
    72         if ($base->delete_object('nethost', $nethostname)) { 
    73             $base->commit; 
    74             $c->res->redirect('/nethosts'); 
    75         } else { 
    76             $base->rollback; 
    77         } 
     71    } elsif ($c->req->param('make_active')) { 
     72        $c->stash->{nethost}->set_c_fields('exported' => 1); 
     73        $base->commit; 
     74    } 
     75    elsif ($c->req->param('make_inactive')) { 
     76        $c->stash->{nethost}->set_c_fields('exported' => 0); 
     77        $base->commit; 
     78    } 
     79    elsif ($c->req->param('delete')) { 
     80        $base->delete_object('nethost', $nethostname); 
     81        $base->commit; 
     82        $c->res->redirect('/nethosts'); 
     83 
    7884    } else { 
    7985        $c->stash->{form}->set_attrs; 

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

    r1089 r1162  
    4141    $c->stash->{form} = $c->model('AttrForms', 'netzone', $c->stash->{netzone}); 
    4242    $c->stash->{form}->set_attrs; 
     43 
     44    if ($c->req->param('make_active')) { 
     45        $c->stash->{netzone}->set_c_fields('exported' => 1); 
     46        $base->commit; 
     47    } 
     48    if ($c->req->param('make_inactive')) { 
     49        $c->stash->{netzone}->set_c_fields('exported' => 0); 
     50        $base->commit; 
     51    } 
     52    if ($c->req->param('delete')) { 
     53        $base->delete_object('netzone', $netzonename); 
     54        $base->commit; 
     55        $c->res->redirect('/netzones'); 
     56    } 
    4357} 
    4458 

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

    r1088 r1162  
    4141    }; 
    4242 
     43    if ($c->req->param('make_active')) { 
     44        $c->stash->{site}->set_c_fields('exported' => 1); 
     45        $base->commit; 
     46    } 
     47    if ($c->req->param('make_inactive')) { 
     48        $c->stash->{site}->set_c_fields('exported' => 0); 
     49        $base->commit; 
     50    } 
     51    if ($c->req->param('delete')) { 
     52        $base->delete_object('site', $sitename); 
     53        $base->commit; 
     54        $c->res->redirect('/sites'); 
     55    } 
     56 
    4357    $c->stash->{subform} = $subform || ''; 
    4458 

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

    r1088 r1162  
    7575        $c->stash->{user}->set_c_fields('exported' => 1); 
    7676        $base->commit; 
     77    } 
     78    if ($c->req->param('make_inactive')) { 
     79        $c->stash->{user}->set_c_fields('exported' => 0); 
     80        $base->commit; 
     81    } 
     82    if ($c->req->param('delete')) { 
     83        $base->delete_object('user', $username); 
     84        $base->commit; 
     85        $c->res->redirect('/users'); 
    7786    } 
    7887 

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

    r1137 r1162  
    562562                '$attr'.replace(/SUBID/g, cn ); 
    563563            document.getElementById('${htmlname}_div_' + (cn - 1)).innerHTML += 
    564                 '<div id="${htmlname}_div_'+ cn +'"></div>'; 
     564                '<div id="${htmlname}_div_'+ cn +'" style="display:block"></div>'; 
    565565            %s 
    566566            } 
    … …  
    571571        $addempty .= "\n"; 
    572572        $addempty .= 
    573             qq|<button type="button" onclick="add_${htmlname}()">+</button>|, 
     573            qq|<button type="button" style="display:block" onclick="add_${htmlname}()">+</button>|, 
    574574 
    575575        push(@html_fields, $addempty); 
Note: See TracChangeset for help on using the changeset viewer.