Author: david
Date: Tue Aug 16 15:00:00 2011
New Revision: 9507
Log:
Change units of repository_quota to GB and allow floats
Modified:
trunk/apps/qubit/modules/settings/actions/listAction.class.php
trunk/lib/form/SettingsGlobalForm.class.php
Modified: trunk/apps/qubit/modules/settings/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/listAction.class.php Tue Aug
16 14:54:50 2011 (r9506)
+++ trunk/apps/qubit/modules/settings/actions/listAction.class.php Tue Aug
16 15:00:00 2011 (r9507)
@@ -220,7 +220,7 @@
'inherit_code_informationobject' =>
(isset($inheritCodeInformationObject)) ?
intval($inheritCodeInformationObject->getValue(array('sourceCulture'=>true))) :
1,
'sort_treeview_informationobject' =>
(isset($sortTreeviewInformationObject)) ?
$sortTreeviewInformationObject->getValue(array('sourceCulture'=>true)) : 0,
'multi_repository' => (isset($multiRepository)) ?
intval($multiRepository->getValue(array('sourceCulture'=>true))) : 1,
- 'repository_quota' => (isset($repositoryQuota)) ?
intval($repositoryQuota->getValue(array('sourceCulture'=>true))) : 0,
+ 'repository_quota' => (isset($repositoryQuota)) ?
$repositoryQuota->getValue(array('sourceCulture'=>true)) : 0,
'explode_multipage_files' => (isset($explodeMultipageFiles)) ?
intval($explodeMultipageFiles->getValue(array('sourceCulture'=>true))) : 1,
'show_tooltips' => (isset($showTooltips)) ?
intval($showTooltips->getValue(array('sourceCulture'=>true))) : 1,
'defaultPubStatus' => (isset($defaultPubStatus)) ?
$defaultPubStatus->getValue(array('sourceCulture'=>true)) :
QubitTerm::PUBLICATION_STATUS_DRAFT_ID
Modified: trunk/lib/form/SettingsGlobalForm.class.php
==============================================================================
--- trunk/lib/form/SettingsGlobalForm.class.php Tue Aug 16 14:54:50 2011
(r9506)
+++ trunk/lib/form/SettingsGlobalForm.class.php Tue Aug 16 15:00:00 2011
(r9507)
@@ -69,7 +69,7 @@
'inherit_code_informationobject' => __('Inherit reference code
(information object)'),
'sort_treeview_informationobject' => __('Sort treeview (information
object)'),
'multi_repository' => __('Multiple repositories'),
- 'repository_quota' => __('Repository upload quota (MB)'),
+ 'repository_quota' => __('Repository upload quota (GB)'),
'explode_multipage_files' => __('Upload multi-page files as multiple
descriptions'),
'show_tooltips' => __('Show tooltips'),
'defaultPubStatus' => __('Default publication status')
@@ -88,7 +88,7 @@
'inherit_code_informationobject' => __('When set to "yes", the
reference code string will be built using the information object identifier
plus the identifiers of all its ancestors'),
'sort_treeview_informationobject' => __('Determines whether to sort
siblings in the information object treeview control and, if so, what sort
criteria to use'),
'multi_repository' => __('When set to "no", the repository
name is excluded from certain displays because it will be too repetitive'),
- 'repository_quota' => __('Track and limit disk space available to
individual repositories for uploading and storing digital objects. Default
value is zero (0), which allows unlimited uploads'),
+ 'repository_quota' => __('Limit disk space available to individual
repositories for uploading and storing digital objects. Default value is zero
(0), which allows unlimited uploads'),
'defaultPubStatus' => __('Default publication status for newly created
or imported %1%', array('%1%' =>
sfConfig::get('app_ui_label_informationobject')))
// 'explode_multipage_files' => __('')
// 'show_tooltips' => __('')
@@ -131,7 +131,7 @@
$this->validatorSchema['inherit_code_informationobject'] = new
sfValidatorInteger(array('required' => false));
$this->validatorSchema['sort_treeview_informationobject'] = new
sfValidatorString(array('required' => false));
$this->validatorSchema['multi_repository'] = new
sfValidatorInteger(array('required' => false));
- $this->validatorSchema['repository_quota'] = new
sfValidatorInteger(array('required' => false));
+ $this->validatorSchema['repository_quota'] = new
sfValidatorNumber(array('required' => false));
$this->validatorSchema['explode_multipage_files'] = new
sfValidatorInteger(array('required' => false));
$this->validatorSchema['show_tooltips'] = new
sfValidatorInteger(array('required' => false));
$this->validatorSchema['defaultPubStatus'] = new
sfValidatorChoice(array('choices' =>
array(QubitTerm::PUBLICATION_STATUS_DRAFT_ID,
QubitTerm::PUBLICATION_STATUS_PUBLISHED_ID)));
--
You received this message because you are subscribed to the Google Groups
"Qubit Toolkit Commits" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to
[email protected].
For more options, visit this group at
http://groups.google.com/group/qubit-commits?hl=en.
