From: <gem...@li...> - 2011-11-08 10:12:25
|
Revision: 190 http://gemstracker.svn.sourceforge.net/gemstracker/?rev=190&view=rev Author: matijsdejong Date: 2011-11-08 10:12:18 +0000 (Tue, 08 Nov 2011) Log Message: ----------- Restoring token check in show. Modified Paths: -------------- trunk/library/classes/Gems/Default/RespondentAction.php Modified: trunk/library/classes/Gems/Default/RespondentAction.php =================================================================== --- trunk/library/classes/Gems/Default/RespondentAction.php 2011-11-08 09:42:10 UTC (rev 189) +++ trunk/library/classes/Gems/Default/RespondentAction.php 2011-11-08 10:12:18 UTC (rev 190) @@ -401,6 +401,12 @@ // Log $this->openedRespondent($data['gr2o_patient_nr'], $data['gr2o_id_organization'], $data['grs_id_user']); + // Check for completed tokens + if ($this->loader->getTracker()->processCompletedTokens($data['grs_id_user'], $this->session->user_id)) { + //As data might have changed due to token events... reload + $data = $model->applyRequest($this->getRequest(), true)->loadFirst(); + } + if ($data['gr2o_consent'] == $model->get('gr2o_consent', 'default')) { $url = $this->view->url(array('controller' => 'respondent', 'action' => 'edit', 'id' => $data['gr2o_patient_nr'])) . '#tabContainer-frag-3'; $this->addMessage(MUtil_Html::create()->a($url, $this->_('Please settle the informed consent form for this respondent.'))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |