Author: sevein
Date: Tue Jan 3 15:58:02 2012
New Revision: 10551
Log:
Add SWORD deposit dir input into global settings form
Modified:
trunk/apps/qubit/modules/settings/actions/listAction.class.php
trunk/apps/qubit/modules/settings/templates/listSuccess.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 Jan
3 15:50:01 2012 (r10550)
+++ trunk/apps/qubit/modules/settings/actions/listAction.class.php Tue Jan
3 15:58:02 2012 (r10551)
@@ -218,6 +218,7 @@
$explodeMultipageFiles =
QubitSetting::getSettingByName('explode_multipage_files');
$showTooltips = QubitSetting::getSettingByName('show_tooltips');
$defaultPubStatus = QubitSetting::getSettingByName('defaultPubStatus');
+ $swordDepositDir = QubitSetting::getSettingByName('sword_deposit_dir');
// Set defaults for global form
$this->globalForm->setDefaults(array(
@@ -234,7 +235,8 @@
'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
+ 'defaultPubStatus' => (isset($defaultPubStatus)) ?
$defaultPubStatus->getValue(array('sourceCulture'=>true)) :
QubitTerm::PUBLICATION_STATUS_DRAFT_ID,
+ 'sword_deposit_dir' => (isset($swordDepositDir)) ?
$swordDepositDir->getValue(array('sourceCulture'=>true)) : null
));
}
@@ -398,6 +400,16 @@
$setting->save();
}
+ // SWORD deposit directory
+ if (null !== $swordDepositDir = $thisForm->getValue('sword_deposit_dir'))
+ {
+ $setting = QubitSetting::getSettingByName('sword_deposit_dir');
+
+ // Force sourceCulture update to prevent discrepency in settings between
cultures
+ $setting->setValue($swordDepositDir, array('sourceCulture' => true));
+ $setting->save();
+ }
+
return $this;
}
Modified: trunk/apps/qubit/modules/settings/templates/listSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/settings/templates/listSuccess.php Tue Jan 3
15:50:01 2012 (r10550)
+++ trunk/apps/qubit/modules/settings/templates/listSuccess.php Tue Jan 3
15:58:02 2012 (r10551)
@@ -263,6 +263,7 @@
<!-- Job scheduling settings -->
<fieldset class="collapsible collapsed">
<legend><?php echo __('Job scheduling') ?></legend>
+ <p>Specific Gearman job server options can be found in
config/gearman.yml.</p>
<form action="<?php echo url_for('settings/list') ?>" method="post">
<table class="list">
<thead>
Modified: trunk/lib/form/SettingsGlobalForm.class.php
==============================================================================
--- trunk/lib/form/SettingsGlobalForm.class.php Tue Jan 3 15:50:01 2012
(r10550)
+++ trunk/lib/form/SettingsGlobalForm.class.php Tue Jan 3 15:58:02 2012
(r10551)
@@ -53,6 +53,7 @@
'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')),
+ 'sword_deposit_dir' => new sfWidgetFormInput
));
// Add labels
@@ -70,7 +71,8 @@
'repository_quota' => __('Default upload limit (GB)'),
'explode_multipage_files' => __('Upload multi-page files as multiple
descriptions'),
'show_tooltips' => __('Show tooltips'),
- 'defaultPubStatus' => __('Default publication status')
+ 'defaultPubStatus' => __('Default publication status'),
+ 'sword_deposit_dir' => __('SWORD deposit directory')
));
// Add helper text
@@ -89,6 +91,7 @@
'defaultPubStatus' => __('Default publication status for newly created
or imported %1%', array('%1%' =>
sfConfig::get('app_ui_label_informationobject')))
// 'explode_multipage_files' => __('')
// 'show_tooltips' => __('')
+ // 'sword_deposit_dir' => __('')
));
// Reference image max. width validator
@@ -133,6 +136,7 @@
$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)));
+ $this->validatorSchema['sword_deposit_dir'] = new
sfValidatorString(array('required' => false));
// Set decorator
$decorator = new QubitWidgetFormSchemaFormatterList($this->widgetSchema);
--
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.
