Author: david
Date: Tue Aug 16 11:58:22 2011
New Revision: 9497
Log:
Change setting name from 'per_repository_asset_path' to 'repository_quota'
Modified:
trunk/apps/qubit/modules/settings/actions/listAction.class.php
trunk/data/fixtures/settings.yml
trunk/lib/form/SettingsGlobalForm.class.php
trunk/lib/task/migrate/QubitMigrate110.class.php
Modified: trunk/apps/qubit/modules/settings/actions/listAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/listAction.class.php Tue Aug
16 11:03:43 2011 (r9496)
+++ trunk/apps/qubit/modules/settings/actions/listAction.class.php Tue Aug
16 11:58:22 2011 (r9497)
@@ -202,7 +202,7 @@
$inheritCodeInformationObject =
QubitSetting::getSettingByName('inherit_code_informationobject');
$sortTreeviewInformationObject =
QubitSetting::getSettingByName('sort_treeview_informationobject');
$multiRepository = QubitSetting::getSettingByName('multi_repository');
- $perRepository =
QubitSetting::getSettingByName('per_repository_asset_path');
+ $perRepository = QubitSetting::getSettingByName('repository_quota');
$explodeMultipageFiles =
QubitSetting::getSettingByName('explode_multipage_files');
$showTooltips = QubitSetting::getSettingByName('show_tooltips');
$defaultPubStatus = QubitSetting::getSettingByName('defaultPubStatus');
@@ -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,
- 'per_repository_asset_path' => (isset($perRepository)) ?
intval($perRepository->getValue(array('sourceCulture'=>true))) : 0,
+ 'repository_quota' => (isset($perRepository)) ?
intval($perRepository->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/data/fixtures/settings.yml
==============================================================================
--- trunk/data/fixtures/settings.yml Tue Aug 16 11:03:43 2011 (r9496)
+++ trunk/data/fixtures/settings.yml Tue Aug 16 11:58:22 2011 (r9497)
@@ -345,6 +345,6 @@
name: separator_character
value: -
QubitSetting_perRepositoryAssetPath:
- name: per_repository_asset_path
+ name: repository_quota
value: 0
editable: 1
Modified: trunk/lib/form/SettingsGlobalForm.class.php
==============================================================================
--- trunk/lib/form/SettingsGlobalForm.class.php Tue Aug 16 11:03:43 2011
(r9496)
+++ trunk/lib/form/SettingsGlobalForm.class.php Tue Aug 16 11:58:22 2011
(r9497)
@@ -50,7 +50,7 @@
'inherit_code_informationobject' => new
sfWidgetFormSelectRadio(array('choices'=>array(1=>'yes', 0=>'no')),
array('class'=>'radio')),
'sort_treeview_informationobject' => new
sfWidgetFormSelectRadio(array('choices'=>array('none'=>'none',
'title'=>'title', 'identifierTitle'=> 'identifier - title')),
array('class'=>'radio')),
'multi_repository' => new
sfWidgetFormSelectRadio(array('choices'=>array(1=>'yes', 0=>'no')),
array('class'=>'radio')),
- 'per_repository_asset_path' => new sfWidgetFormInput,
+ 'repository_quota' => new sfWidgetFormInput,
'explode_multipage_files' => new
sfWidgetFormSelectRadio(array('choices'=>array(1=>'yes', 0=>'no')),
array('class'=>'radio')),
'show_tooltips' => new
sfWidgetFormSelectRadio(array('choices'=>array(1=>'yes', 0=>'no')),
array('class'=>'radio')),
'defaultPubStatus' => new
sfWidgetFormSelectRadio(array('choices'=>array(QubitTerm::PUBLICATION_STATUS_DRAFT_ID=>__('Draft'),
QubitTerm::PUBLICATION_STATUS_PUBLISHED_ID=>__('Published'))),
array('class'=>'radio')),
@@ -69,7 +69,7 @@
'inherit_code_informationobject' => __('Inherit reference code
(information object)'),
'sort_treeview_informationobject' => __('Sort treeview (information
object)'),
'multi_repository' => __('Multiple repositories'),
- 'per_repository_asset_path' => __('Repository upload quota (MB)'),
+ 'repository_quota' => __('Repository upload quota (MB)'),
'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'),
- 'per_repository_asset_path' => __('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' => __('Track and 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['per_repository_asset_path'] = new
sfValidatorInteger(array('required' => false));
+ $this->validatorSchema['repository_quota'] = new
sfValidatorInteger(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)));
Modified: trunk/lib/task/migrate/QubitMigrate110.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate110.class.php Tue Aug 16 11:03:43
2011 (r9496)
+++ trunk/lib/task/migrate/QubitMigrate110.class.php Tue Aug 16 11:58:22
2011 (r9497)
@@ -522,8 +522,8 @@
*/
protected function addPerRepositoryPathSetting()
{
- $this->data['QubitSetting']['QubitSetting_per_repository_asset_path'] =
array(
- 'name' => 'per_repository_asset_path',
+ $this->data['QubitSetting']['QubitSetting_repository_quota'] = array(
+ 'name' => 'repository_quota',
'editable' => 1,
'deleteable' => 0,
'value' => array('en' => '0'),
--
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.
