Menu
▾
▴
gemstracker-svn
|
From: <gem...@li...> - 2011-11-29 11:38:32
|
Revision: 313
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=313&view=rev
Author: matijsdejong
Date: 2011-11-29 11:38:22 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Fixes for MGZ tracker isses 461, 457 en een begin voor 456
Modified Paths:
--------------
branches/1.5.0-pulse/library/classes/Gems/Default/StaffAction.php
branches/1.5.0-pulse/library/classes/GemsEscort.php
branches/1.5.0-pulse/library/configs/db/patches.sql
branches/1.5.0-pulse/library/configs/db/tables/gems__organizations.20.sql
Modified: branches/1.5.0-pulse/library/classes/Gems/Default/StaffAction.php
===================================================================
--- branches/1.5.0-pulse/library/classes/Gems/Default/StaffAction.php 2011-11-29 11:15:11 UTC (rev 312)
+++ branches/1.5.0-pulse/library/classes/Gems/Default/StaffAction.php 2011-11-29 11:38:22 UTC (rev 313)
@@ -166,6 +166,7 @@
$bridge->addText( 'gsf_email', array('size' => 30))->addValidator('SimpleEmail')->addValidator($model->createUniqueValidator('gsf_email'));
$bridge->addSelect('gsf_id_primary_group');
+ $bridge->addCheckbox('gul_can_login', 'description', $this->_('Users can only login when this box is checked.'));
$bridge->addCheckbox('gsf_logout_on_survey', 'description', $this->_('If checked the user will logoff when answering a survey.'));
$bridge->addSelect('gsf_iso_lang');
@@ -222,10 +223,11 @@
if ($detailed) {
$model->set('gul_user_class', 'default', $this->defaultStaffDefinition);
$model->set('gsf_iso_lang', 'label', $this->_('Language'), 'multiOptions', $this->util->getLocalized()->getLanguages());
+ $model->set('gul_can_login', 'label', $this->_('Can login'), 'multiOptions', $this->util->getTranslated()->getYesNo());
$model->set('gsf_logout_on_survey', 'label', $this->_('Logout on survey'), 'multiOptions', $this->util->getTranslated()->getYesNo());
}
- $model->setDeleteValues('gsf_active', 0);
+ $model->setDeleteValues('gsf_active', 0, 'gul_can_login', 0);
return $model;
}
Modified: branches/1.5.0-pulse/library/classes/GemsEscort.php
===================================================================
--- branches/1.5.0-pulse/library/classes/GemsEscort.php 2011-11-29 11:15:11 UTC (rev 312)
+++ branches/1.5.0-pulse/library/classes/GemsEscort.php 2011-11-29 11:38:22 UTC (rev 313)
@@ -797,7 +797,7 @@
protected function _layoutOrganizationSwitcher() // Gems_Project_Organization_MultiOrganizationInterface
{
$user = $this->getLoader()->getCurrentUser();
- if ($orgs = $user->getAllowedOrganizations()) {
+ if ($user->isActive() && ($orgs = $user->getAllowedOrganizations())) {
// Organization switcher
$orgSwitch = MUtil_Html::create('div', array('id' => 'organizations'));
$currentId = $user->getCurrentOrganizationId();
Modified: branches/1.5.0-pulse/library/configs/db/patches.sql
===================================================================
--- branches/1.5.0-pulse/library/configs/db/patches.sql 2011-11-29 11:15:11 UTC (rev 312)
+++ branches/1.5.0-pulse/library/configs/db/patches.sql 2011-11-29 11:38:22 UTC (rev 313)
@@ -331,6 +331,8 @@
UPDATE `gems__organizations` SET gor_has_login = COALESCE((SELECT 1 FROM gems__staff WHERE gsf_id_organization = gor_id_organization GROUP BY gsf_id_organization), 0);
+ALTER TABLE `gems__organizations` CHANGE `gor_has_respondents` `gor_has_respondents` TINYINT( 1 ) NOT NULL DEFAULT '0';
+
-- PATCH: Log failed logins
INSERT INTO `gems__log_actions` (`glac_id_action`, `glac_name`, `glac_change`, `glac_log`, `glac_created`)
VALUES (NULL , 'loginFail', '0', '1', CURRENT_TIMESTAMP);
Modified: branches/1.5.0-pulse/library/configs/db/tables/gems__organizations.20.sql
===================================================================
--- branches/1.5.0-pulse/library/configs/db/tables/gems__organizations.20.sql 2011-11-29 11:15:11 UTC (rev 312)
+++ branches/1.5.0-pulse/library/configs/db/tables/gems__organizations.20.sql 2011-11-29 11:38:22 UTC (rev 313)
@@ -21,7 +21,7 @@
not null default 'en' references gems__languages (gml_iso_lang),
gor_has_login boolean not null default 1,
- gor_has_respondents boolean not null default 1,
+ gor_has_respondents boolean not null default 0,
gor_add_respondents boolean not null default 1,
gor_respondent_group bigint unsigned references gems__groups (ggp_id_group) null,
gor_active boolean not null default 1,
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-11-29 16:27:03
|
Revision: 315
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=315&view=rev
Author: matijsdejong
Date: 2011-11-29 16:26:57 +0000 (Tue, 29 Nov 2011)
Log Message:
-----------
Reverted changed, they removed the error, but did not solve the problem.
The problem on deleting staff is something low level in JoinModel and I'm thinking about how to solve it.
Modified Paths:
--------------
branches/1.5.0-pulse/library/classes/MUtil/Model/JoinModel.php
branches/1.5.0-pulse/library/configs/db/patches.sql
Modified: branches/1.5.0-pulse/library/classes/MUtil/Model/JoinModel.php
===================================================================
--- branches/1.5.0-pulse/library/classes/MUtil/Model/JoinModel.php 2011-11-29 14:55:15 UTC (rev 314)
+++ branches/1.5.0-pulse/library/classes/MUtil/Model/JoinModel.php 2011-11-29 16:26:57 UTC (rev 315)
@@ -175,6 +175,7 @@
$filter = $this->_checkFilterUsed($filter);
if ($this->_deleteValues) {
+ // MUtil_Model::$verbose = true;
$changed = $this->save($this->_deleteValues + $filter, $filter, $saveTables);
} else {
$changed = 0;
@@ -255,8 +256,7 @@
$oldChanged = $this->getChanged();
- // MUtil_Echo::r($newValues, __CLASS__ . '->' . __FUNCTION__);
- // MUtil_Echo::r($saveTables, __CLASS__ . '->' . __FUNCTION__);
+ // MUtil_Echo::track($newValues, $filter, $saveTables, $this->_joinFields);
$oldValues = $newValues;
foreach ($saveTables as $table_name) {
@@ -265,6 +265,7 @@
// Use is_string as $target and $target can be e.g. a Zend_Db_Expr() object
if (! (is_string($target) && isset($newValues[$target]) && $newValues[$target])) {
if (! (is_string($source) && isset($newValues[$source]) && $newValues[$source])) {
+ // MUtil_Echo::track('Missing: ' . $source . ' -> ' . $target);
continue;
}
$newValues[$target] = $newValues[$source];
@@ -276,8 +277,8 @@
//$this->_saveTableData returns the new row values, including any automatic changes.
$newValues = $this->_saveTableData($this->_tables[$table_name], $newValues, $filter) + $oldValues;
+ // MUtil_Echo::track($oldValues, $newValues);
$oldValues = $newValues;
- // MUtil_Echo::r($newValues, 'JoinModel, after: ' . $table_name);
}
// If anything has changed, it counts as only one item for the user.
Modified: branches/1.5.0-pulse/library/configs/db/patches.sql
===================================================================
--- branches/1.5.0-pulse/library/configs/db/patches.sql 2011-11-29 14:55:15 UTC (rev 314)
+++ branches/1.5.0-pulse/library/configs/db/patches.sql 2011-11-29 16:26:57 UTC (rev 315)
@@ -353,7 +353,3 @@
grc_changed, grc_changed_by, grc_created, grc_created_by)
VALUES
('stop', 'Stop surveys', 0, 2, 0, 0, 0, 0, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1);
-
--- PATCH: Defaults for non-null columns
-ALTER TABLE `gems__user_logins` CHANGE `gul_login` `gul_login` varchar(30) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' not null default '';
-ALTER TABLE `gems__user_logins` CHANGE `gul_id_organization` `gul_id_organization` bigint not null default 0;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-12-02 12:30:07
|
Revision: 334
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=334&view=rev
Author: matijsdejong
Date: 2011-12-02 12:29:57 +0000 (Fri, 02 Dec 2011)
Log Message:
-----------
Small fixes to FieldMap to remove display bugs
Modified Paths:
--------------
branches/1.5.0-pulse/library/classes/Gems/Default/TokenPlanAction.php
branches/1.5.0-pulse/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php
branches/1.5.0-pulse/library/classes/Gems/Tracker.php
branches/1.5.0-pulse/library/languages/default-nl.mo
branches/1.5.0-pulse/library/languages/default-nl.po
Modified: branches/1.5.0-pulse/library/classes/Gems/Default/TokenPlanAction.php
===================================================================
--- branches/1.5.0-pulse/library/classes/Gems/Default/TokenPlanAction.php 2011-12-02 12:28:15 UTC (rev 333)
+++ branches/1.5.0-pulse/library/classes/Gems/Default/TokenPlanAction.php 2011-12-02 12:29:57 UTC (rev 334)
@@ -289,26 +289,28 @@
// Add track selection
if ($this->escort instanceof Gems_Project_Tracks_MultiTracksInterface) {
- $sql = "SELECT gtr_id_track, gtr_track_name FROM gems__tracks WHERE gtr_active=1 AND gtr_track_type='T' AND INSTR(gtr_organizations, '|$orgId|') > 0";
+ $sql = "SELECT gtr_id_track, gtr_track_name FROM gems__tracks WHERE gtr_active=1 AND gtr_track_type='T' AND INSTR(gtr_organizations, '|$orgId|') > 0 ORDER BY gtr_track_name";
$elements[] = $this->_createSelectElement('gto_id_track', $sql, $this->_('(all tracks)'));
}
- $sql = "SELECT gro_round_description, gro_round_description
+ $sql = "SELECT DISTINCT gro_round_description, gro_round_description
FROM gems__rounds INNER JOIN gems__tracks ON gro_id_track = gtr_id_track
WHERE gro_active=1 AND
LENGTH(gro_round_description) > 0 AND
gtr_active=1 AND
gtr_track_type='T' AND
- INSTR(gtr_organizations, '|$orgId|') > 0";
+ INSTR(gtr_organizations, '|$orgId|') > 0
+ ORDER BY gro_round_description";
$elements[] = $this->_createSelectElement('gto_round_description', $sql, $this->_('(all rounds)'));
- $sql = "SELECT gsu_id_survey, gsu_survey_name
+ $sql = "SELECT DISTINCT gsu_id_survey, gsu_survey_name
FROM gems__surveys INNER JOIN gems__rounds ON gsu_id_survey = gro_id_survey
INNER JOIN gems__tracks ON gro_id_track = gtr_id_track
WHERE gsu_active=1 AND
gro_active=1 AND
gtr_active=1 AND
- INSTR(gtr_organizations, '|$orgId|') > 0";
+ INSTR(gtr_organizations, '|$orgId|') > 0
+ ORDER BY gsu_survey_name";
/* TODO: use this when we can update this list using ajax
if (isset($data['gsu_id_primary_group'])) {
$sql .= $this->db->quoteInto(" AND gsu_id_primary_group = ?", $data['gsu_id_primary_group']);
@@ -326,7 +328,7 @@
);
$elements[] = $this->_createSelectElement('main_filter', $options);
- $sql = "SELECT ggp_id_group, ggp_name
+ $sql = "SELECT DISTINCT ggp_id_group, ggp_name
FROM gems__groups INNER JOIN gems__surveys ON ggp_id_group = gsu_id_primary_group
INNER JOIN gems__rounds ON gsu_id_survey = gro_id_survey
INNER JOIN gems__tracks ON gro_id_track = gtr_id_track
@@ -334,7 +336,8 @@
gro_active=1 AND
gtr_active=1 AND
gtr_track_type='T' AND
- INSTR(gtr_organizations, '|$orgId|') > 0";
+ INSTR(gtr_organizations, '|$orgId|') > 0
+ ORDER BY ggp_name";
$elements[] = $this->_createSelectElement('gsu_id_primary_group', $sql, $this->_('(all fillers)'));
if (($this->escort instanceof Gems_Project_Organization_MultiOrganizationInterface) &&
@@ -344,7 +347,7 @@
$elements[] = $this->_createSelectElement('gto_id_organization', $options);
}
- $sql = "SELECT gsf_id_user, CONCAT(
+ $sql = "SELECT DISTINCT gsf_id_user, CONCAT(
COALESCE(gems__staff.gsf_last_name, ''),
', ',
COALESCE(gems__staff.gsf_first_name, ''),
@@ -352,7 +355,8 @@
) AS gsf_name
FROM gems__staff INNER JOIN gems__respondent2track ON gsf_id_user = gr2t_created_by
WHERE gr2t_id_organization = $orgId AND
- gr2t_active = 1";
+ gr2t_active = 1
+ ORDER BY 2";
$elements[] = $this->_createSelectElement('gr2t_created_by', $sql, $this->_('(all staff)'));
return $elements;
Modified: branches/1.5.0-pulse/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php
===================================================================
--- branches/1.5.0-pulse/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php 2011-12-02 12:28:15 UTC (rev 333)
+++ branches/1.5.0-pulse/library/classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php 2011-12-02 12:29:57 UTC (rev 334)
@@ -287,20 +287,19 @@
$row['sq_title'] = 'other';
$row['code'] = $row['title'] . '_' . $row['sq_title'];
$row['sq_question'] = $this->translate->_('Other');
- if ($row['type'] === 'P') {
+ if ($row['type'] === 'P' || $row['type'] === 'M') {
$row['type'] = 'S';
}
$map[$row['sgq']] = $row;
- // Removed if, this field is always added with questions
- // if ($row['type'] !== 'M') {
- $row['sgq'] .= 'comment';
- $row['code'] .= 'comment';
- $row['sq_title'] .= 'comment';
- $row['sq_question'] = ($rows[$i]['type'] === 'O') ? $this->translate->_('Comment') : $row['sq_question'] . $this->translate->_(' (comment)');
- $row['type'] = 'S';
- $map[$row['sgq']] = $row;
- //}
+ if ($rows[$i]['type'] !== 'M') {
+ $row['sgq'] .= 'comment';
+ $row['code'] .= 'comment';
+ $row['sq_title'] .= 'comment';
+ $row['sq_question'] = ($rows[$i]['type'] === 'O') ? $this->translate->_('Comment') : $row['sq_question'] . $this->translate->_(' (comment)');
+ $row['type'] = 'S';
+ $map[$row['sgq']] = $row;
+ }
}
break;
@@ -613,6 +612,7 @@
// $tmpres['formatFunction']
}
+ MUtil_Echo::track($field);
if (! isset($oldfld) || ($oldfld['question'] !== $field['question'])) {
$tmpres['label'] = MUtil_Html::raw($this->removeHtml($field['question']));
}
@@ -620,7 +620,7 @@
// Juggle the labels for sub-questions etc..
if (isset($field['sq_question'])) {
if (isset($field['sq_question1'])) {
- $field['label'] = MUtil_Html::raw(sprintf($this->translate->_('%s: %s'), $field['sq_question'], $field['sq_question1']));
+ $tmpres['label'] = MUtil_Html::raw(sprintf($this->translate->_('%s: %s'), $field['sq_question'], $field['sq_question1']));
}
if (! isset($tmpres['label'])) {
$tmpres['label'] = MUtil_Html::raw($this->removeHtml($field['sq_question']));
@@ -729,7 +729,6 @@
// Optional type check
if ((! $forType) || ($field['type'] == $forType)) {
-
// Juggle the labels for sub-questions etc..
if (isset($field['sq_question1'])) {
$squestion = sprintf($this->translate->_('%s: %s'), $this->removeMarkup($field['sq_question']), $this->removeMarkup($field['sq_question1']));
Modified: branches/1.5.0-pulse/library/classes/Gems/Tracker.php
===================================================================
--- branches/1.5.0-pulse/library/classes/Gems/Tracker.php 2011-12-02 12:28:15 UTC (rev 333)
+++ branches/1.5.0-pulse/library/classes/Gems/Tracker.php 2011-12-02 12:29:57 UTC (rev 334)
@@ -485,7 +485,7 @@
$surveyData['gsu_surveyor_id'] = $sourceSurveyId;
$surveyData['gsu_id_source'] = $sourceId;
- MUtil_Echo::track($surveyData);
+ // MUtil_Echo::track($surveyData);
}
return $this->getSurvey($surveyData);
Modified: branches/1.5.0-pulse/library/languages/default-nl.mo
===================================================================
(Binary files differ)
Modified: branches/1.5.0-pulse/library/languages/default-nl.po
===================================================================
--- branches/1.5.0-pulse/library/languages/default-nl.po 2011-12-02 12:28:15 UTC (rev 333)
+++ branches/1.5.0-pulse/library/languages/default-nl.po 2011-12-02 12:29:57 UTC (rev 334)
@@ -3389,7 +3389,7 @@
#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:277
#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:300
msgid " (comment)"
-msgstr "(opmerkingen)"
+msgstr " (opmerkingen)"
#: classes/Gems/Tracker/Source/LimeSurvey1m9FieldMap.php:475
msgid "Free number"
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2011-12-07 14:06:42
|
Revision: 346
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=346&view=rev
Author: michieltcs
Date: 2011-12-07 14:06:31 +0000 (Wed, 07 Dec 2011)
Log Message:
-----------
Refs #470 - add gr2t_comment field
Modified Paths:
--------------
branches/1.5.0-pulse/library/classes/Gems/Default/TrackActionAbstract.php
branches/1.5.0-pulse/library/classes/Gems/Tracker/RespondentTrack.php
branches/1.5.0-pulse/library/classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php
branches/1.5.0-pulse/library/configs/db/patches.sql
branches/1.5.0-pulse/library/snippets/DeleteInSourceTrackSnippet.php
Modified: branches/1.5.0-pulse/library/classes/Gems/Default/TrackActionAbstract.php
===================================================================
--- branches/1.5.0-pulse/library/classes/Gems/Default/TrackActionAbstract.php 2011-12-07 11:27:48 UTC (rev 345)
+++ branches/1.5.0-pulse/library/classes/Gems/Default/TrackActionAbstract.php 2011-12-07 14:06:31 UTC (rev 346)
@@ -211,6 +211,7 @@
'formatFunction', $this->util->getTranslated()->formatDate,
'default', MUtil_Date::format(new Zend_date(), 'dd-MM-yyyy'));
$model->set('gr2t_reception_code');
+ $model->set('gr2t_comment', 'label', $this->_('Comment'));
return $model;
}
Modified: branches/1.5.0-pulse/library/classes/Gems/Tracker/RespondentTrack.php
===================================================================
--- branches/1.5.0-pulse/library/classes/Gems/Tracker/RespondentTrack.php 2011-12-07 11:27:48 UTC (rev 345)
+++ branches/1.5.0-pulse/library/classes/Gems/Tracker/RespondentTrack.php 2011-12-07 14:06:31 UTC (rev 346)
@@ -674,15 +674,17 @@
// be overwritten, e.g. when cooperation is retracted.
if ($code->isForTracks() || $code->isOverwriter()) {
$values['gr2t_reception_code'] = $code->getCode();
+ }
- $changed = $this->_updateTrack($values, $userId);
+ $values['gr2t_comment'] = $comment;
- if ($changed) {
- // Reload reception code values
- $this->_ensureReceptionCode($code->getAllData());
- }
+ $changed = $this->_updateTrack($values, $userId);
+
+ if ($changed) {
+ // Reload reception code values
+ $this->_ensureReceptionCode($code->getAllData());
}
-
+
// Stopcodes have a different logic.
if ($code->isStopCode()) {
// Cascade stop to tokens
Modified: branches/1.5.0-pulse/library/classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php
===================================================================
--- branches/1.5.0-pulse/library/classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php 2011-12-07 11:27:48 UTC (rev 345)
+++ branches/1.5.0-pulse/library/classes/Gems/Tracker/Snippets/EditTrackSnippetAbstract.php 2011-12-07 14:06:31 UTC (rev 346)
@@ -154,6 +154,7 @@
'formatFunction', $this->loader->getUtil()->getTranslated()->formatDate,
'default', MUtil_Date::format(new Zend_date(), 'dd-MM-yyyy'));
$model->set('gr2t_reception_code');
+ $model->set('gr2t_comment', 'label', $this->_('Comment'));
return $model;
}
Modified: branches/1.5.0-pulse/library/configs/db/patches.sql
===================================================================
--- branches/1.5.0-pulse/library/configs/db/patches.sql 2011-12-07 11:27:48 UTC (rev 345)
+++ branches/1.5.0-pulse/library/configs/db/patches.sql 2011-12-07 14:06:31 UTC (rev 346)
@@ -353,3 +353,7 @@
grc_changed, grc_changed_by, grc_created, grc_created_by)
VALUES
('stop', 'Stop surveys', 0, 2, 0, 0, 0, 0, 1, CURRENT_TIMESTAMP, 1, CURRENT_TIMESTAMP, 1);
+
+-- GEMS VERSION: 43
+-- PATCH: Add comment field to respondent tracks
+ALTER TABLE `gems__respondent2track` ADD gr2t_comment varchar(250) CHARACTER SET 'utf8' COLLATE 'utf8_general_ci' null default null AFTER `gr2t_reception_code`;
Modified: branches/1.5.0-pulse/library/snippets/DeleteInSourceTrackSnippet.php
===================================================================
--- branches/1.5.0-pulse/library/snippets/DeleteInSourceTrackSnippet.php 2011-12-07 11:27:48 UTC (rev 345)
+++ branches/1.5.0-pulse/library/snippets/DeleteInSourceTrackSnippet.php 2011-12-07 14:06:31 UTC (rev 346)
@@ -89,6 +89,9 @@
// The edit element
$bridge->addList('gr2t_reception_code');
+
+ // Comment text
+ $bridge->addTextarea('gr2t_comment', 'rows', 3, 'cols', 50);
// Change the button
$this->saveLabel = $this->getTitle();
@@ -170,7 +173,7 @@
protected function saveData()
{
// Use the repesondent track function as that cascades the consent code
- $changed = $this->respondentTrack->setReceptionCode($this->formData['gr2t_reception_code'], $this->_('Track deleted.'), $this->session->user_id);
+ $changed = $this->respondentTrack->setReceptionCode($this->formData['gr2t_reception_code'], $this->formData['gr2t_comment'], $this->session->user_id);
// Tell the user what happened
$this->afterSave($changed);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gem...@li...> - 2012-02-13 09:00:00
|
Revision: 467
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=467&view=rev
Author: michieltcs
Date: 2012-02-13 08:59:49 +0000 (Mon, 13 Feb 2012)
Log Message:
-----------
Fix E_NOTICE
Modified Paths:
--------------
branches/1.5.0-pulse/library/classes/Gems/Email/EmailFormAbstract.php
branches/1.5.0-pulse/library/snippets/Organization/OrganizationEditSnippet.php
Modified: branches/1.5.0-pulse/library/classes/Gems/Email/EmailFormAbstract.php
===================================================================
--- branches/1.5.0-pulse/library/classes/Gems/Email/EmailFormAbstract.php 2012-02-09 11:46:23 UTC (rev 466)
+++ branches/1.5.0-pulse/library/classes/Gems/Email/EmailFormAbstract.php 2012-02-13 08:59:49 UTC (rev 467)
@@ -54,7 +54,7 @@
*/
protected $escort;
- protected $messages;
+ protected $messages = array();
protected $model;
Modified: branches/1.5.0-pulse/library/snippets/Organization/OrganizationEditSnippet.php
===================================================================
--- branches/1.5.0-pulse/library/snippets/Organization/OrganizationEditSnippet.php 2012-02-09 11:46:23 UTC (rev 466)
+++ branches/1.5.0-pulse/library/snippets/Organization/OrganizationEditSnippet.php 2012-02-13 08:59:49 UTC (rev 467)
@@ -54,7 +54,7 @@
public function afterSave($changed)
{
- $org = $this->loader->getOrganization($data['gor_id_organization']);
+ $org = $this->loader->getOrganization($changed['gor_id_organization']);
$org->invalidateCache();
// Make sure any changes in the allowed list are reflected.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
×
Want the latest updates on software, tech news, and AI?
Get latest updates about software, tech news, and AI from SourceForge directly in your inbox once a month.
Thanks for helping keep SourceForge clean.
X