Changeset 1436
- Timestamp:
- Sep 26, 2010, 6:44:35 PM (10 years ago)
- Location:
- cpc/trunk/project
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
cpc/trunk/project/apps/frontend/config/routing.yml
r1427 r1436 379 379 param: {module: commentaire, action: widget} 380 380 381 alerte_parlementaire: 382 url: /alerte/parlementaire/:slug 383 param: {module: alerte, action: parlementaire} 381 384 alerte_create: 382 385 url: /alerte/create -
cpc/trunk/project/apps/frontend/modules/alerte/actions/actions.class.php
r1432 r1436 15 15 $slug = $request->getParameter('slug'); 16 16 $this->forward404Unless($slug); 17 $parlementaire = doctrine::getTable('Parlementaire')->findBySlug($slug); 18 $this->forward404Unless($parlementaire); 17 $parlementaire = doctrine::getTable('Parlementaire')->findOneBySlug($slug); 18 $this->forward404Unless($parlementaire); 19 $alerte = new Alerte(); 20 $alerte->query = 'Parlemenaire='.urlencode($parlementaire); 21 $alerte->no_human_query = 1; 22 $alerte->titre = 'Recherche relative aux travaux de '.$parlementaire->nom; 23 $this->submit = 'Créer'; 24 $this->form = $this->processForm($request, $alerte); 25 $this->setTemplate('form'); 19 26 } 20 27 … … 32 39 { 33 40 $alerte = new Alerte(); 34 if ($citoyen_id = $this->getUser()->getAttribute('user_id')) {35 $alerte->citoyen_id = $citoyen_id;36 }37 41 $alerte->query = $request->getParameter('query'); 38 42 $alerte->filter = $request->getParameter('filter'); 39 $this->form = new AlerteForm($alerte);40 43 $this->submit = 'Créer'; 41 $this-> processForm($request, $this->form);44 $this->form = $this->processForm($request, $alerte); 42 45 $this->setTemplate('form'); 43 46 } … … 58 61 { 59 62 $this->forward404Unless($alerte = Doctrine::getTable('Alerte')->createQuery('a')->where('verif = ?', $request->getParameter('verif'))->fetchOne()); 60 $this->form = new AlerteForm($alerte); 61 $this->processForm($request, $this->form); 63 $this->form = $this->processForm($request, $alerte); 62 64 $this->submit = 'Éditer'; 63 65 $this->setTemplate('form'); … … 73 75 } 74 76 75 private function processForm($request, $form) { 77 private function processForm($request, $alerte) { 78 if ($citoyen_id = $this->getUser()->getAttribute('user_id')) { 79 $alerte->citoyen_id = $citoyen_id; 80 } 81 $form = new AlerteForm($alerte); 76 82 if ($request->isMethod('post')) { 77 83 $form->bind($request->getParameter($form->getName())); … … 86 92 } 87 93 } 94 return $form; 88 95 } 89 96 } -
cpc/trunk/project/apps/frontend/modules/alerte/templates/formSuccess.php
r1432 r1436 5 5 echo "<tr><th>Email</th><td>".$form->getObject()->Citoyen->email."</td></tr>"; 6 6 } 7 echo $form;8 7 if ($form->getObject()->no_human_query) { 9 8 echo "<tr><th>Alerte portant sur</th><td>".$form->getObject()->titre."</td></tr>"; … … 12 11 echo "<tr><th>Filtré sur</th><td>".preg_replace('/[\&,] ?/', ', ', preg_replace('/[^=\&\,]+=/i', '', strtolower(urldecode($f))))."</td></tr>"; 13 12 } 13 echo $form; 14 14 ?> 15 15 <tr><th></th><td><input type="submit" value="<?php echo $submit; ?>"> <?php if ($submit != 'Créer') echo link_to('Supprimer', 'alerte/delete?verif='.$form->getObject()->verif);?></td></tr> -
cpc/trunk/project/apps/frontend/modules/alerte/templates/listSuccess.php
r1432 r1436 24 24 echo "</td><td>"; 25 25 } 26 echo "une fois par ".$period[$a->getPeriod()]."</td><td>".$a->getLastMail(); 26 echo "une fois par ".$period[$a->getPeriod()]."</td><td>"; 27 echo ($a->getNextMail()) ? $a->getLastMail() : " - "; 27 28 echo "</td><td>"; 28 29 echo link_to('<img src="/images/xneth/remove.png"/>', 'alerte/delete?verif='.$a->verif); -
cpc/trunk/project/apps/frontend/modules/commentaire/actions/actions.class.php
r1384 r1436 19 19 $this->type = $request->getParameter('type'); 20 20 $this->id = $request->getParameter('id'); 21 $this->follow_talk = $request->getParameter('follow_talk'); 21 22 22 23 $values = $request->getParameter('commentaire'); … … 156 157 $commentaire->save(); 157 158 159 $alerte = new Alerte(); 160 $alerte->citoyen_id = $citoyen_id; 161 $alerte->query = "object_name:Commentaire tag:object_type=".$commentaire->object_type." tag:object_id=".$commentaire->object_id; 162 $alerte->no_human_query = 1; 163 $alerte->period = 'HOUR'; 164 $alerte->titre = "Suivre votre conversation sur $present"; 165 $alerte->save(); 166 158 167 $object->updateNbCommentaires(); 159 168 $object->save(); -
cpc/trunk/project/apps/frontend/modules/commentaire/actions/components.class.php
r1384 r1436 14 14 } 15 15 $this->unique_form = md5(rand()); 16 if (!isset($this->follow_talk)) 17 $this->follow_talk = 0; 16 18 $this->getUser()->setAttribute('commentaire_'.$this->type.'_'.$this->id, $this->unique_form); 17 19 } -
cpc/trunk/project/apps/frontend/modules/commentaire/templates/_form.php
r964 r1436 57 57 </tr> 58 58 <?php } ?> 59 <tr><td><input type="checkbox" name="follow_talk" id="follow_talk"<?php if ($follow_talk) echo " checked"; ?>/><label for="follow_talk">M'alerter par email lorsque quelqu'un réagit à mon commentaire</label></td></tr> 59 60 <tr> 60 61 <td colspan="3" style="height:40px;"> -
cpc/trunk/project/apps/frontend/modules/commentaire/templates/postSuccess.php
r714 r1436 7 7 </div> 8 8 <?php 9 echo include_component('commentaire', 'form', array('type'=>$type, 'id'=>$id, 'sendButton'=>1, 'form'=>$form ));9 echo include_component('commentaire', 'form', array('type'=>$type, 'id'=>$id, 'sendButton'=>1, 'form'=>$form, 'follow_talk' => $follow_talk)); 10 10 ?> -
cpc/trunk/project/lib/model/doctrine/Parlementaire.class.php
r1412 r1436 69 69 $groupe = ""; 70 70 if ($this->groupe_acronyme != "") { 71 if ($link && function_exists(' link_to'))71 if ($link && function_exists('_parse_attributes') && function_exists('link_to')) 72 72 $groupe = " ".link_to($this->groupe_acronyme, '@list_parlementaires_groupe?acro='.$this->groupe_acronyme); 73 73 else $groupe = " ".$this->groupe_acronyme; … … 78 78 public function getLongStatut($link = 0) { 79 79 $circo = $this->nom_circo; 80 if ($link && function_exists(' link_to')) {80 if ($link && function_exists('_parse_attributes') && function_exists('link_to')) { 81 81 $circo = link_to($this->nom_circo, '@list_parlementaires_departement?departement='.$circo); 82 82 }
Note: See TracChangeset
for help on using the changeset viewer.