Changeset 899 for LATMOS-Accounts-Web

Timestamp:

02/23/12 13:02:26 (12 years ago)

Author:

nanardon

Message:

• move attributes label to config files

Location:

LATMOS-Accounts-Web

Files:

• Changes (modified) (1 diff)
• Makefile.PL (modified) (1 diff)
• etc/latmos_accounts_web.yml (moved) (moved from LATMOS-Accounts-Web/latmos_accounts_web.yml.in) (2 diffs, 1 prop)
• latmos-accounts-web.spec.in (modified) (1 diff)
• lib/LATMOS/Accounts/Web/Model/AttrForms.pm (modified) (3 diffs)
• t/04config_load.t (added)

LATMOS-Accounts-Web/Changes

@@ -7 +7 @@
 
     - review object list page and icons (Hans)
+
+    - move attributes label from code to configuration file, allowing to change
+      them
+    - add a prossible description/hint to attribute
 
 2.0.0

LATMOS-Accounts-Web/Makefile.PL

@@ -63 +63 @@
 EOF
 }
+
+sub install {
+    my ($self) = @_;
+    my $section = $self->SUPER::install();
+
+    $section =~ s/(^install ::.*)/$1 install_config/m;
+
+    $section .= q[
+install_config ::
+        install -d $(DESTDIR)/etc
+        install -d $(DESTDIR)/etc/latmos-accounts
+        install etc/latmos_accounts_web.yml $(DESTDIR)/etc/latmos-accounts//latmos_accounts_web.yml
+];
+
+    return $section;
+}
+

LATMOS-Accounts-Web/etc/latmos_accounts_web.yml

@@ -1 +1 @@
 ---
+# $Id$
+
 # Where to find configuration file:
 # config: /etc/latmos-accounts/latmos-accounts.ini
@@ -24 +26 @@
 #        op: =
 #      - ...
+
+# The attribute label used in application
+attrs:
+  uidNumber:
+    label: UID
+#    hint: ...
+  givenName:
+    label: Prénom
+  uid:
+    label: Login
+  uidNumber:
+    label: UID
+  gidNumber:
+    label: GID
+  manager:
+    label: Responsable
+  managedBy:
+    label: Responsable
+  sn:
+    label: Nom
+  givenName:
+    label: Prénom
+  homeDirectory:
+    label: Home
+  loginShell:
+    label: Shell
+  physicalDeliveryOfficeName:
+    label: Bureau
+  telephoneNumber:
+    label: Téléphone
+  otherTelephone:
+    label: Téléphone (autre)
+  company:
+    label: Société
+  l:
+    label: Ville
+  postalCode:
+    label: Code postal
+  postOfficeBox:
+    label: BP
+  department:
+    label: Département
+  streetAddress:
+    label: Rue
+  title:
+    label: Fonction
+  expire:
+    label: Expire le
+  st:
+    label: État (US)
+  sutype:
+    label: Structure admin.
+  exported:
+    label: Propagé
+  unexported:
+    label: Caché
+  locked:
+    label: Vérouillé
+  isMainAddress:
+    label: Adresse principale
+  site:
+    label: Site
+  co:
+    label: Pays
+  mail:
+    label: Mail
+  grade:
+    label: Grade
+  facsimileTelephoneNumber:
+    label: Fax
+  nickname:
+    label: Nick
+  cn:
+    label: Nom
+  initials:
+    label: Initiales
+  create:
+    label: Créé le
+  date:
+    label: Modifié le
+  college:
+    label: College
+  contratType:
+    label: Type de contrat
+  managerContact:
+    label: Contact
+  owner:
+    label: Propriétaire
+  description:
+    label: Description
+  name:
+    label: Nom
+  net:
+    label: Réseau
+  macaddr:
+    label: Adresse Ethernet
+  noDynamic:
+    label: Pas d'adressage dyn.
+  cname:
+    label: Alias (CName)
+  type:
+    label: Type
+  netExclude:
+    label: Réseau exclus
+  output:
+    label: Sortie
+  template:
+    label: ModÚle
+  gecos:
+    label: Gecos Unix

LATMOS-Accounts-Web/latmos-accounts-web.spec.in

@@ -94 +94 @@
 %config(noreplace) %_sysconfdir/httpd/conf/webapps.d/*
 %_sysconfdir/init.d/latmos-accounts-web
-
+%config(noreplace) %_sysconfdir/latmos-accounts/*

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

@@ -15 +15 @@
 
 =cut
-
-my $attrs = {
-    uid => [ 'Login' ],
-    uidNumber => [ 'UID' ],
-    gidNumber => [ 'GID' ],
-    manager => [ 'Responsable' ],
-    managedBy => [ 'Responsable' ],
-    sn => [ 'Nom' ],
-    givenName => [ 'Prénom' ],
-    homeDirectory => [ 'Home' ],
-    loginShell => [ 'Shell' ],
-    physicalDeliveryOfficeName => [ 'Bureau' ],
-    telephoneNumber => [ 'Téléphone' ],
-    otherTelephone => [ 'Téléphone (autre)' ],
-    company => [ 'Société' ],
-    l => [ 'Ville' ],
-    postalCode => [ 'Code postal' ],
-    postOfficeBox => [ 'BP' ],
-    department => [ 'Département' ],
-    streetAddress => [ 'Rue' ],
-    title => [ 'Fonction' ],
-    expire => [ 'Expire le' ],
-    st => [ 'État (US)' ],
-    sutype => [ 'Structure admin.' ],
-    exported => [ 'Propagé' ],
-    unexported => [ 'Caché' ],
-    locked => [ 'Vérouillé' ],
-    isMainAddress => [ 'Adresse principale' ],
-    site => [ 'Site' ],
-    co => [ 'Pays' ],
-    mail => [ 'Mail' ],
-    grade => [ 'Grade' ],
-    facsimileTelephoneNumber => [ 'Fax' ],
-    nickname => [ 'Nick' ],
-    cn => [ 'Nom' ],
-    initials => [ 'Initiales' ],
-    create => [ 'Créé le' ],
-    date => [ 'Modifié le' ],
-    college => [ 'College' ],
-    contratType => [ 'Type de contrat' ],
-    managerContact => [ 'Contact' ],
-    owner => [ 'Propriétaire' ],
-    description => [ 'Description' ],
-    name => [ 'Nom' ],
-    net => [ "Réseau" ],
-    macaddr => [ "Adresse Ethernet" ],
-    noDynamic => [ "Pas d'adressage dyn." ],
-    cname => [ "Alias (CName)" ],
-    type => [ "Type" ],
-    netExclude => [ "Réseau exclus" ],
-    output => [ "Sortie" ],
-    template => [ "ModÚle" ],
-    outputD => [ "Sortie" ],
-    templateD => [ "ModÚle" ],
-    group => [ "Groupe" ],
-    allow_dyn => [ "DHCP dynamique" ],
-    ipCount => [ "Nb d'IP" ],
-    freeIPCount => [ "Nb d'IP libres" ],
-    dnsRevision => [ "Révision DNS" ],
-    lastUpdate => [ "DerniÚre mise à jour "],
-    otherName => [ "Autres noms (A)" ],
-    'reverse' => [ "Forcer le reverse à " ],
-    dynFrom => [ 'Sans Ip depuis' ],
-    siteNick => [ 'Acronyme' ],
-    serialNumber => [ 'N° de série' ],
-    snNative => [ 'Nom d\'origine' ],
-    givenNameNative => [ 'Prénom d\'origine' ],
-    wWWHomePage => [ 'Site Web' ],
-    halReference => [ 'Référence HAL' ],
-};
 
 my $forms = {
@@ -273 +203 @@
 sub attr_label {
     my ($self, $attr) = @_;
+    my ($hint, $label) = ('', '');
+    LATMOS::Accounts::Web->config->{attrs} ||= {};
     my $htmlname = ($self->{object} ? $self->{object}->id . '_' : '') . $attr;
-    return sprintf('<label for="%s">%s</label>',
+    if (my $attr_config = LATMOS::Accounts::Web->config->{attrs}{$attr}) {
+        $label = $attr_config->{label} || '';
+        utf8::encode($label);
+        $hint = $attr_config->{hint} || '';
+        utf8::encode($hint);
+    }
+    return sprintf('<label %sfor="%s">%s</label>',
+        ($hint ? sprintf('title="%s"', $self->escape($hint)) : ''),
         $self->escape($htmlname),
-        $self->escape($attrs->{$attr}[0] || $attr)
+        $self->escape($label || $attr),
     );
 }
@@ -528 +467 @@
             ? $self->{object}->attribute($_)
             : $self->base->attribute($self->otype, $_)) or next;
-        if (($attrs->{$_}[1] || '') eq 'checkbox') {
-            $fields{$_} = $self->{c}->req->param("$prefix$_") ? 1 : 0;
-        } elsif ($attr->{multiple}) {
+        if ($attr->{multiple}) {
             $fields{$_} = [ grep { $_ } $self->{c}->req->param("$prefix$_") ];
         } else {