Changeset 74

Timestamp:

02/24/06 14:55:52 (3 years ago)

Author:

fabien

Message:

fixed pagination problems

Files:

• trunk/apps/frontend/config/databases.yml (modified) (1 diff)
• trunk/apps/frontend/config/settings.yml (modified) (2 diffs)
• trunk/apps/frontend/lib/helper/GlobalHelper.php (modified) (2 diffs)
• trunk/apps/frontend/modules/moderator/templates/reportedAnswersSuccess.php (modified) (1 diff)
• trunk/apps/frontend/modules/moderator/templates/reportedQuestionsSuccess.php (modified) (1 diff)
• trunk/lib/model/om/BaseAnswer.php (modified) (13 diffs)
• trunk/lib/model/om/BaseAnswerPeer.php (modified) (3 diffs)
• trunk/lib/model/om/BaseInterest.php (modified) (6 diffs)
• trunk/lib/model/om/BaseInterestPeer.php (modified) (3 diffs)
• trunk/lib/model/om/BaseQuestion.php (modified) (22 diffs)
• trunk/lib/model/om/BaseQuestionPeer.php (modified) (3 diffs)
• trunk/lib/model/om/BaseQuestionTag.php (modified) (6 diffs)
• trunk/lib/model/om/BaseQuestionTagPeer.php (modified) (3 diffs)
• trunk/lib/model/om/BaseRelevancy.php (modified) (6 diffs)
• trunk/lib/model/om/BaseRelevancyPeer.php (modified) (3 diffs)
• trunk/lib/model/om/BaseReportAnswer.php (modified) (6 diffs)
• trunk/lib/model/om/BaseReportAnswerPeer.php (modified) (3 diffs)
• trunk/lib/model/om/BaseReportQuestion.php (modified) (6 diffs)
• trunk/lib/model/om/BaseReportQuestionPeer.php (modified) (3 diffs)
• trunk/lib/model/om/BaseSearchIndex.php (modified) (6 diffs)
• trunk/lib/model/om/BaseSearchIndexPeer.php (modified) (3 diffs)
• trunk/lib/model/om/BaseUser.php (modified) (28 diffs)
• trunk/lib/model/om/BaseUserPeer.php (modified) (3 diffs)

trunk/apps/frontend/config/databases.yml

@@ -1 +1 @@
-all:
-default
+symfony
-    class:          sfPropelDatabase
-    param:
-      datasource:   symfony
-      phptype:      mysql
-      hostspec:     localhost

trunk/apps/frontend/config/settings.yml

@@ -33 +33 @@
-    i18n:                   on
-
+    use_database:           on
+
-#    default_module:         default
-#    default_action:         index
@@ -61 +63 @@
-#    url_format:             PATH
-#    
-#    use_database:           off
-#
-#    use_security:           on

trunk/apps/frontend/lib/helper/GlobalHelper.php

@@ -29 +29 @@
-
-    // First and previous page
-
-
-
+
+
+
+
+
+
-    // Pages one by one
-    $links = array();
@@ -41 +44 @@
-
-    // Next and last page
-
-
+
+
+
+
+
+
-  }
-

trunk/apps/frontend/modules/moderator/templates/reportedAnswersSuccess.php

@@ -19 +19 @@
-
-<div id="question_pager" class="right">
-@
+moderator/reportedAnswers
-</div>

trunk/apps/frontend/modules/moderator/templates/reportedQuestionsSuccess.php

@@ -17 +17 @@
-
-<div id="question_pager" class="right">
-@
+moderator/reportedQuestions
-</div>

trunk/lib/model/om/BaseAnswer.php

@@ -608 +608 @@
-
-    /**
+     * Array of ValidationFailed objects.
+     * @var array ValidationFailed[]
+     */
+    protected $validationFailures = array();
+
+    /**
+     * Gets any ValidationFailed objects that resulted from last call to validate().
+     *
+     *
+     * @return array ValidationFailed[]
+     * @see validate()
+     */
+    public function getValidationFailures()
+    {
+        return $this->validationFailures;
+    }
+
+    /**
-     * Validates the objects modified field values and all objects related to this table.
-     *
@@ -614 +632 @@
-     *
-     * @param mixed $columns Column name or an array of column names.
-
-
-
+
-     * @see doValidate()
+     * @see getValidationFailures()
-     */
-    public function validate($columns = null)
-    {
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -634 +655 @@
-     * an aggreagated array of ValidationFailed objects will be returned.
-     *
+     * @param array $columns Array of column names to validate.
-     * @return mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
-     */
-
+$columns = null
-    {
-        if (!$this->alreadyInValidation) {
@@ -651 +673 @@
-
-            if ($this->aQuestion !== null) {
-($retval = $this->aQuestion->validate()) !== true
-retval
+!$this->aQuestion->validate($columns)
+this->aQuestion->getValidationFailures()
-                }
-            }
-
-            if ($this->aUser !== null) {
-($retval = $this->aUser->validate()) !== true
-retval
+!$this->aUser->validate($columns)
+this->aUser->getValidationFailures()
-                }
-            }
-
-
-
+, $columns
-                $failureMap = array_merge($failureMap, $retval);
-            }
@@ -670 +692 @@
-                if ($this->collRelevancys !== null) {
-                    foreach($this->collRelevancys as $referrerFK) {
-($retval = $referrerFK->validate()) !== true
-tval
+!$referrerFK->validate($columns)
+ferrerFK->getValidationFailures()
-                        }
-                    }
@@ -678 +700 @@
-                if ($this->collReportAnswers !== null) {
-                    foreach($this->collReportAnswers as $referrerFK) {
-($retval = $referrerFK->validate()) !== true
-tval
+!$referrerFK->validate($columns)
+ferrerFK->getValidationFailures()
-                        }
-                    }
@@ -702 +724 @@
-    public function getByName($name, $type = BasePeer::TYPE_PHPNAME)
-    {
-        $names = AnswerPeer::getFieldNames($type);
-        $pos = AnswerPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
-        return $this->getByPosition($pos);
@@ -789 +810 @@
-    public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME)
-    {
-
-
+
-        return $this->setByPosition($pos, $value);
-    }
@@ -961 +981 @@
-
-            foreach($this->getRelevancys() as $relObj) {
-
+
+
+
-            }
-
-            foreach($this->getReportAnswers() as $relObj) {
-
+
+
+
-            }
-
@@ -1189 +1213 @@
-     *
-     * @param Criteria $criteria
+     * @param boolean $distinct
-     * @param Connection $con
-     * @throws PropelException
-     */
-
+distinct = false, $
-    {
-        // include the Peer class
@@ -1206 +1231 @@
-        $criteria->add(RelevancyPeer::ANSWER_ID, $this->getId());
-
-
+distinct, $
-    }
-
@@ -1344 +1369 @@
-     *
-     * @param Criteria $criteria
+     * @param boolean $distinct
-     * @param Connection $con
-     * @throws PropelException
-     */
-
+distinct = false, $
-    {
-        // include the Peer class
@@ -1361 +1387 @@
-        $criteria->add(ReportAnswerPeer::ANSWER_ID, $this->getId());
-
-
+distinct, $
-    }
-

trunk/lib/model/om/BaseAnswerPeer.php

@@ -104 +104 @@
-     * @throws PropelException Any exceptions caught during processing will be
-     *       rethrown wrapped into a PropelException.
-todo Consider having template build the array rather than doing it at runtime
+deprecated Use the getFieldNames() and translateFieldName() methods instead of this
-     */
-    public static function getPhpNameMap()
@@ -169 +169 @@
-    public static function alias($alias, $column)
-    {
-$alias . substr($column, strlen(AnswerPeer::TABLE_NAME)
+str_replace(AnswerPeer::TABLE_NAME.'.', $alias.'.', $column
-    }
-
@@ -1083 +1083 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-

trunk/lib/model/om/BaseInterest.php

@@ -350 +350 @@
-
-    /**
+     * Array of ValidationFailed objects.
+     * @var array ValidationFailed[]
+     */
+    protected $validationFailures = array();
+
+    /**
+     * Gets any ValidationFailed objects that resulted from last call to validate().
+     *
+     *
+     * @return array ValidationFailed[]
+     * @see validate()
+     */
+    public function getValidationFailures()
+    {
+        return $this->validationFailures;
+    }
+
+    /**
-     * Validates the objects modified field values and all objects related to this table.
-     *
@@ -356 +374 @@
-     *
-     * @param mixed $columns Column name or an array of column names.
-
-
-
+
-     * @see doValidate()
+     * @see getValidationFailures()
-     */
-    public function validate($columns = null)
-    {
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -376 +397 @@
-     * an aggreagated array of ValidationFailed objects will be returned.
-     *
+     * @param array $columns Array of column names to validate.
-     * @return mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
-     */
-
+$columns = null
-    {
-        if (!$this->alreadyInValidation) {
@@ -393 +415 @@
-
-            if ($this->aQuestion !== null) {
-($retval = $this->aQuestion->validate()) !== true
-retval
+!$this->aQuestion->validate($columns)
+this->aQuestion->getValidationFailures()
-                }
-            }
-
-            if ($this->aUser !== null) {
-($retval = $this->aUser->validate()) !== true
-retval
+!$this->aUser->validate($columns)
+this->aUser->getValidationFailures()
-                }
-            }
-
-
-
+, $columns
-                $failureMap = array_merge($failureMap, $retval);
-            }
@@ -428 +450 @@
-    public function getByName($name, $type = BasePeer::TYPE_PHPNAME)
-    {
-        $names = InterestPeer::getFieldNames($type);
-        $pos = InterestPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
-        return $this->getByPosition($pos);
@@ -491 +512 @@
-    public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME)
-    {
-
-
+
-        return $this->setByPosition($pos, $value);
-    }

trunk/lib/model/om/BaseInterestPeer.php

@@ -86 +86 @@
-     * @throws PropelException Any exceptions caught during processing will be
-     *       rethrown wrapped into a PropelException.
-todo Consider having template build the array rather than doing it at runtime
+deprecated Use the getFieldNames() and translateFieldName() methods instead of this
-     */
-    public static function getPhpNameMap()
@@ -151 +151 @@
-    public static function alias($alias, $column)
-    {
-$alias . substr($column, strlen(InterestPeer::TABLE_NAME)
+str_replace(InterestPeer::TABLE_NAME.'.', $alias.'.', $column
-    }
-
@@ -1071 +1071 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-

trunk/lib/model/om/BaseQuestion.php

@@ -717 +717 @@
-
-    /**
+     * Array of ValidationFailed objects.
+     * @var array ValidationFailed[]
+     */
+    protected $validationFailures = array();
+
+    /**
+     * Gets any ValidationFailed objects that resulted from last call to validate().
+     *
+     *
+     * @return array ValidationFailed[]
+     * @see validate()
+     */
+    public function getValidationFailures()
+    {
+        return $this->validationFailures;
+    }
+
+    /**
-     * Validates the objects modified field values and all objects related to this table.
-     *
@@ -723 +741 @@
-     *
-     * @param mixed $columns Column name or an array of column names.
-
-
-
+
-     * @see doValidate()
+     * @see getValidationFailures()
-     */
-    public function validate($columns = null)
-    {
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -743 +764 @@
-     * an aggreagated array of ValidationFailed objects will be returned.
-     *
+     * @param array $columns Array of column names to validate.
-     * @return mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
-     */
-
+$columns = null
-    {
-        if (!$this->alreadyInValidation) {
@@ -760 +782 @@
-
-            if ($this->aUser !== null) {
-($retval = $this->aUser->validate()) !== true
-retval
-
-
-
-
-
+!$this->aUser->validate($columns)
+this->aUser->getValidationFailures()
+
+
+
+
+, $columns
-                $failureMap = array_merge($failureMap, $retval);
-            }
@@ -773 +795 @@
-                if ($this->collAnswers !== null) {
-                    foreach($this->collAnswers as $referrerFK) {
-($retval = $referrerFK->validate()) !== true
-tval
+!$referrerFK->validate($columns)
+ferrerFK->getValidationFailures()
-                        }
-                    }
@@ -781 +803 @@
-                if ($this->collInterests !== null) {
-                    foreach($this->collInterests as $referrerFK) {
-($retval = $referrerFK->validate()) !== true
-tval
+!$referrerFK->validate($columns)
+ferrerFK->getValidationFailures()
-                        }
-                    }
@@ -789 +811 @@
-                if ($this->collQuestionTags !== null) {
-                    foreach($this->collQuestionTags as $referrerFK) {
-($retval = $referrerFK->validate()) !== true
-tval
+!$referrerFK->validate($columns)
+ferrerFK->getValidationFailures()
-                        }
-                    }
@@ -797 +819 @@
-                if ($this->collSearchIndexs !== null) {
-                    foreach($this->collSearchIndexs as $referrerFK) {
-($retval = $referrerFK->validate()) !== true
-tval
+!$referrerFK->validate($columns)
+ferrerFK->getValidationFailures()
-                        }
-                    }
@@ -805 +827 @@
-                if ($this->collReportQuestions !== null) {
-                    foreach($this->collReportQuestions as $referrerFK) {
-($retval = $referrerFK->validate()) !== true
-tval
+!$referrerFK->validate($columns)
+ferrerFK->getValidationFailures()
-                        }
-                    }
@@ -829 +851 @@
-    public function getByName($name, $type = BasePeer::TYPE_PHPNAME)
-    {
-        $names = QuestionPeer::getFieldNames($type);
-        $pos = QuestionPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
-        return $this->getByPosition($pos);
@@ -920 +941 @@
-    public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME)
-    {
-
-
+
-        return $this->setByPosition($pos, $value);
-    }
@@ -1099 +1119 @@
-
-            foreach($this->getAnswers() as $relObj) {
-
+
+
+
-            }
-
-            foreach($this->getInterests() as $relObj) {
-
+
+
+
-            }
-
-            foreach($this->getQuestionTags() as $relObj) {
-
+
+
+
-            }
-
-            foreach($this->getSearchIndexs() as $relObj) {
-
+
+
+
-            }
-
-            foreach($this->getReportQuestions() as $relObj) {
-
+
+
+
-            }
-
@@ -1288 +1318 @@
-     *
-     * @param Criteria $criteria
+     * @param boolean $distinct
-     * @param Connection $con
-     * @throws PropelException
-     */
-
+distinct = false, $
-    {
-        // include the Peer class
@@ -1305 +1336 @@
-        $criteria->add(AnswerPeer::QUESTION_ID, $this->getId());
-
-
+distinct, $
-    }
-
@@ -1443 +1474 @@
-     *
-     * @param Criteria $criteria
+     * @param boolean $distinct
-     * @param Connection $con
-     * @throws PropelException
-     */
-
+distinct = false, $
-    {
-        // include the Peer class
@@ -1460 +1492 @@
-        $criteria->add(InterestPeer::QUESTION_ID, $this->getId());
-
-
+distinct, $
-    }
-
@@ -1598 +1630 @@
-     *
-     * @param Criteria $criteria
+     * @param boolean $distinct
-     * @param Connection $con
-     * @throws PropelException
-     */
-
+distinct = false, $
-    {
-        // include the Peer class
@@ -1615 +1648 @@
-        $criteria->add(QuestionTagPeer::QUESTION_ID, $this->getId());
-
-
+distinct, $
-    }
-
@@ -1753 +1786 @@
-     *
-     * @param Criteria $criteria
+     * @param boolean $distinct
-     * @param Connection $con
-     * @throws PropelException
-     */
-
+distinct = false, $
-    {
-        // include the Peer class
@@ -1770 +1804 @@
-        $criteria->add(SearchIndexPeer::QUESTION_ID, $this->getId());
-
-
+distinct, $
-    }
-
@@ -1859 +1893 @@
-     *
-     * @param Criteria $criteria
+     * @param boolean $distinct
-     * @param Connection $con
-     * @throws PropelException
-     */
-
+distinct = false, $
-    {
-        // include the Peer class
@@ -1876 +1911 @@
-        $criteria->add(ReportQuestionPeer::QUESTION_ID, $this->getId());
-
-
+distinct, $
-    }
-

trunk/lib/model/om/BaseQuestionPeer.php

@@ -107 +107 @@
-     * @throws PropelException Any exceptions caught during processing will be
-     *       rethrown wrapped into a PropelException.
-todo Consider having template build the array rather than doing it at runtime
+deprecated Use the getFieldNames() and translateFieldName() methods instead of this
-     */
-    public static function getPhpNameMap()
@@ -172 +172 @@
-    public static function alias($alias, $column)
-    {
-$alias . substr($column, strlen(QuestionPeer::TABLE_NAME)
+str_replace(QuestionPeer::TABLE_NAME.'.', $alias.'.', $column
-    }
-
@@ -746 +746 @@
-        }
-
-
+
+
+
+
+
+
+
+
+
+
-    }
-

trunk/lib/model/om/BaseQuestionTag.php

@@ -422 +422 @@
-
-    /**
+     * Array of ValidationFailed objects.
+     * @var array ValidationFailed[]
+     */
+    protected $validationFailures = array();
+
+    /**
+     * Gets any ValidationFailed objects that resulted from last call to validate().
+     *
+     *
+     * @return array ValidationFailed[]
+     * @see validate()
+     */
+    public function getValidationFailures()
+    {
+        return $this->validationFailures;
+    }
+
+    /**
-     * Validates the objects modified field values and all objects related to this table.
-     *
@@ -428 +446 @@
-     *
-     * @param mixed $columns Column name or an array of column names.
-
-
-
+
-     * @see doValidate()
+     * @see getValidationFailures()
-     */
-    public function validate($columns = null)
-    {
-
-
-
-
+
+
+
+
+
+
+
+
-    }
-
@@ -448 +469 @@
-     * an aggreagated array of ValidationFailed objects will be returned.
-     *
+     * @param array $columns Array of column names to validate.
-     * @return mixed <code>true</code> if all validations pass; array of <code>ValidationFailed</code> objets otherwise.
-     */
-
+$columns = null
-    {
-        if (!$this->alreadyInValidation) {
@@ -465 +487 @@
-
-            if ($this->aQuestion !== null) {
-($retval = $this->aQuestion->validate()) !== true
-retval
+!$this->aQuestion->validate($columns)
+this->aQuestion->getValidationFailures()
-                }
-            }
-
-            if ($this->aUser !== null) {
-($retval = $this->aUser->validate()) !== true
-retval
+!$this->aUser->validate($columns)
+this->aUser->getValidationFailures()
-                }
-            }
-
-
-
+, $columns
-                $failureMap = array_merge($failureMap, $retval);
-            }
@@ -500 +522 @@
-    public function getByName($name, $type = BasePeer::TYPE_PHPNAME)
-    {
-        $names = QuestionTagPeer::getFieldNames($type);
-        $pos = QuestionTagPeer::translateFieldName($name, $type, BasePeer::TYPE_NUM);
-        return $this->getByPosition($pos);
@@ -571 +592 @@
-    public function setByName($name, $value, $type = BasePeer::TYPE_PHPNAME)
-    {
-
-
+
-        return $this->setByPosition($pos, $value);
-    }

trunk/lib/model/om/BaseQuestionTagPeer.php

@@ -92 +92 @@
-     * @throws PropelException Any exceptions caught during processing will be
-     *       rethrown wrapped into a PropelException.
-todo Consider having template build the array rather than doing it at runtime
+deprecated Use the getFieldNames() and translateFieldName() methods instead of this
-     */
-    public static function getPhpNameMap()
@@ -157 +157 @@
-    public static function alias($alias, $column)
-    {
-$alias . substr($column, strlen(QuestionTagPeer::TABLE_NAME)
+str_replace(QuestionTagPeer::TABLE_NAME.'.', $alias.'.', $column
-    }
-
@@ -1086 +1086 @@
-        }
-
-
+
+
+
+
+
+