Author: jablko
Date: Tue Aug 11 12:24:12 2009
New Revision: 3005
Log:
Change some field names so they match the default case
Modified:
trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
Tue Aug 11 12:16:29 2009 (r3004)
+++ trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
Tue Aug 11 12:24:12 2009 (r3005)
@@ -117,8 +117,8 @@
$this->form->setValidator('languageOfMaterial', new
sfValidatorI18nChoiceLanguage(array('multiple' => true)));
$this->form->setWidget('languageOfMaterial', new
sfWidgetFormI18nSelectLanguage(array('culture' =>
$this->context->user->getCulture(), 'multiple' => true)));
- $this->form->setDefault('levelOfDetailId',
$this->informationObject->descriptionDetail->id);
- $this->form->setValidator('levelOfDetailId', new sfValidatorInteger);
+ $this->form->setDefault('descriptionDetailId',
$this->informationObject->descriptionDetail->id);
+ $this->form->setValidator('descriptionDetailId', new sfValidatorInteger);
$choices = array();
$choices[null] = null;
@@ -127,7 +127,7 @@
$choices[$term->id] = $term;
}
- $this->form->setWidget('levelOfDetailId', new
sfWidgetFormSelect(array('choices' => $choices)));
+ $this->form->setWidget('descriptionDetailId', new
sfWidgetFormSelect(array('choices' => $choices)));
$this->form->setDefault('locationOfCopies',
$this->informationObject->locationOfCopies);
$this->form->setValidator('locationOfCopies', new sfValidatorString);
@@ -207,8 +207,8 @@
$this->form->setValidator('sources', new sfValidatorString);
$this->form->setWidget('sources', new sfWidgetFormTextarea);
- $this->form->setDefault('statusId',
$this->informationObject->descriptionStatus->id);
- $this->form->setValidator('statusId', new sfValidatorInteger);
+ $this->form->setDefault('descriptionStatusId',
$this->informationObject->descriptionStatus->id);
+ $this->form->setValidator('descriptionStatusId', new sfValidatorInteger);
$choices = array();
$choices[null] = null;
@@ -217,7 +217,7 @@
$choices[$term->id] = $term;
}
- $this->form->setWidget('statusId', new sfWidgetFormSelect(array('choices'
=> $choices)));
+ $this->form->setWidget('descriptionStatusId', new
sfWidgetFormSelect(array('choices' => $choices)));
$this->form->setDefault('title', $this->informationObject->title);
$this->form->setValidator('title', new sfValidatorString);
@@ -290,11 +290,6 @@
break;
- case 'levelOfDetailId':
- $this->informationObject->descriptionDetailId =
$this->form->getValue('levelOfDetailId');
-
- break;
-
case 'scriptOfDescription':
if (!isset($this->scriptOfDescription))
@@ -321,11 +316,6 @@
break;
- case 'statusId':
- $this->informationObject->descriptionStatusId =
$this->form->getValue('statusId');
-
- break;
-
default:
$this->informationObject[$field->getName()] =
$this->form->getValue($field->getName());
}
Modified:
trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
Tue Aug 11 12:16:29 2009 (r3004)
+++ trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
Tue Aug 11 12:24:12 2009 (r3005)
@@ -134,8 +134,8 @@
$this->form->setValidator('languageOfDescription', new
sfValidatorI18nChoiceLanguage(array('multiple' => true)));
$this->form->setWidget('languageOfDescription', new
sfWidgetFormI18nSelectLanguage(array('culture' =>
$this->context->user->getCulture(), 'multiple' => true)));
- $this->form->setDefault('levelOfDetailId',
$this->informationObject->descriptionDetail->id);
- $this->form->setValidator('levelOfDetailId', new sfValidatorInteger);
+ $this->form->setDefault('descriptionDetailId',
$this->informationObject->descriptionDetail->id);
+ $this->form->setValidator('descriptionDetailId', new sfValidatorInteger);
$choices = array();
$choices[null] = null;
@@ -144,7 +144,7 @@
$choices[$term->id] = $term;
}
- $this->form->setWidget('levelOfDetailId', new
sfWidgetFormSelect(array('choices' => $choices)));
+ $this->form->setWidget('descriptionDetailId', new
sfWidgetFormSelect(array('choices' => $choices)));
$this->form->setDefault('locationOfCopies',
$this->informationObject->locationOfCopies);
$this->form->setValidator('locationOfCopies', new sfValidatorString);
@@ -378,8 +378,8 @@
$this->form->setValidator('statementOfScaleCartographic', new
sfValidatorString);
$this->form->setWidget('statementOfScaleCartographic', new
sfWidgetFormInput);
- $this->form->setDefault('statusId',
$this->informationObject->descriptionStatus->id);
- $this->form->setValidator('statusId', new sfValidatorInteger);
+ $this->form->setDefault('descriptionStatusId',
$this->informationObject->descriptionStatus->id);
+ $this->form->setValidator('descriptionStatusId', new sfValidatorInteger);
$choices = array();
$choices[null] = null;
@@ -388,7 +388,7 @@
$choices[$term->id] = $term;
}
- $this->form->setWidget('statusId', new sfWidgetFormSelect(array('choices'
=> $choices)));
+ $this->form->setWidget('descriptionStatusId', new
sfWidgetFormSelect(array('choices' => $choices)));
$this->form->setDefault('title', $this->informationObject->title);
$this->form->setValidator('title', new sfValidatorString);
@@ -528,11 +528,6 @@
break;
- case 'levelOfDetailId':
- $this->informationObject->descriptionDetailId =
$this->form->getValue('levelOfDetailId');
-
- break;
-
case 'noteOnPublishersSeries':
if (!isset($this->noteOnPublishersSeries))
@@ -713,11 +708,6 @@
break;
- case 'statusId':
- $this->informationObject->descriptionStatusId =
$this->form->getValue('statusId');
-
- break;
-
case 'titleProperOfPublishersSeries':
if (!isset($this->titleProperOfPublishersSeries))
Modified:
trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
Tue Aug 11 12:16:29 2009 (r3004)
+++ trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
Tue Aug 11 12:24:12 2009 (r3005)
@@ -339,9 +339,9 @@
<?php echo render_field($form->rules->label(__('Rules or conventions')),
$informationObject, array('class' => 'resizable')) ?>
- <?php echo $form->statusId->renderRow(null, __('Status')) ?>
+ <?php echo $form->descriptionStatusId->renderRow(null, __('Status')) ?>
- <?php echo $form->levelOfDetailId->renderRow(null, __('Level of detail'))
?>
+ <?php echo $form->descriptionDetailId->renderRow(null, __('Level of
detail')) ?>
<?php echo render_field($form->revisionHistory->label(__('Dates of
creation, revision and deletion')), $informationObject, array('class' =>
'resizable')) ?>
Modified:
trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
Tue Aug 11 12:16:29 2009 (r3004)
+++ trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
Tue Aug 11 12:24:12 2009 (r3005)
@@ -343,9 +343,9 @@
<?php echo render_field($form->rules->label(__('Rules or conventions')),
$informationObject, array('class' => 'resizable')) ?>
- <?php echo $form->statusId->renderRow(null, __('Status')) ?>
+ <?php echo $form->descriptionStatusId->renderRow(null, __('Status')) ?>
- <?php echo $form->levelOfDetailId->renderRow(null, __('Level of detail'))
?>
+ <?php echo $form->descriptionDetailId->renderRow(null, __('Level of
detail')) ?>
<?php echo render_field($form->revisionHistory->label(__('Dates of
creation, revision and deletion')), $informationObject, array('class' =>
'resizable')) ?>
--~--~---------~--~----~------------~-------~--~----~
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.ca/group/qubit-commits?hl=en
-~----------~----~----~----~------~----~------~--~---
