Revision: 974
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=974&view=rev
Author: mennodekker
Date: 2012-10-09 08:31:04 +0000 (Tue, 09 Oct 2012)
Log Message:
-----------
Fixed #571: Group edit - Staff/Patient selection from checkbox to radio
Modified Paths:
--------------
trunk/library/classes/Gems/Default/GroupAction.php
Modified: trunk/library/classes/Gems/Default/GroupAction.php
===================================================================
--- trunk/library/classes/Gems/Default/GroupAction.php 2012-10-08 09:46:57 UTC (rev 973)
+++ trunk/library/classes/Gems/Default/GroupAction.php 2012-10-09 08:31:04 UTC (rev 974)
@@ -64,11 +64,39 @@
$bridge->addText('ggp_description', 'size', 40);
$bridge->addSelect('ggp_role');
$bridge->addCheckbox('ggp_group_active');
- $bridge->addCheckbox('ggp_staff_members');
- $bridge->addCheckbox('ggp_respondent_members');
+ $options = array(
+ '1'=>$model->get('ggp_staff_members', 'label'),
+ '2'=>$model->get('ggp_respondent_members', 'label')
+ );
+ $bridge->addRadio('staff_respondent', 'label', $this->_('Can be assigned to'), 'multiOptions', $options);
+ if (!isset($data['staff_respondent'])) {
+ if (isset($data['ggp_staff_members']) && $data['ggp_staff_members'] == 1) {
+ $data['staff_respondent'] = 1;
+ } else if (isset($data['ggp_respondent_members']) && $data['ggp_respondent_members'] == 1) {
+ $data['staff_respondent'] = 2;
+ }
+ }
$bridge->addText('ggp_allowed_ip_ranges', 'size', 50, 'validator', new Gems_Validate_IPRanges(), 'maxlength', 500);
+
+ return $data;
}
+ public function beforeSave(array &$data, $isNew, \Zend_Form $form = null)
+ {
+ $data['ggp_staff_members'] = 0;
+ $data['ggp_respondent_members'] = 0;
+ if (isset($data['staff_respondent'])) {
+ if ($data['staff_respondent'] == 1) {
+ $data['ggp_staff_members'] = 1;
+ } elseif ($data['staff_respondent'] == 2) {
+ $data['ggp_respondent_members'] = 1;
+ }
+ unset($data['staff_respondent']);
+ }
+
+ return parent::beforeSave($data, $isNew, $form);
+ }
+
/**
* Creates a model for getModel(). Called only for each new $action.
*
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
