Ignore:
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:
3 edited

Legend:

Unmodified
Added
Removed
  • cpc/trunk/project/apps/frontend/modules/amendement/actions/actions.class.php

    r1089 r1099  
    141141    $amdt = $request->getParameter('numero');
    142142    if ($amdt == 'all' || $amdt == 'new' ) {
     143        if (count($this->lois) == 1) $this->loi = doctrine::getTable('TitreLoi')->findLightLoi($this->lois[0]);
    143144        $this->amendements_query = doctrine::getTable('Amendement')->createQuery('a')
    144145        ->whereIn('a.texteloi_id', $this->lois);
  • cpc/trunk/project/apps/frontend/modules/amendement/templates/_pagerAmendements.php

    r1080 r1099  
    77<p> pour la recherche sur <em>"<?php echo strip_tags($mots); ?>"</em></p>
    88<?php } }
    9 else if (isset($lois)) {
     9else if (isset($loi)) {
     10  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).')';
     11} else if (isset($lois)) {
    1012  echo ' portant sur ';
    1113  if (count($lois) > 1) echo 'les projets de loi ';
  • cpc/trunk/project/apps/frontend/modules/amendement/templates/findSuccess.php

    r1092 r1099  
    1515        echo "</p>";
    1616    }
    17     echo include_component('amendement', 'pagerAmendements', array('amendement_query' => $amendements_query, 'lois' => $lois));
     17    $options = array('amendement_query' => $amendements_query, 'lois' => $lois);
     18    if (isset($loi)) $options = array_merge($options, array('loi' => $loi));
     19    echo include_component('amendement', 'pagerAmendements', $options);
    1820  }
    1921  else { ?>
Note: See TracChangeset for help on using the changeset viewer.