Author: david
Date: Wed Apr 25 17:04:31 2012
New Revision: 11520
Log:
lowercase first char of visibility settings. Reduce repetitive code
Modified:
trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
trunk/data/fixtures/settings.yml
Modified:
trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
Wed Apr 25 16:41:39 2012 (r11519)
+++ trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
Wed Apr 25 17:04:31 2012 (r11520)
@@ -28,6 +28,59 @@
class SettingsVisibleElementsAction extends sfAction
{
+ public static
+ $NAMES = array(
+ 'visibilityImmediateSource',
+ 'visibilityAppraisalDestruction',
+ 'visibilityNotes',
+ 'visibilityPhysicalCondition',
+ 'visibilityGeneralNote',
+ 'visibilityConservation',
+ 'visibilityPhysicalCondition',
+ 'visibilityDescriptionIdentifier',
+ 'visibilityInstitutionIdentifier',
+ 'visibilityRulesConventions',
+ 'visibilityStatus',
+ 'visibilityLevelOfDetail',
+ 'visibilityDateRevisiondeletion',
+ 'visibilityLanguage',
+ 'visibilityScript',
+ 'visibilitySources',
+ 'visibilityUrl',
+ 'visibilityFilename',
+ 'visibilitymediatypes',
+ 'visibilityMimeType',
+ 'visibilityFilesize',
+ 'visibilityUploaded',
+ 'visibilityPhysicalStorage'
+ );
+
+ protected function processForm()
+ {
+ foreach ($this->form as $field)
+ {
+ if (isset($this->request[$field->getName()]))
+ {
+ $this->processField($field);
+ }
+ }
+ }
+
+ protected function processField($field)
+ {
+ $name = $field->getName();
+
+ if (null == $setting = QubitSetting::getSettingByName($name))
+ {
+ $setting = new QubitSetting;
+ $setting->deleteable = false;
+ }
+
+ $setting->setValue($this->form->getValue($name),
array('sourceCulture'=>true));
+
+ $setting->save();
+ }
+
public function execute($request)
{
$this->form = new sfForm;
@@ -44,378 +97,9 @@
if ($request->isMethod('post'))
{
- if (null !== $request->rads)
- {
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'descriptionIdentifier');
+ $this->processForm();
- if (1 !== count($descriptionIdentifierQuery =
QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('descriptionIdentifier',
null, array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $descriptionIdentifier = $request->descriptionIdentifier;
- $setting = QubitSetting::getSettingByName('descriptionIdentifier');
- $setting->setValue($descriptionIdentifier,
array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'institutionIdentifier');
-
- if (1 !== count($institutionIdentifierQuery =
QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('institutionIdentifier',
null, array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $institutionIdentifier = $request->institutionIdentifier;
- $setting = QubitSetting::getSettingByName('institutionIdentifier');
- $setting->setValue($institutionIdentifier,
array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'rulesConventions');
- if (1 !== count($rulesConventionsQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('rulesConventions', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $rulesConventions = $request->rulesConventions;
- $setting = QubitSetting::getSettingByName('rulesConventions');
- $setting->setValue($rulesConventions, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'status');
-
- if (1 !== count($statusQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('status', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $status = $request->status;
- $setting = QubitSetting::getSettingByName('status');
- $setting->setValue($status, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'levelOfdetail');
-
- if (1 !== count($levelOfdetailQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('levelOfdetail', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $levelOfdetail = $request->levelOfdetail;
- $setting = QubitSetting::getSettingByName('levelOfdetail');
- $setting->setValue($levelOfdetail, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'dateRevisiondeletion');
-
- if (1 !== count($dateRevisiondeletionQuery =
QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('dateRevisiondeletion',
null, array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $dateRevisiondeletion = $request->dateRevisiondeletion;
- $setting = QubitSetting::getSettingByName('dateRevisiondeletion');
- $setting->setValue($dateRevisiondeletion,
array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'language');
-
- if (1 !== count($languageQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('language', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $language = $request->language;
- $setting = QubitSetting::getSettingByName('language');
- $setting->setValue($language, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'script');
-
- if (1 !== count($scriptQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('script', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $script = $request->script;
- $setting = QubitSetting::getSettingByName('script');
- $setting->setValue($script, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'sources');
-
- if (1 !== count($sourcesQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('sources', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $sources = $request->sources;
- $setting = QubitSetting::getSettingByName('sources');
- $setting->setValue($sources, array('sourceCulture'=>true));
- $setting->save();
-
- $this->redirect('fieldoptionsnew/list');
- }
-
- if (null !== $request->digitalobject)
- {
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'url');
-
- if (1 !== count($urlQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('url', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $url = $request->url;
- $setting = QubitSetting::getSettingByName('url');
- $setting->setValue($url, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'filename');
-
- if (1 !== count($filenameQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('filename', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $filename = $request->filename;
- $setting = QubitSetting::getSettingByName('filename');
- $setting->setValue($filename, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'mediatypes');
-
- if (1 !== count($mediatypesQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('mediatypes', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $mediatypes = $request->mediatypes;
- $setting = QubitSetting::getSettingByName('mediatypes');
- $setting->setValue($mediatypes, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'mimetype');
-
- if (1 !== count($mimetypeQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('mimetype', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $mimetype = $request->mimetype;
- $setting = QubitSetting::getSettingByName('mimetype');
- $setting->setValue($mimetype, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'filesize');
-
- if (1 !== count($filesizeQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('filesize', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $filesize = $request->filesize;
- $setting = QubitSetting::getSettingByName('filesize');
- $setting->setValue($filesize, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'uploaded');
-
- if (1 !== count($uploadedQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('uploaded', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $uploaded = $request->uploaded;
- $setting = QubitSetting::getSettingByName('uploaded');
- $setting->setValue($uploaded, array('sourceCulture'=>true));
- $setting->save();
-
- $this->redirect('fieldoptionsnew/list');
- }
-
- if (null !== $request->isad)
- {
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'ImmediateSource');
- if (1 !== count($ImmediateSourceQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('ImmediateSource', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $ImmediateSource = $request->ImmediateSource;
- $setting = QubitSetting::getSettingByName('ImmediateSource');
- $setting->setValue($ImmediateSource, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'AppraisalDestruction');
-
- if (1 !== count($AppraisalDestructionQuery =
QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('AppraisalDestruction',
null, array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $AppraisalDestruction = $request->AppraisalDestruction;
- $setting = QubitSetting::getSettingByName('AppraisalDestruction');
- $setting->setValue($AppraisalDestruction,
array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'HideNotes');
-
- if (1 !== count($HideNotesQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('HideNotes', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $HideNotes = $request->HideNotes;
- $setting = QubitSetting::getSettingByName('HideNotes');
- $setting->setValue($HideNotes, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'PhysicalCondition');
-
- if (1 !== count($PhysicalConditionQuery =
QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('PhysicalCondition', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $PhysicalCondition = $request->PhysicalCondition;
- $setting = QubitSetting::getSettingByName('PhysicalCondition');
- $setting->setValue($PhysicalCondition, array('sourceCulture'=>true));
- $setting->save();
-
- $this->redirect('fieldoptionsnew/list');
- }
-
- if (null !== $request->othernote)
- {
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'GeneralNote');
-
- if (1 !== count($GeneralNoteQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('GeneralNote', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $GeneralNote = $request->GeneralNote;
- $setting = QubitSetting::getSettingByName('GeneralNote');
- $setting->setValue($GeneralNote, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'Conservation');
-
- if (1 !== count($ConservationQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('Conservation', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $Conservation = $request->Conservation;
- $setting = QubitSetting::getSettingByName('Conservation');
- $setting->setValue($Conservation, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'PhysicalCondition');
-
- if (1 !== count($PhysicalConditionQuery =
QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('PhysicalCondition', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $PhysicalCondition = $request->PhysicalCondition;
- $setting = QubitSetting::getSettingByName('PhysicalCondition');
- $setting->setValue($PhysicalCondition, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'ImmediateSource');
-
- if (1 !== count($ImmediateSourceQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('ImmediateSource', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $ImmediateSource = $request->ImmediateSource;
- $setting = QubitSetting::getSettingByName('ImmediateSource');
- $setting->setValue($ImmediateSource, array('sourceCulture'=>true));
- $setting->save();
-
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'physicalstorage');
-
- if (1 !== count($physicalstorageQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('physicalstorage', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $physicalstorage = $request->physicalstorage;
- $setting = QubitSetting::getSettingByName('physicalstorage');
- $setting->setValue($physicalstorage, array('sourceCulture'=>true));
- $setting->save();
-
- $this->redirect('fieldoptionsnew/list');
- }
-
- if (null !== $request->storage)
- {
- $criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'physicalstorage');
-
- if (1 !== count($physicalstorageQuery = QubitSetting::get($criteria)))
- {
- $Setting = QubitSetting::createNewSetting('physicalstorage', null,
array('scope'=>null, 'deleteable'=>false));
- $Setting->save();
- }
-
- $physicalstorage = $request->physicalstorage;
- $setting = QubitSetting::getSettingByName('physicalstorage');
- $setting->setValue($physicalstorage, array('sourceCulture'=>true));
- $setting->save();
-
- $this->redirect('fieldoptionsnew/list');
- }
+ $this->redirect('settings/visibleElements');
}
}
@@ -423,7 +107,7 @@
{
$this->defaultPageElementsForm = new sfForm;
$this->defaultPageElementsForm->setWidgets(array(
- 'descriptionIdentifier' => new sfWidgetFormInputCheckbox,
+ 'visibilityDescriptionIdentifier' => new sfWidgetFormInputCheckbox,
'institutionIdentifier' => new sfWidgetFormInputCheckbox,
'rulesConventions' => new sfWidgetFormInputCheckbox,
'status' => new sfWidgetFormInputCheckbox,
@@ -434,12 +118,12 @@
'sources' => new sfWidgetFormInputCheckbox));
$criteria = new Criteria;
- $criteria->add(QubitSetting::NAME, 'descriptionIdentifier');
+ $criteria->add(QubitSetting::NAME, 'VisibilityDescriptionIdentifier');
if (1 == count($descriptionIdentifierQuery = QubitSetting::get($criteria)))
{
$descriptionIdentifierSetting = $descriptionIdentifierQuery[0];
- $this->defaultPageElementsForm->setDefault('descriptionIdentifier',
$descriptionIdentifierSetting->__get('value', array('sourceCulture' => true)));
+
$this->defaultPageElementsForm->setDefault('VisibilityDescriptionIdentifier',
$descriptionIdentifierSetting->__get('value', array('sourceCulture' => true)));
}
$criteria = new Criteria;
Modified: trunk/data/fixtures/settings.yml
==============================================================================
--- trunk/data/fixtures/settings.yml Wed Apr 25 16:41:39 2012 (r11519)
+++ trunk/data/fixtures/settings.yml Wed Apr 25 17:04:31 2012 (r11520)
@@ -390,71 +390,71 @@
name: limit_admin_ip
value: ''
Qubit_Settings_visibleElements_ImmediateSource:
- name: VisibilityImmediateSource
+ name: visibilityImmediateSource
value: 1
Qubit_Settings_visibleElements_AppraisalDestruction:
- name: VisibilityAppraisalDestruction
+ name: visibilityAppraisalDestruction
value: 1
Qubit_Settings_visibleElements_Notes:
- name: VisibilityNotes
+ name: visibilityNotes
value: 1
Qubit_Settings_visibleElements_PhysicalCondition:
- name: VisibilityPhysicalCondition
+ name: visibilityPhysicalCondition
value: 1
Qubit_Settings_visibleElements_GeneralNote:
- name: VisibilityGeneralNote
+ name: visibilityGeneralNote
value: 1
Qubit_Settings_visibleElements_Conservation:
- name: VisibilityConservation
+ name: visibilityConservation
value: 1
Qubit_Settings_visibleElements_PhysicalCondition:
- name: VisibilityPhysicalCondition
+ name: visibilityPhysicalCondition
value: 1
Qubit_Settings_visibleElements_descriptionIdentifier:
- name: VisibilityDescriptionIdentifier
+ name: visibilityDescriptionIdentifier
value: 1
Qubit_Settings_visibleElements_institutionIdentifier:
- name: VisibilityInstitutionIdentifier
+ name: visibilityInstitutionIdentifier
value: 1
Qubit_Settings_visibleElements_rulesConventions:
- name: VisibilityRulesConventions
+ name: visibilityRulesConventions
value: 1
Qubit_Settings_visibleElements_status:
- name: VisibilityStatus
+ name: visibilityStatus
value: 1
Qubit_Settings_visibleElements_levelOfdetail:
- name: VisibilityLevelOfDetail
+ name: visibilityLevelOfDetail
value: 1
Qubit_Settings_visibleElements_dateRevisiondeletion:
- name: VisibilityDateRevisiondeletion
+ name: visibilityDateRevisiondeletion
value: 1
Qubit_Settings_visibleElements_language:
- name: VisibilityLanguage
+ name: visibilityLanguage
value: 1
Qubit_Settings_visibleElements_script:
- name: VisibilityScript
+ name: visibilityScript
value: 1
Qubit_Settings_visibleElements_sources:
- name: VisibilitySources
+ name: visibilitySources
value: 1
Qubit_Settings_visibleElements_url:
- name: VisibilityUrl
+ name: visibilityUrl
value: 1
Qubit_Settings_visibleElements_filename:
- name: VisibilityFilename
+ name: visibilityFilename
value: 1
Qubit_Settings_visibleElements_mediatypes:
- name: Visibilitymediatypes
+ name: visibilitymediatypes
value: 1
Qubit_Settings_visibleElements_mimetype:
- name: VisibilityMimeType
+ name: visibilityMimeType
value: 1
Qubit_Settings_visibleElements_filesize:
- name: VisibilityFilesize
+ name: visibilityFilesize
value: 1
Qubit_Settings_visibleElements_uploaded:
- name: VisibilityUploaded
+ name: visibilityUploaded
value: 1
Qubit_Settings_visibleElements_physicalstorage:
- name: VisibilityPhysicalStorage
+ name: visibilityPhysicalStorage
value: 1
--
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.
