Changeset 1414

Timestamp:

Sep 25, 2010, 9:55:49 PM (10 years ago)

Author:

teymour

Message:

Bug du index_if

Location:

cpc/trunk/project/lib/model

Files:

• doctrine/Commentaire.class.php (modified) (3 diffs)
• doctrine/ParlementairePhoto.class.php (modified) (1 diff)
• solr/SolrListener.php (modified) (2 diffs)

cpc/trunk/project/lib/model/doctrine/Commentaire.class.php

@@ -11 +11 @@
   }
   public function getPersonne() {
-    return $this->getCitoyen()->getLogin();
+    if ($this->getCitoyen())
+      return $this->getCitoyen()->getLogin();
+    return '';
   }
   public function getTitre() {
@@ -80 +82 @@
 
   public function updateNbCommentaires($inc = 0) {
-    $o = Doctrine::getTable($this->object_type)->find($this->object_id);
-    $o->updateNbCommentaires($inc);
+    if ($this->object_type) {
+      $o = Doctrine::getTable($this->object_type)->find($this->object_id);
+      $o->updateNbCommentaires($inc);
+    }
     foreach ($this->getObjects() as $object) {
       $o = Doctrine::getTable($object->object_type)->find($object->object_id);
@@ -89 +93 @@
   }
 
-  public function setIsPublic($b) {
-    $this->_set('is_public', $b);
-    if ($this->id) {
-      $this->updateNbCommentaires(($b) ? 1 : -1);
-    }
-  }
   public function getLien() {
     return preg_replace('/@amendement\?id=/', '@amendement_id?id=', $this->_get('lien'));
   }
+
+  public function save(Doctrine_Connection $c = null) {
+    parent::save($c);
+    $b = $this->is_public;
+    $this->updateNbCommentaires(($b) ? 1 : -1);
+  }
 }

cpc/trunk/project/lib/model/doctrine/ParlementairePhoto.class.php

@@ -19 +19 @@
     return base64_decode($this->_get('photo'));
   }
-  public function save(Doctrine_Connection $c = null) {
-    return parent::save($c);
-  }
 }

cpc/trunk/project/lib/model/solr/SolrListener.php

@@ -72 +72 @@
 
     $t = null;
-    if (isset( $this->_options['index_if']) && $t = $this->_options['index_if'] && $t && !$obj->get($t))
-      return ;
+    if (isset( $this->_options['index_if']) && $t = $this->_options['index_if']) {
+      if (!($obj->get($t))) {
+        return $this->postDelete($event);
+      }
+    }
     
     $json = array();
@@ -79 +82 @@
     $json['object_id'] =  $obj->getId();
     $json['object_name'] = get_class($obj);
-    
     if (isset($this->_options['description']) && $t = $this->_options['description']) {
       $content = $this->getObjFieldsValue($obj, $t);