Author: sevein
Date: Mon Jul 23 22:39:01 2012
New Revision: 11966
Log:
Add more fields to the visibility section for the control area, settings are
different for ISAD and RAD
Modified:
trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
trunk/apps/qubit/modules/settings/templates/visibleElementsSuccess.php
trunk/data/fixtures/settings.yml
trunk/lib/task/migrate/arUpgrader120.class.php
Modified:
trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
Mon Jul 23 22:37:49 2012 (r11965)
+++ trunk/apps/qubit/modules/settings/actions/visibleElementsAction.class.php
Mon Jul 23 22:39:01 2012 (r11966)
@@ -48,6 +48,9 @@
}
}
+ // It would be nice to hack this method to query the db just once
+ // But this action is only executed but admins once in a while, not
+ // a big deal
protected function processField($field)
{
$name = $field->getName();
@@ -56,6 +59,8 @@
// Create if it does not exist
if (null === $setting = QubitSetting::getByNameAndScope($name,
'element_visibility'))
{
+ throw new sfException($name);
+
$setting = new QubitSetting;
$setting->name = $name;
$setting->scope = 'element_visibility';
Modified: trunk/apps/qubit/modules/settings/templates/visibleElementsSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/settings/templates/visibleElementsSuccess.php
Mon Jul 23 22:37:49 2012 (r11965)
+++ trunk/apps/qubit/modules/settings/templates/visibleElementsSuccess.php
Mon Jul 23 22:39:01 2012 (r11966)
@@ -16,9 +16,19 @@
'isad_immediate_source' => __('Immediate source of acquisition or
transfer'),
'isad_appraisal_destruction' => __('Appraisal, destruction and
scheduling information'),
'isad_notes' => __('Notes'),
- 'isad_physical_condition' => __('Physical characteristics and technical
requirements')) as $key => $value): ?>
+ 'isad_physical_condition' => __('Physical characteristics and technical
requirements'),
+ 'isad_control_description_identifier' => __('Description identifier'),
+ 'isad_control_institution_identifier' => __('Institution identifier'),
+ 'isad_control_rules_conventions' => __('Rules or conventions'),
+ 'isad_control_status' => __('Status'),
+ 'isad_control_level_of_detail' => __('Level of detail'),
+ 'isad_control_dates' => __('Dates of creation, revision and deletion'),
+ 'isad_control_languages' => __('Language(s)'),
+ 'isad_control_scripts' => __('Script(s)'),
+ 'isad_control_sources' => __('Sources'),
+ 'isad_control_archivists_notes' => __('Archivist\'s notes')) as $key =>
$value): ?>
- <div class="form-item">
+ <div class="form-item form-item-checkbox">
<?php echo $form[$key] ?>
<?php echo $form[$key]
->label($value)
@@ -37,9 +47,18 @@
'rad_general_note' => __('General note'),
'rad_conservation' => __('Conservation'),
'rad_physical_condition' => __('Physical condition'),
- 'rad_immediate_source' => __('Immediate source of acquisition')) as $key
=> $value): ?>
+ 'rad_immediate_source' => __('Immediate source of acquisition'),
+ 'rad_control_description_identifier' => __('Description identifier'),
+ 'rad_control_institution_identifier' => __('Institution identifier'),
+ 'rad_control_rules_conventions' => __('Rules or conventions'),
+ 'rad_control_status' => __('Status'),
+ 'rad_control_level_of_detail' => __('Level of detail'),
+ 'rad_control_dates' => __('Dates of creation, revision and deletion'),
+ 'rad_control_language' => __('Language'),
+ 'rad_control_script' => __('Script'),
+ 'rad_control_sources' => __('Sources')) as $key => $value): ?>
- <div class="form-item">
+ <div class="form-item form-item-checkbox">
<?php echo $form[$key] ?>
<?php echo $form[$key]
->label($value)
@@ -62,7 +81,7 @@
'digital_object_file_size' => __('File size'),
'digital_object_uploaded' => __('Uploaded')) as $key => $value): ?>
- <div class="form-item">
+ <div class="form-item form-item-checkbox">
<?php echo $form[$key] ?>
<?php echo $form[$key]
->label($value)
@@ -77,7 +96,7 @@
<legend><?php echo __('Physical storage') ?></legend>
- <div class="form-item">
+ <div class="form-item form-item-checkbox">
<?php echo $form['physical_storage'] ?>
<?php echo $form['physical_storage']
->label('Physical storage')
Modified: trunk/data/fixtures/settings.yml
==============================================================================
--- trunk/data/fixtures/settings.yml Mon Jul 23 22:37:49 2012 (r11965)
+++ trunk/data/fixtures/settings.yml Mon Jul 23 22:39:01 2012 (r11966)
@@ -404,6 +404,46 @@
name: isad_physical_condition
scope: element_visibility
value: 1
+ Qubit_Settings_visibleElements_IsadControlDescriptionIdentifier:
+ name: isad_control_description_identifier
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlInstitutionIdentifier:
+ name: isad_control_institution_identifier
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlRulesConventions:
+ name: isad_control_rules_conventions
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlStatus:
+ name: isad_control_status
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlLevelOfDetail:
+ name: isad_control_level_of_detail
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlDates:
+ name: isad_control_dates
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlLanguages:
+ name: isad_control_languages
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlScripts:
+ name: isad_control_scripts
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlSources:
+ name: isad_control_sources
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_IsadControlArchivistsNotes:
+ name: isad_control_archivists_notes
+ scope: element_visibility
+ value: 1
Qubit_Settings_visibleElements_RadGeneralNote:
name: rad_general_note
scope: element_visibility
@@ -420,6 +460,42 @@
name: rad_immediate_source
scope: element_visibility
value: 1
+ Qubit_Settings_visibleElements_RadControlDescriptionIdentifier:
+ name: rad_control_description_identifier
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadControlInstitutionIdentifier:
+ name: rad_control_institution_identifier
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadControlRulesConventions:
+ name: rad_control_rules_conventions
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadControlStatus:
+ name: rad_control_status
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadControlLevelOfDetail:
+ name: rad_control_level_of_detail
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadControlDates:
+ name: rad_control_dates
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadControlLanguage:
+ name: rad_control_language
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadControlScript:
+ name: rad_control_script
+ scope: element_visibility
+ value: 1
+ Qubit_Settings_visibleElements_RadControlSources:
+ name: rad_control_sources
+ scope: element_visibility
+ value: 1
Qubit_Settings_visibleElements_digitalObjectUrl:
name: digital_object_url
scope: element_visibility
Modified: trunk/lib/task/migrate/arUpgrader120.class.php
==============================================================================
--- trunk/lib/task/migrate/arUpgrader120.class.php Mon Jul 23 22:37:49
2012 (r11965)
+++ trunk/lib/task/migrate/arUpgrader120.class.php Mon Jul 23 22:39:01
2012 (r11966)
@@ -347,10 +347,29 @@
'isad_appraisal_destruction',
'isad_notes',
'isad_physical_condition',
+ 'isad_control_description_identifier',
+ 'isad_control_institution_identifier',
+ 'isad_control_rules_conventions',
+ 'isad_control_status',
+ 'isad_control_level_of_detail',
+ 'isad_control_dates',
+ 'isad_control_languages',
+ 'isad_control_scripts',
+ 'isad_control_sources',
+ 'isad_control_archivists_notes',
'rad_general_note',
'rad_conservation',
'rad_physical_condition',
'rad_immediate_source',
+ 'rad_control_description_identifier',
+ 'rad_control_institution_identifier',
+ 'rad_control_rules_conventions',
+ 'rad_control_status',
+ 'rad_control_level_of_detail',
+ 'rad_control_dates',
+ 'rad_control_language',
+ 'rad_control_script',
+ 'rad_control_sources',
'digital_object_url',
'digital_object_file_name',
'digital_object_media_type',
--
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.
