Author: david
Date: Mon Apr 23 11:09:14 2012
New Revision: 11500
Log:
Cosmetic change. Alphabetize
Modified:
trunk/apps/qubit/modules/search/actions/advancedAction.class.php
Modified: trunk/apps/qubit/modules/search/actions/advancedAction.class.php
==============================================================================
--- trunk/apps/qubit/modules/search/actions/advancedAction.class.php Mon Apr
23 11:04:31 2012 (r11499)
+++ trunk/apps/qubit/modules/search/actions/advancedAction.class.php Mon Apr
23 11:09:14 2012 (r11500)
@@ -64,28 +64,45 @@
{
switch ($name)
{
- case 'searchFields':
+ case 'copyrightStatus':
+ $this->form->setValidator('copyrightStatus', new sfValidatorString);
+
+ $choices = array();
+ $choices[null] = null;
+ foreach
(QubitTaxonomy::getTaxonomyTerms(QubitTaxonomy::COPYRIGHT_STATUS_ID) as $item)
+ {
+ $choices[$item->id] = $item->__toString();
+ }
+
+ $this->form->setValidator('copyrightStatus', new sfValidatorString);
+ $this->form->setWidget('copyrightStatus', new
sfWidgetFormSelect(array('choices' => $choices)));
break;
- case 'repository':
- // Get list of repositories
- $criteria = new Criteria;
+ case 'hasDigitalObject':
+ $choices = array(
+ '' => '',
+ 'true' => $this->context->i18n->__('Yes'),
+ 'false' => $this->context->i18n->__('No')
+ );
- // Do source culture fallback
- $criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitActor');
+ $this->form->setValidator($name, new sfValidatorChoice(array('choices'
=> array_keys($choices))));
+ $this->form->setWidget($name, new sfWidgetFormSelect(array('choices'
=> $choices)));
- $criteria->addAscendingOrderByColumn('authorized_form_of_name');
+ break;
+
+ case 'levelOfDescription':
+ $this->form->setValidator('levelOfDescription', new sfValidatorString);
$choices = array();
$choices[null] = null;
- foreach (QubitRepository::get($criteria) as $repository)
+ foreach
(QubitTaxonomy::getTaxonomyTerms(QubitTaxonomy::LEVEL_OF_DESCRIPTION_ID) as
$item)
{
- $choices[$repository->id] = $repository;
+ $choices[$item->id] = $item;
}
- $this->form->setValidator($name, new sfValidatorChoice(array('choices'
=> array_keys($choices))));
- $this->form->setWidget($name, new sfWidgetFormSelect(array('choices'
=> $choices)));
+ $this->form->setValidator('levelOfDescription', new sfValidatorString);
+ $this->form->setWidget('levelOfDescription', new
sfWidgetFormSelect(array('choices' => $choices)));
break;
@@ -130,43 +147,28 @@
break;
- case 'hasDigitalObject':
- $choices = array(
- '' => '',
- 'true' => $this->context->i18n->__('Yes'),
- 'false' => $this->context->i18n->__('No')
- );
-
- $this->form->setValidator($name, new sfValidatorChoice(array('choices'
=> array_keys($choices))));
- $this->form->setWidget($name, new sfWidgetFormSelect(array('choices'
=> $choices)));
+ case 'repository':
+ // Get list of repositories
+ $criteria = new Criteria;
- break;
+ // Do source culture fallback
+ $criteria = QubitCultureFallback::addFallbackCriteria($criteria,
'QubitActor');
- case 'levelOfDescription':
- $this->form->setValidator('levelOfDescription', new sfValidatorString);
+ $criteria->addAscendingOrderByColumn('authorized_form_of_name');
$choices = array();
$choices[null] = null;
- foreach
(QubitTaxonomy::getTaxonomyTerms(QubitTaxonomy::LEVEL_OF_DESCRIPTION_ID) as
$item)
+ foreach (QubitRepository::get($criteria) as $repository)
{
- $choices[$item->id] = $item;
+ $choices[$repository->id] = $repository;
}
- $this->form->setValidator('levelOfDescription', new sfValidatorString);
- $this->form->setWidget('levelOfDescription', new
sfWidgetFormSelect(array('choices' => $choices)));
-
- case 'copyrightStatus':
- $this->form->setValidator('copyrightStatus', new sfValidatorString);
+ $this->form->setValidator($name, new sfValidatorChoice(array('choices'
=> array_keys($choices))));
+ $this->form->setWidget($name, new sfWidgetFormSelect(array('choices'
=> $choices)));
- $choices = array();
- $choices[null] = null;
- foreach
(QubitTaxonomy::getTaxonomyTerms(QubitTaxonomy::COPYRIGHT_STATUS_ID) as $item)
- {
- $choices[$item->id] = $item->__toString();
- }
+ break;
- $this->form->setValidator('copyrightStatus', new sfValidatorString);
- $this->form->setWidget('copyrightStatus', new
sfWidgetFormSelect(array('choices' => $choices)));
+ case 'searchFields':
break;
}
--
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.
