|
From: <gem...@li...> - 2012-01-26 13:45:53
|
Revision: 425
http://gemstracker.svn.sourceforge.net/gemstracker/?rev=425&view=rev
Author: mennodekker
Date: 2012-01-26 13:45:44 +0000 (Thu, 26 Jan 2012)
Log Message:
-----------
Added missing option 'value' to the allowedoptions, fixing empty Html elements
Added a description to the allowed ip ranges in groep edit
Modified Paths:
--------------
trunk/library/classes/Gems/Default/GroupAction.php
trunk/library/classes/MUtil/Model/FormBridge.php
Modified: trunk/library/classes/Gems/Default/GroupAction.php
===================================================================
--- trunk/library/classes/Gems/Default/GroupAction.php 2012-01-26 11:47:39 UTC (rev 424)
+++ trunk/library/classes/Gems/Default/GroupAction.php 2012-01-26 13:45:44 UTC (rev 425)
@@ -93,7 +93,10 @@
$model->set('ggp_staff_members', 'label', $this->_('Staff'), 'multiOptions', $yesNo);
$model->set('ggp_respondent_members', 'label', $this->_('Respondents'), 'multiOptions', $yesNo);
- $model->set('ggp_allowed_ip_ranges', 'label', $this->_('Allowed IP Ranges'));
+ $model->set('ggp_allowed_ip_ranges',
+ 'label', $this->_('Allowed IP Ranges'),
+ 'description', $this->_('Separate with | example: 10.0.0.0-10.0.0.255 (subnet masks are not supported)')
+ );
Gems_Model::setChangeFieldsByPrefix($model, 'ggp');
Modified: trunk/library/classes/MUtil/Model/FormBridge.php
===================================================================
--- trunk/library/classes/MUtil/Model/FormBridge.php 2012-01-26 11:47:39 UTC (rev 424)
+++ trunk/library/classes/MUtil/Model/FormBridge.php 2012-01-26 13:45:44 UTC (rev 425)
@@ -85,7 +85,7 @@
self::AUTO_OPTIONS => array('elementClass', 'multiOptions'),
self::CHECK_OPTIONS => array('checkedValue', 'uncheckedValue'),
self::DATE_OPTIONS => array('dateFormat', 'storageFormat'),
- self::DISPLAY_OPTIONS => array('accesskey', 'autoInsertNotEmptyValidator', 'class', 'disabled', 'description', 'escape', 'label', 'onclick', 'readonly', 'required', 'tabindex'),
+ self::DISPLAY_OPTIONS => array('accesskey', 'autoInsertNotEmptyValidator', 'class', 'disabled', 'description', 'escape', 'label', 'onclick', 'readonly', 'required', 'tabindex', 'value'),
self::EXHIBIT_OPTIONS => array('formatFunction'),
self::FILE_OPTIONS => array('accept', 'count', 'destination', 'valueDisabled'),
self::GROUP_OPTIONS => array('elements', 'legend', 'separator'),
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|