Changeset 2674 for cpc/trunk/project/lib/model/doctrine/Amendement.class.php

Timestamp:

May 12, 2012, 8:39:25 PM (9 years ago)

Author:

teymour

Message:

Ajout d'un champ pour les amendements multiples (+correction bug rectifié)

File:

• cpc/trunk/project/lib/model/doctrine/Amendement.class.php (modified) (1 diff)

cpc/trunk/project/lib/model/doctrine/Amendement.class.php

@@ -126 +126 @@
     $numeros = $this->numero;
     $lettre = $this->getLettreLoi();
-    $ident = $this->getTags(array('is_triple' => true,
+    if ($this->nb_multiples > 1) {
+      $ident = $this->getTags(array('is_triple' => true,
           'namespace' => 'loi',
           'key' => 'amendement',
           'return'    => 'value'));
-    if (count($ident) > 1 && $lettre != "") {
       sort($ident);
-      if ($lettre) foreach ($ident as $iden) $iden .= $lettre;
+      foreach ($ident as $iden) if (preg_match('/'.$lettre.'/', $iden)) $iden.= $lettre;
       $numeros = implode(', ', $ident);
       $pluriel = "s";