Revision: 1126
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=1126&view=rev
Author: mennodekker
Date: 2013-01-30 10:05:29 +0000 (Wed, 30 Jan 2013)
Log Message:
-----------
Misc. changes from trunk to tag
Modified Paths:
--------------
tags/1.5.7/library/classes/Gems/Export/Spss.php
tags/1.5.7/library/classes/Gems/Menu/MenuAbstract.php
tags/1.5.7/library/classes/Gems/Tracker/Token.php
tags/1.5.7/library/snippets/RespondentDetailsSnippet.php
Modified: tags/1.5.7/library/classes/Gems/Export/Spss.php
===================================================================
--- tags/1.5.7/library/classes/Gems/Export/Spss.php 2013-01-29 13:47:18 UTC (rev 1125)
+++ tags/1.5.7/library/classes/Gems/Export/Spss.php 2013-01-30 10:05:29 UTC (rev 1126)
@@ -270,7 +270,7 @@
$size = $answerModel->get($key, 'maxlength'); // This comes from db when available
if (is_null($size)) {
$size = $answerModel->get($key, 'size'); // This is the display width
- if ($is_null($size)) {
+ if (is_null($size)) {
$size = $defaultSize; // We just don't know, make it the default
}
}
Modified: tags/1.5.7/library/classes/Gems/Menu/MenuAbstract.php
===================================================================
--- tags/1.5.7/library/classes/Gems/Menu/MenuAbstract.php 2013-01-29 13:47:18 UTC (rev 1125)
+++ tags/1.5.7/library/classes/Gems/Menu/MenuAbstract.php 2013-01-30 10:05:29 UTC (rev 1126)
@@ -54,7 +54,7 @@
*/
public $escort;
- protected $_subItems;
+ protected $_subItems = array();
/**
* Copy from Zend_Translate_Adapter
@@ -117,6 +117,7 @@
$i = 0;
$pages = array();
foreach ($this->_subItems as $item) {
+ $item->sortByOrder();
if (! $item->get('button_only')) {
$page = $item->_toNavigationArray($source);
Modified: tags/1.5.7/library/classes/Gems/Tracker/Token.php
===================================================================
--- tags/1.5.7/library/classes/Gems/Tracker/Token.php 2013-01-29 13:47:18 UTC (rev 1125)
+++ tags/1.5.7/library/classes/Gems/Tracker/Token.php 2013-01-30 10:05:29 UTC (rev 1126)
@@ -201,7 +201,7 @@
$respId = $this->_gemsData['gto_id_respondent'];
$orgId = $this->_gemsData['gto_id_organization'];
- MUtil_Echo::track($this->_gemsData);
+ // MUtil_Echo::track($this->_gemsData);
if ($row = $this->db->fetchRow($sql, array($respId, $orgId))) {
$this->_gemsData = $this->_gemsData + $row;
Modified: tags/1.5.7/library/snippets/RespondentDetailsSnippet.php
===================================================================
--- tags/1.5.7/library/snippets/RespondentDetailsSnippet.php 2013-01-29 13:47:18 UTC (rev 1125)
+++ tags/1.5.7/library/snippets/RespondentDetailsSnippet.php 2013-01-30 10:05:29 UTC (rev 1126)
@@ -68,7 +68,11 @@
$address[] = $bridge->grs_city;
// ROW 0
- $bridge->addItem($bridge->gr2o_patient_nr, $this->_('Respondent nr: '));
+ $label = $this->model->get('gr2o_patient_nr', 'label');
+ if (empty($label)) {
+ $label = $this->_('Respondent nr: ');
+ }
+ $bridge->addItem($bridge->gr2o_patient_nr, $label);
$bridge->addItem(
$HTML->spaced($bridge->itemIf('grs_last_name', array($bridge->grs_last_name, ',')), $bridge->grs_gender, $bridge->grs_first_name, $bridge->grs_surname_prefix),
$this->_('Respondent'));
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
