Changeset 1483

Timestamp:

Sep 29, 2010, 12:08:35 AM (10 years ago)

Author:

teymour

Message:

Gestion des photos de députés avec title en js

Location:

cpc/trunk/project/apps/frontend/modules/solr

Files:

• actions/actions.class.php (modified) (2 diffs)
• templates/searchSuccess.php (modified) (1 diff)

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

@@ -17 +17 @@
     case 'Intervention':
       if ($obj->getParlementaire())
-        return url_for('@resized_photo_parlementaire?height=70&slug='.$obj->getIntervenant()->getSlug());
-      return '';
+        return $this->getPartial('parlementaire/photoParlementaire', array('parlementaire'=>$obj->getIntervenant(), 'height'=>70));
     case 'QuestionEcrite':
-      return url_for('@resized_photo_parlementaire?height=70&slug='.$obj->getParlementaire()->getSlug());
+      return $this->getPartial('parlementaire/photoParlementaire', array('parlementaire'=>$obj->getParlementaire(), 'height'=>70));
     case 'Amendement':
       return '';
     case 'Parlementaire':
-      return url_for('@resized_photo_parlementaire?height=70&slug='.$obj->getSlug());
+      return $this->getPartial('parlementaire/photoParlementaire', array('parlementaire'=>$obj, 'height'=>70));
     case 'Commentaire':
-      return url_for('@photo_citoyen?slug='.$obj->getCitoyen()->getSlug());
+      return '<img width="53" src="'.url_for('@photo_citoyen?slug='.$obj->getCitoyen()->getSlug()).'"/>';
     case 'Citoyen':
-      return url_for('@photo_citoyen?slug='.$obj->getSlug());
+      return '<img width="53" src="'.url_for('@photo_citoyen?slug='.$obj->getSlug()).'"/>';
     }
   }
@@ -115 +114 @@
       $this->sort_type = 'date';
     }
+    if ($from) {
+      $to = $request->getParameter('to', 'NOW');
+      $query .= ' date:['.$from.' TO '.$to.']';
+      $params['facet.date.start']=$from;
+      $params['facet.date.end'] = $to;
+      $params['facet.date.gap'] = '+1MONTH';
+      $this->selected['from'][$from] = 1;
+      $this->selected['to'][$to] = 1;
+    }
     if ($date) {
-      $dates = explode(',', $date);
-      $date = array_pop($dates);
-      $period = 'MONTH';
-      if (count($dates) == 1)
-            $period = 'DAY';
-      $query .= ' date:['.$date.' TO '.$date.'+1'.$period.']';
       $this->selected['date'][$date] = 1;
-      $params['facet.date.start']=$date;
-      $params['facet.date.end'] = $date.'+1'.$period;
-      $params['facet.date.gap'] = '+1DAY';
-    }else {
-      if ($from) {
-              $to = $request->getParameter('to', 'NOW');
-              $query .= ' date:['.$from.' TO '.$to.']';
-        $params['facet.date.start']=$from;
-              $params['facet.date.end'] = $to;
-              $params['facet.date.gap'] = '+1MONTH';
+      if (!$from) {
+        $dates = explode(',', $date);
+        $date = array_pop($dates);
+        $period = 'MONTH';
+        if (count($dates) == 1)
+          $period = 'DAY';
+        $query .= ' date:['.$date.' TO '.$date.'+1'.$period.']';
+        $params['facet.date.start']=$date;
+        $params['facet.date.end'] = $date.'+1'.$period;
+        $params['facet.date.gap'] = '+1DAY';
       }
     }

cpc/trunk/project/apps/frontend/modules/solr/templates/searchSuccess.php

@@ -229 +229 @@
 <div class="item">
       <h4><a href="<?php echo $record['link']; ?>"><?php echo $record['titre']; ?></a></h4>
-      <?php if ($record['photo']) { ?><p class="photo"><a href="<?php echo $record['link']; ?>" rel="nofollow"><img width="53" src="<?php echo $record['photo']; ?>"/></a></p><?php } ?>
+      <?php if ($record['photo']) { ?><p class="photo"><a href="<?php echo $record['link']; ?>" rel="nofollow"><?php echo $record['photo']; ?></a></p><?php } ?>
       <p class="intervenant"><a href="<?php echo $record['link']; ?>" rel="nofollow"><?php echo $record['personne']; ?></a></p>
       <p class="content"><?php echo $record['highlighting']; ?></p>