[Gemstracker-svn] SF.net SVN: gemstracker:[668] trunk/library/classes/Gems

[<gem...@li...>]

Revision: 668
          http://gemstracker.svn.sourceforge.net/gemstracker/?rev=668&view=rev
Author:   matijsdejong
Date:     2012-05-04 11:38:33 +0000 (Fri, 04 May 2012)
Log Message:
-----------
Fix for #505 in Pulse bugtracker display order of answers corrected
Showing anwsers no longer results in returning to that answer screen after answering a new survey.

Modified Paths:
--------------
    trunk/library/classes/Gems/Default/TrackActionAbstract.php
    trunk/library/classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php

Modified: trunk/library/classes/Gems/Default/TrackActionAbstract.php
===================================================================
--- trunk/library/classes/Gems/Default/TrackActionAbstract.php	2012-05-04 11:36:04 UTC (rev 667)
+++ trunk/library/classes/Gems/Default/TrackActionAbstract.php	2012-05-04 11:38:33 UTC (rev 668)
@@ -365,8 +365,11 @@
     {
         parent::init();
 
-        // Tell the system where to return to after a survey has been taken
-        $this->loader->getCurrentUser()->setSurveyReturn($this->getRequest());
+        $request = $this->getRequest();
+        if ('answer' !== $request->getActionName()) {
+            // Tell the system where to return to after a survey has been taken
+            $this->loader->getCurrentUser()->setSurveyReturn($request);
+        }
     }
 
     public function initFilter()

Modified: trunk/library/classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php
===================================================================
--- trunk/library/classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php	2012-05-04 11:36:04 UTC (rev 667)
+++ trunk/library/classes/Gems/Tracker/Snippets/AnswerModelSnippetGeneric.php	2012-05-04 11:38:33 UTC (rev 668)
@@ -53,7 +53,7 @@
      *
      * @var array
      */
-    protected $_fixedSort = array('gto_valid_from' => SORT_ASC, 'gto_round_order' => SORT_ASC);
+    protected $_fixedSort = array('grc_success' => SORT_DESC, 'gto_round_order' => SORT_ASC, 'gto_valid_from' => SORT_ASC);
 
     /**
      * Shortfix to add class attribute

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.