Changeset 165

Timestamp:

05/23/09 06:45:19 (15 years ago)

Author:

nanardon

Message:

• majority of administrative structure will be groups

Files:

• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Cells.pm (deleted)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Groups.pm (modified) (1 diff)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Controller/Teams.pm (deleted)
• LATMOS-Accounts-Web/lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (4 diffs)
• LATMOS-Accounts-Web/root/html/cells (deleted)
• LATMOS-Accounts-Web/root/html/includes/header.tt (modified) (1 diff)
• LATMOS-Accounts-Web/root/html/teams (deleted)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Sutype.pm (copied) (copied from LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Site.pm) (2 diffs)
• LATMOS-Accounts/lib/LATMOS/Accounts/Bases/Sql/Team.pm (deleted)

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

@@ -44 +44 @@
     $c->stash->{subform} = $subform || '';
 
-    for ($subform) {
+    for ($subform || '') {
         # Exceptions...
         /^users$/ and do {

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

@@ -36 +36 @@
     title => [ 'Fonction' ],
     expire => [ 'Expire le', 'date' ],
-    st => [ 'État (US)' ]
+    st => [ 'État (US)' ],
+    sutype => [ 'Structure admin.', 'select-N:sutype' ],
 };
 
@@ -85 +86 @@
         ) ],
     },
-    cell => {
-        name => 'Cellule',
-        attrs => [qw(description manager) ],
-    },
     department => {
         name => 'Département',
         attrs => [qw(description manager) ],
     },
-    team => {
-        name => 'Équipe',
-        attrs => [qw(description) ],
-    },
     group => {
         name => 'SystÚme',
@@ -102 +95 @@
         attrs => [ qw(
             gidNumber description
+            sutype
         ) ],
     },
@@ -175 +169 @@
     # exception: gidNumber is used also in group, but we don't want
     # group list here, really the number !
-    $type = '' if (($self->{form} || '') =~ /^group/);
+    $type = '' if (($self->{form} || '') =~ /^group/ && $attr eq 'gidNumber');
     for ($type) {
         /^textarea$/ and return sprintf(

LATMOS-Accounts-Web/root/html/includes/header.tt

@@ -20 +20 @@
     <p><a href="[% c.uri_for('/groups') %]">Groupes</a></p>
     <p><a href="[% c.uri_for('/departments') %]">Département</a></p>
-    <p><a href="[% c.uri_for('/teams') %]">Équipes</a></p>
-    <p><a href="[% c.uri_for('/cells') %]">Cellules</a></p>
     <p><a href="[% c.uri_for('/sites') %]">Sites</a></p>
 </div>

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

@@ -1 @@
-package LATMOS::Accounts::Bases::Sql::Site;
+package LATMOS::Accounts::Bases::Sql::Sutype;
 
 use 5.010000;
@@ -37 +37 @@
 =cut
 
-sub object_table { 'site' }
+sub object_table { 'su_type' }
 
 sub key_field { 'name' }
 
-sub has_extended_attributes { 1 }
+sub has_extended_attributes { 0 }
 
 sub _delayed_fields {