Author: jablko
Date: Fri Oct 15 14:53:54 2010
New Revision: 8170
Log:
Factor common fields into base class
Modified:
trunk/apps/qubit/modules/actor/actions/editAction.class.php
trunk/apps/qubit/modules/function/actions/editAction.class.php
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
trunk/apps/qubit/modules/repository/actions/editAction.class.php
trunk/lib/QubitEditAction.class.php
Modified: trunk/apps/qubit/modules/actor/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/actor/actions/editAction.class.php Fri Oct 15
14:39:46 2010 (r8169)
+++ trunk/apps/qubit/modules/actor/actions/editAction.class.php Fri Oct 15
14:53:54 2010 (r8170)
@@ -92,31 +92,6 @@
break;
- case 'descriptionDetail':
- case 'descriptionStatus':
- $this->form->setDefault($name, $this->context->routing->generate(null,
array($this->resource[$name], 'module' => 'term')));
-
- if ('descriptionStatus' == $name)
- {
- $terms =
QubitTaxonomy::getTermsById(QubitTaxonomy::DESCRIPTION_STATUS_ID);
- }
- else
- {
- $terms =
QubitTaxonomy::getTermsById(QubitTaxonomy::DESCRIPTION_DETAIL_LEVEL_ID);
- }
-
- $choices = array();
- $choices[null] = null;
- foreach ($terms as $item)
- {
- $choices[$this->context->routing->generate(null, array($item,
'module' => 'term'))] = $item;
- }
-
- $this->form->setValidator($name, new sfValidatorString);
- $this->form->setWidget($name, new sfWidgetFormSelect(array('choices'
=> $choices)));
-
- break;
-
case 'authorizedFormOfName':
case 'corporateBodyIdentifiers':
case 'datesOfExistence':
@@ -235,19 +210,6 @@
break;
- case 'descriptionDetail':
- case 'descriptionStatus':
- unset($this->resource[$field->getName()]);
-
- $value = $this->form->getValue($field->getName());
- if (isset($value))
- {
- $params = $this->context->routing->parse(Qubit::pathInfo($value));
- $this->resource[$field->getName()] = $params['_sf_route']->resource;
- }
-
- break;
-
default:
return parent::processField($field);
Modified: trunk/apps/qubit/modules/function/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/function/actions/editAction.class.php Fri Oct
15 14:39:46 2010 (r8169)
+++ trunk/apps/qubit/modules/function/actions/editAction.class.php Fri Oct
15 14:53:54 2010 (r8170)
@@ -146,44 +146,6 @@
break;
- case 'descriptionStatus':
-
- if (null !== $this->resource->descriptionStatus)
- {
- $this->form->setDefault('descriptionStatus',
$this->context->routing->generate(null,
array($this->resource->descriptionStatus, 'module' => 'term')));
- }
- $this->form->setValidator('descriptionStatus', new sfValidatorString);
-
- $choices = array();
- $choices[null] = null;
- foreach
(QubitTaxonomy::getTermsById(QubitTaxonomy::DESCRIPTION_STATUS_ID) as $term)
- {
- $choices[$this->context->routing->generate(null, array($term,
'module' => 'term'))] = $term;
- }
-
- $this->form->setWidget('descriptionStatus', new
sfWidgetFormSelect(array('choices' => $choices)));
-
- break;
-
- case 'descriptionDetail':
-
- if (null !== $this->resource->descriptionDetail)
- {
- $this->form->setDefault('descriptionDetail',
$this->context->routing->generate(null,
array($this->resource->descriptionDetail, 'module' => 'term')));
- }
- $this->form->setValidator('descriptionDetail', new sfValidatorString);
-
- $choices = array();
- $choices[null] = null;
- foreach
(QubitTaxonomy::getTermsById(QubitTaxonomy::DESCRIPTION_DETAIL_LEVEL_ID) as
$term)
- {
- $choices[$this->context->routing->generate(null, array($term,
'module' => 'term'))] = $term;
- }
-
- $this->form->setWidget('descriptionDetail', new
sfWidgetFormSelect(array('choices' => $choices)));
-
- break;
-
case 'maintenanceNotes':
$this->maintenanceNote = null;
@@ -290,8 +252,6 @@
switch ($name = $field->getName())
{
case 'type':
- case 'descriptionStatus':
- case 'descriptionDetail':
$params =
$this->context->routing->parse(Qubit::pathInfo($this->form->getValue($name)));
$fieldId = (isset($params['id'])) ? $params['id'] : null;
$this->resource[$name.'Id'] = $fieldId;
Modified:
trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Oct 15 14:39:46 2010 (r8169)
+++ trunk/apps/qubit/modules/informationobject/actions/editAction.class.php
Fri Oct 15 14:53:54 2010 (r8170)
@@ -118,36 +118,6 @@
{
switch ($name)
{
- case 'descriptionDetail':
- $this->form->setDefault('descriptionDetail',
$this->context->routing->generate(null,
array($this->resource->descriptionDetail, 'module' => 'term')));
- $this->form->setValidator('descriptionDetail', new sfValidatorString);
-
- $choices = array();
- $choices[null] = null;
- foreach
(QubitTaxonomy::getTermsById(QubitTaxonomy::DESCRIPTION_DETAIL_LEVEL_ID) as
$item)
- {
- $choices[$this->context->routing->generate(null, array($item,
'module' => 'term'))] = $item;
- }
-
- $this->form->setWidget('descriptionDetail', new
sfWidgetFormSelect(array('choices' => $choices)));
-
- break;
-
- case 'descriptionStatus':
- $this->form->setDefault('descriptionStatus',
$this->context->routing->generate(null,
array($this->resource->descriptionStatus, 'module' => 'term')));
- $this->form->setValidator('descriptionStatus', new sfValidatorString);
-
- $choices = array();
- $choices[null] = null;
- foreach
(QubitTaxonomy::getTermsById(QubitTaxonomy::DESCRIPTION_STATUS_ID) as $item)
- {
- $choices[$this->context->routing->generate(null, array($item,
'module' => 'term'))] = $item;
- }
-
- $this->form->setWidget('descriptionStatus', new
sfWidgetFormSelect(array('choices' => $choices)));
-
- break;
-
case 'levelOfDescription':
$this->form->setDefault('levelOfDescription',
$this->context->routing->generate(null,
array($this->resource->levelOfDescription, 'module' => 'term')));
$this->form->setValidator('levelOfDescription', new sfValidatorString);
@@ -319,8 +289,6 @@
{
switch ($field->getName())
{
- case 'descriptionDetail':
- case 'descriptionStatus':
case 'levelOfDescription':
case 'parent':
case 'repository':
Modified: trunk/apps/qubit/modules/repository/actions/editAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/repository/actions/editAction.class.php Fri Oct
15 14:39:46 2010 (r8169)
+++ trunk/apps/qubit/modules/repository/actions/editAction.class.php Fri Oct
15 14:53:54 2010 (r8170)
@@ -88,18 +88,22 @@
break;
- case 'descStatus':
case 'descDetail':
+ case 'descStatus':
$this->form->setDefault($name, $this->context->routing->generate(null,
array($this->resource[$name], 'module' => 'term')));
$this->form->setValidator($name, new sfValidatorString);
- if ('descStatus' == $name)
- {
- $id = QubitTaxonomy::DESCRIPTION_STATUS_ID;
- }
- else
+ switch ($name)
{
- $id = QubitTaxonomy::DESCRIPTION_DETAIL_LEVEL_ID;
+ case 'descDetail':
+ $id = QubitTaxonomy::DESCRIPTION_DETAIL_LEVEL_ID;
+
+ break;
+
+ case 'descStatus':
+ $id = QubitTaxonomy::DESCRIPTION_STATUS_ID;
+
+ break;
}
$choices = array();
Modified: trunk/lib/QubitEditAction.class.php
==============================================================================
--- trunk/lib/QubitEditAction.class.php Fri Oct 15 14:39:46 2010 (r8169)
+++ trunk/lib/QubitEditAction.class.php Fri Oct 15 14:53:54 2010 (r8170)
@@ -23,6 +23,36 @@
{
switch ($name)
{
+ case 'descriptionDetail':
+ $this->form->setDefault('descriptionDetail',
$this->context->routing->generate(null,
array($this->resource->descriptionDetail, 'module' => 'term')));
+ $this->form->setValidator('descriptionDetail', new sfValidatorString);
+
+ $choices = array();
+ $choices[null] = null;
+ foreach
(QubitTaxonomy::getTermsById(QubitTaxonomy::DESCRIPTION_DETAIL_LEVEL_ID) as
$item)
+ {
+ $choices[$this->context->routing->generate(null, array($item,
'module' => 'term'))] = $item;
+ }
+
+ $this->form->setWidget('descriptionDetail', new
sfWidgetFormSelect(array('choices' => $choices)));
+
+ break;
+
+ case 'descriptionStatus':
+ $this->form->setDefault('descriptionStatus',
$this->context->routing->generate(null,
array($this->resource->descriptionStatus, 'module' => 'term')));
+ $this->form->setValidator('descriptionStatus', new sfValidatorString);
+
+ $choices = array();
+ $choices[null] = null;
+ foreach
(QubitTaxonomy::getTermsById(QubitTaxonomy::DESCRIPTION_STATUS_ID) as $item)
+ {
+ $choices[$this->context->routing->generate(null, array($item,
'module' => 'term'))] = $item;
+ }
+
+ $this->form->setWidget('descriptionStatus', new
sfWidgetFormSelect(array('choices' => $choices)));
+
+ break;
+
case 'language':
case 'languageOfDescription':
$this->form->setDefault($name, $this->resource[$name]);
@@ -35,9 +65,14 @@
case 'parallelName':
case 'standardizedName':
$criteria = new Criteria;
- $criteria = $this->resource->addotherNamesCriteria($criteria);
+ $criteria = $this->resource->addOtherNamesCriteria($criteria);
switch ($name)
{
+ case 'otherName':
+ $criteria->add(QubitOtherName::TYPE_ID,
QubitTerm::OTHER_FORM_OF_NAME_ID);
+
+ break;
+
case 'parallelName':
$criteria->add(QubitOtherName::TYPE_ID,
QubitTerm::PARALLEL_FORM_OF_NAME_ID);
@@ -47,9 +82,6 @@
$criteria->add(QubitOtherName::TYPE_ID,
QubitTerm::STANDARDIZED_FORM_OF_NAME_ID);
break;
-
- default:
- $criteria->add(QubitOtherName::TYPE_ID,
QubitTerm::OTHER_FORM_OF_NAME_ID);
}
$value = $defaults = array();
@@ -82,6 +114,19 @@
{
switch ($field->getName())
{
+ case 'descriptionDetail':
+ case 'descriptionStatus':
+ unset($this->resource[$field->getName()]);
+
+ $value = $this->form->getValue($field->getName());
+ if (isset($value))
+ {
+ $params = $this->context->routing->parse(Qubit::pathInfo($value));
+ $this->resource[$field->getName()] = $params['_sf_route']->resource;
+ }
+
+ break;
+
case 'otherName':
case 'parallelName':
case 'standardizedName':
--
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.
