Changeset 1099 for cpc/trunk/project/apps

Timestamp:

Feb 9, 2010, 12:49:36 AM (11 years ago)

Author:

goya

Message:

titre loi dans recherche amendements

Location:

cpc/trunk/project/apps/frontend/modules/amendement

Files:

• actions/actions.class.php (modified) (1 diff)
• templates/_pagerAmendements.php (modified) (1 diff)
• templates/findSuccess.php (modified) (1 diff)

cpc/trunk/project/apps/frontend/modules/amendement/actions/actions.class.php

@@ -141 +141 @@
     $amdt = $request->getParameter('numero');
     if ($amdt == 'all' || $amdt == 'new' ) {
+        if (count($this->lois) == 1) $this->loi = doctrine::getTable('TitreLoi')->findLightLoi($this->lois[0]);
         $this->amendements_query = doctrine::getTable('Amendement')->createQuery('a')
         ->whereIn('a.texteloi_id', $this->lois);

cpc/trunk/project/apps/frontend/modules/amendement/templates/_pagerAmendements.php

@@ -7 +7 @@
 <p> pour la recherche sur <em>"<?php echo strip_tags($mots); ?>"</em></p>
 <?php } } 
-else if (isset($lois)) {
+else if (isset($loi)) {
+  echo ' sur '.link_to(preg_replace('/Simplifions la loi 2\.0 : (.*)\s*<br.*$/', '\1', $loi->titre), '@loi?loi='.$loi->texteloi_id).' ('.myTools::getLiasseLoiAN($loi).', '.myTools::getLiasseLoiImpr($loi->texteloi_id).')';
+} else if (isset($lois)) {
   echo ' portant sur ';
   if (count($lois) > 1) echo 'les projets de loi ';

cpc/trunk/project/apps/frontend/modules/amendement/templates/findSuccess.php

@@ -15 +15 @@
         echo "</p>";
     }
-    echo include_component('amendement', 'pagerAmendements', array('amendement_query' => $amendements_query, 'lois' => $lois));
+    $options = array('amendement_query' => $amendements_query, 'lois' => $lois);
+    if (isset($loi)) $options = array_merge($options, array('loi' => $loi));
+    echo include_component('amendement', 'pagerAmendements', $options);
   }
   else { ?>