Changeset 1139 for cpc/trunk/project/apps

Timestamp:

Feb 28, 2010, 11:02:05 PM (11 years ago)

Author:

teymour

Message:

Différencie les ids interne à cpc et les numéro de questions ecrites de l'AN

Location:

cpc/trunk/project/apps/frontend

Files:

• config/app.yml (modified) (1 diff)
• config/routing.yml (modified) (1 diff)
• modules/questions/actions/actions.class.php (modified) (1 diff)
• modules/questions/templates/_search.php (modified) (2 diffs)

cpc/trunk/project/apps/frontend/config/app.yml

@@ -4 +4 @@
     triple_distinct:   true
   secret_key: _______PUT_YOUR_KEY_HERE________
+  legislature: 13
+
   expiration_cookie: <?php echo time()+86400*15; ?>
   # 15 jours

cpc/trunk/project/apps/frontend/config/routing.yml

@@ -273 +273 @@
 
 # Affichage d'une question
+question_numero:
+  url: /question/QE/:numero
+  param: {module: questions, action: show}
 question:
+  url: /question/id/:id
+  param: {module: questions, action: redirect}
+question_id:
   url: /question/:id
-  param: {module: questions, action: show}
+  param: {module: questions, action: redirect}
 
 # Captcha

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

@@ -11 +11 @@
 class questionsActions extends sfActions
 {
+  public function executeRedirect(sfWebRequest $request)
+  {
+    //respect de l'existant : il est possible d'appeler les questions ecrites par leur id
+    //Mais lorsque c'est le cas on redirige vers une url plus parlante utilisant le numéro définit par l'AN
+    $question = doctrine::getTable('QuestionEcrite')->find($request->getParameter('id'));
+    $this->forward404Unless($question);
+    return $this->redirect('@question_numero?numero='.$question->numero);
+  }
   public function executeShow(sfWebRequest $request)
   {
-    $id = $request->getParameter('id');
-    if (preg_match('/^(\d+)$/' , $id)) {
-      $question = doctrine::getTable('QuestionEcrite')->find($id);
-      $this->forward404Unless($question);
-      $this->redirect('@question?id=QE'.$question->numero);
-    } else if (preg_match('/^QE(\d+)$/' , $id, $match)) {
-      $this->question = doctrine::getTable('QuestionEcrite')
-        ->createquery('q')
-       ->where('q.numero = ?', $match[1])
-        ->fetchOne();
-      $this->forward404Unless($this->question);
-      $this->parlementaire = doctrine::getTable('Parlementaire')->find($this->question->parlementaire_id);
-      $this->forward404Unless($this->parlementaire);
-    } else $this->forward404();
+    $numero = $request->getParameter('numero'));
+    $this->question = doctrine::getTable('QuestionEcrite')
+      ->createquery('q')
+      ->where('q.numero = ?', $numero)
+      ->andWhere('q.legislature = ?', sfConfig::get('app_legislature', 13))
+      ->fetchOne();
+    $this->forward404Unless($this->question);
+    $this->parlementaire = doctrine::getTable('Parlementaire')->find($this->question->parlementaire_id);
+    $this->forward404Unless($this->parlementaire);
   }
 

cpc/trunk/project/apps/frontend/modules/questions/templates/_search.php

@@ -3 +3 @@
     <div>
 <?php $parlementaire = $question->getParlementaire(); ?>
-  <h2><?php echo link_to($parlementaire->nom.'&nbsp;: '.$question->getTitre(), '@question?id=QE'.$question->numero); ?></h2>
+  <h2><?php echo link_to($parlementaire->nom.'&nbsp;: '.$question->getTitre(), '@question_numero?numero='.$question->numero); ?></h2>
     </div>
   <div class="texte_question"><?php
   if (!isset($nophoto))
-    echo '<a href="'.url_for('@question?id=QE'.$question->numero).'" class="intervenant"><img width="50" height="70" alt="'.$parlementaire->nom.'" src="'.url_for('@resized_photo_parlementaire?height=64&slug='.$parlementaire->slug).'" /></a>';
+    echo '<a href="'.url_for('@question_nuemro?numero='.$question->numero).'" class="intervenant"><img width="50" height="70" alt="'.$parlementaire->nom.'" src="'.url_for('@resized_photo_parlementaire?height=64&slug='.$parlementaire->slug).'" /></a>';
   $inter = preg_replace('/<\/?p>|\&[^\;]+\;/i', ' ', $question->getQuestion().' '.$question->getReponse().' Thèmes : '.$question->getThemes());
   $p_inter = '';
@@ -21 +21 @@
 ?>
   <div class="contexte">
-    <a href="<?php echo url_for('@question?id=QE'.$question->numero); ?>">Lire la suite de la question</a></div>
+    <a href="<?php echo url_for('@question_numero?numero='.$question->numero); ?>">Lire la suite de la question</a></div>
   </div>
   </div>