Author: jablko
Date: Thu Sep 3 14:50:47 2009
New Revision: 3163
Log:
Change some field names
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editDcAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editModsAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
trunk/apps/qubit/modules/informationobject/templates/editDcSuccess.php
trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
trunk/apps/qubit/modules/informationobject/templates/editModsSuccess.php
trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -32,9 +32,9 @@
{
switch ($name)
{
- case 'descriptionDetailId':
- $this->form->setDefault('descriptionDetailId',
$this->informationObject->descriptionDetail->id);
- $this->form->setValidator('descriptionDetailId', new
sfValidatorInteger);
+ case 'descriptionDetail':
+ $this->form->setDefault('descriptionDetail',
$this->informationObject->descriptionDetail->id);
+ $this->form->setValidator('descriptionDetail', new sfValidatorInteger);
$choices = array();
$choices[null] = null;
@@ -43,13 +43,13 @@
$choices[$term->id] = $term;
}
- $this->form->setWidget('descriptionDetailId', new
sfWidgetFormSelect(array('choices' => $choices)));
+ $this->form->setWidget('descriptionDetail', new
sfWidgetFormSelect(array('choices' => $choices)));
break;
- case 'descriptionStatusId':
- $this->form->setDefault('descriptionStatusId',
$this->informationObject->descriptionStatus->id);
- $this->form->setValidator('descriptionStatusId', new
sfValidatorInteger);
+ case 'descriptionStatus':
+ $this->form->setDefault('descriptionStatus',
$this->informationObject->descriptionStatus->id);
+ $this->form->setValidator('descriptionStatus', new sfValidatorInteger);
$choices = array();
$choices[null] = null;
@@ -58,7 +58,7 @@
$choices[$term->id] = $term;
}
- $this->form->setWidget('descriptionStatusId', new
sfWidgetFormSelect(array('choices' => $choices)));
+ $this->form->setWidget('descriptionStatus', new
sfWidgetFormSelect(array('choices' => $choices)));
break;
@@ -70,9 +70,9 @@
break;
- case 'repositoryId':
- $this->form->setDefault('repositoryId',
$this->informationObject->repository->id);
- $this->form->setValidator('repositoryId', new sfValidatorInteger);
+ case 'repository':
+ $this->form->setDefault('repository',
$this->informationObject->repository->id);
+ $this->form->setValidator('repository', new sfValidatorInteger);
$choices = array();
$choices[null] = null;
@@ -81,7 +81,7 @@
$choices[$repository->id] = $repository;
}
- $this->form->setWidget('repositoryId', new
sfWidgetFormSelect(array('choices' => $choices)));
+ $this->form->setWidget('repository', new
sfWidgetFormSelect(array('choices' => $choices)));
break;
Modified:
trunk/apps/qubit/modules/informationobject/actions/editDcAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editDcAction.class.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/actions/editDcAction.class.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -39,7 +39,7 @@
'relation',
'scopeAndContent',
'title',
- 'typeIds');
+ 'types');
protected function addField($name)
{
@@ -64,7 +64,7 @@
break;
- case 'typeIds':
+ case 'types':
$criteria = new Criteria;
$this->informationObject->addObjectTermRelationsRelatedByObjectIdCriteria($criteria);
QubitObjectTermRelation::addJoinTermCriteria($criteria);
@@ -76,9 +76,9 @@
$values[] = $relation->term->id;
}
- $this->form->setDefault('typeIds', $values);
- $this->form->setValidator('typeIds', new sfValidatorPass);
- $this->form->setWidget('typeIds', new
sfWidgetFormSelect(array('choices' =>
QubitTaxonomy::getTermsById(QubitTaxonomy::MODS_RESOURCE_TYPE_ID)->indexBy('id'),
'multiple' => true)));
+ $this->form->setDefault('types', $values);
+ $this->form->setValidator('types', new sfValidatorPass);
+ $this->form->setWidget('types', new sfWidgetFormSelect(array('choices'
=>
QubitTaxonomy::getTermsById(QubitTaxonomy::MODS_RESOURCE_TYPE_ID)->indexBy('id'),
'multiple' => true)));
break;
}
@@ -112,8 +112,8 @@
break;
- case 'typeIds':
- $filtered = $flipped = array_flip($this->form->getValue('typeIds'));
+ case 'types':
+ $filtered = $flipped = array_flip($this->form->getValue('types'));
foreach ($this->relations as $relation)
{
Modified:
trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/actions/editIsadAction.class.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -37,7 +37,7 @@
'appraisal',
'archivalHistory',
'arrangement',
- 'creatorIds',
+ 'creators',
'descriptionIdentifier',
'extentAndMedium',
'findingAids',
@@ -45,12 +45,12 @@
'institutionResponsibleIdentifier',
'languageOfDescription',
'language',
- 'descriptionDetailId',
+ 'descriptionDetail',
'locationOfCopies',
'locationOfOriginals',
'physicalCharacteristics',
'relatedUnitsOfDescription',
- 'repositoryId',
+ 'repository',
'reproductionConditions',
'revisionHistory',
'rules',
@@ -58,7 +58,7 @@
'scriptOfDescription',
'script',
'sources',
- 'descriptionStatusId',
+ 'descriptionStatus',
'title');
protected function addField($name)
@@ -67,7 +67,7 @@
switch ($name)
{
- case 'creatorIds':
+ case 'creators':
$criteria = new Criteria;
$this->informationObject->addEventsCriteria($criteria);
$criteria->add(QubitEvent::ACTOR_ID, null, Criteria::ISNOTNULL);
@@ -79,14 +79,14 @@
$values[] = $event->actor->id;
}
- $this->form->setDefault('creatorIds', $values);
- $this->form->setValidator('creatorIds', new sfValidatorPass);
+ $this->form->setDefault('creators', $values);
+ $this->form->setValidator('creators', new sfValidatorPass);
$criteria = new Criteria;
$criteria->addJoin(QubitActor::ID, QubitUser::ID, 'LEFT JOIN');
$criteria->add(QubitUser::ID);
- $this->form->setWidget('creatorIds', new
sfWidgetFormSelect(array('choices' =>
QubitActor::get($criteria)->indexBy('id'), 'multiple' => true)));
+ $this->form->setWidget('creators', new
sfWidgetFormSelect(array('choices' =>
QubitActor::get($criteria)->indexBy('id'), 'multiple' => true)));
break;
@@ -121,8 +121,8 @@
{
switch ($field->getName())
{
- case 'creatorIds':
- $filtered = $flipped = array_flip($this->form->getValue('creatorIds'));
+ case 'creators':
+ $filtered = $flipped = array_flip($this->form->getValue('creators'));
foreach ($this->events as $event)
{
Modified:
trunk/apps/qubit/modules/informationobject/actions/editModsAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editModsAction.class.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/actions/editModsAction.class.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -35,7 +35,7 @@
'identifier',
'language',
'title',
- 'typeIds');
+ 'types');
protected function addField($name)
{
@@ -43,7 +43,7 @@
switch ($name)
{
- case 'typeIds':
+ case 'types':
$criteria = new Criteria;
$this->informationObject->addObjectTermRelationsRelatedByObjectIdCriteria($criteria);
QubitObjectTermRelation::addJoinTermCriteria($criteria);
@@ -55,9 +55,9 @@
$values[] = $relation->term->id;
}
- $this->form->setDefault('typeIds', $values);
- $this->form->setValidator('typeIds', new sfValidatorPass);
- $this->form->setWidget('typeIds', new
sfWidgetFormSelect(array('choices' =>
QubitTaxonomy::getTermsById(QubitTaxonomy::MODS_RESOURCE_TYPE_ID)->indexBy('id'),
'multiple' => true)));
+ $this->form->setDefault('types', $values);
+ $this->form->setValidator('types', new sfValidatorPass);
+ $this->form->setWidget('types', new sfWidgetFormSelect(array('choices'
=>
QubitTaxonomy::getTermsById(QubitTaxonomy::MODS_RESOURCE_TYPE_ID)->indexBy('id'),
'multiple' => true)));
break;
}
@@ -74,8 +74,8 @@
{
switch ($field->getName())
{
- case 'typeIds':
- $filtered = $flipped = array_flip($this->form->getValue('typeIds'));
+ case 'types':
+ $filtered = $flipped = array_flip($this->form->getValue('types'));
foreach ($this->relations as $relation)
{
Modified:
trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/actions/editRadAction.class.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -47,7 +47,7 @@
'issuingJurisdictionAndDenomination',
'language',
'languageOfDescription',
- 'descriptionDetailId',
+ 'descriptionDetail',
'locationOfCopies',
'locationOfOriginals',
'noteOnPublishersSeries',
@@ -57,7 +57,7 @@
'parallelTitleOfPublishersSeries',
'physicalCharacteristics',
'relatedUnitsOfDescription',
- 'repositoryId',
+ 'repository',
'reproductionConditions',
'revisionHistory',
'rules',
@@ -71,11 +71,11 @@
'statementOfResponsibilityRelatingToPublishersSeries',
'statementOfScaleArchitectural',
'statementOfScaleCartographic',
- 'descriptionStatusId',
+ 'descriptionStatus',
'title',
'titleStatementOfResponsibility',
'titleProperOfPublishersSeries',
- 'typeIds');
+ 'types');
protected function addField($name)
{
@@ -122,7 +122,7 @@
break;
- case 'typeIds':
+ case 'types':
$criteria = new Criteria;
$this->informationObject->addObjectTermRelationsRelatedByObjectIdCriteria($criteria);
QubitObjectTermRelation::addJoinTermCriteria($criteria);
@@ -134,9 +134,9 @@
$values[] = $relation->term->id;
}
- $this->form->setDefault('typeIds', $values);
- $this->form->setValidator('typeIds', new sfValidatorPass);
- $this->form->setWidget('typeIds', new
sfWidgetFormSelect(array('choices' =>
QubitTaxonomy::getTermsById(QubitTaxonomy::MATERIAL_TYPE_ID)->indexBy('id'),
'multiple' => true)));
+ $this->form->setDefault('types', $values);
+ $this->form->setValidator('types', new sfValidatorPass);
+ $this->form->setWidget('types', new sfWidgetFormSelect(array('choices'
=> QubitTaxonomy::getTermsById(QubitTaxonomy::MATERIAL_TYPE_ID)->indexBy('id'),
'multiple' => true)));
break;
}
@@ -187,8 +187,8 @@
break;
- case 'typeIds':
- $filtered = $flipped = array_flip($this->form->getValue('typeIds'));
+ case 'types':
+ $filtered = $flipped = array_flip($this->form->getValue('types'));
foreach ($this->relations as $relation)
{
Modified: trunk/apps/qubit/modules/informationobject/templates/editDcSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editDcSuccess.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/templates/editDcSuccess.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -61,7 +61,7 @@
<?php echo include_component('informationobject', 'eventForm') ?>
</div>
- <?php echo $form->typeIds->label(__('Type'))->renderRow() ?>
+ <?php echo $form->types->renderRow() ?>
<?php echo render_field($form->extentAndMedium->label(__('Format')),
$informationObject, array('class' => 'resizable')) ?>
Modified:
trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/templates/editIsadSuccess.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -108,9 +108,9 @@
<fieldset class="collapsible collapsed" id="contextArea">
<legend><?php echo __('context area') ?></legend>
- <?php echo $form->creatorIds->label(__('Name of
creator(s)'))->renderRow(array('class' => 'form-autocomplete')) ?>
+ <?php echo $form->creators->label(__('Name of
creator(s)'))->renderRow(array('class' => 'form-autocomplete')) ?>
- <?php echo
$form->repositoryId->label(__('Repository'))->renderRow(array('class' =>
'form-autocomplete')) ?>
+ <?php echo $form->repository->renderRow(array('class' =>
'form-autocomplete')) ?>
<?php echo render_field($form->archivalHistory, $informationObject,
array('class' => 'resizable')) ?>
@@ -342,9 +342,9 @@
<?php echo render_field($form->rules->label(__('Rules or conventions')),
$informationObject, array('class' => 'resizable')) ?>
- <?php echo $form->descriptionStatusId->label(__('Status'))->renderRow() ?>
+ <?php echo $form->descriptionStatus->label(__('Status'))->renderRow() ?>
- <?php echo $form->descriptionDetailId->label(__('Level of
detail'))->renderRow() ?>
+ <?php echo $form->descriptionDetail->label(__('Level of
detail'))->renderRow() ?>
<?php echo render_field($form->revisionHistory->label(__('Dates of
creation, revision and deletion')), $informationObject, array('class' =>
'resizable')) ?>
Modified:
trunk/apps/qubit/modules/informationobject/templates/editModsSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editModsSuccess.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/templates/editModsSuccess.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -62,7 +62,7 @@
<?php echo include_component('informationobject', 'eventForm') ?>
</div>
- <?php echo $form->typeIds->label(__('Type of resource'))->renderRow() ?>
+ <?php echo $form->types->label(__('Type of resource'))->renderRow() ?>
<?php echo $form->language->renderRow(array('class' =>
'form-autocomplete')) ?>
Modified:
trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
Thu Sep 3 14:49:30 2009 (r3162)
+++ trunk/apps/qubit/modules/informationobject/templates/editRadSuccess.php
Thu Sep 3 14:50:47 2009 (r3163)
@@ -24,7 +24,7 @@
<legend><?php echo __('title and statement of responsibility area')
?></legend>
<?php echo render_field($form->title->label(__('Title proper')),
$informationObject) ?>
- <?php echo $form->typeIds->label(__('General material
designation'))->renderRow() ?>
+ <?php echo $form->types->label(__('General material
designation'))->renderRow() ?>
<?php echo render_field($form->alternateTitle->label(__('Parallel
title')), $informationObject) ?>
@@ -76,7 +76,7 @@
</tr>
</table>
- <?php echo
$form->repositoryId->label(__('Repository'))->renderRow(array('class' =>
'form-autocomplete')) ?>
+ <?php echo $form->repository->renderRow(array('class' =>
'form-autocomplete')) ?>
<?php echo $form->identifier->renderRow() ?>
@@ -343,9 +343,9 @@
<?php echo render_field($form->rules->label(__('Rules or conventions')),
$informationObject, array('class' => 'resizable')) ?>
- <?php echo $form->descriptionStatusId->label(__('Status'))->renderRow() ?>
+ <?php echo $form->descriptionStatus->label(__('Status'))->renderRow() ?>
- <?php echo $form->descriptionDetailId->label(__('Level of
detail'))->renderRow() ?>
+ <?php echo $form->descriptionDetail->label(__('Level of
detail'))->renderRow() ?>
<?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
-~----------~----~----~----~------~----~------~--~---
