Author: sevein
Date: Fri Sep 16 19:05:19 2011
New Revision: 9746
Log:
Set policy as default value for basis combo in rights module
Modified:
trunk/apps/qubit/modules/right/actions/editComponent.class.php
trunk/data/fixtures/taxonomyTerms.yml
trunk/lib/model/QubitTerm.php
trunk/lib/task/migrate/QubitMigrate110.class.php
Modified: trunk/apps/qubit/modules/right/actions/editComponent.class.php
==============================================================================
--- trunk/apps/qubit/modules/right/actions/editComponent.class.php Fri Sep
16 17:12:09 2011 (r9745)
+++ trunk/apps/qubit/modules/right/actions/editComponent.class.php Fri Sep
16 19:05:19 2011 (r9746)
@@ -82,6 +82,11 @@
case 'basis':
foreach (QubitTaxonomy::getTermsById(QubitTaxonomy::RIGHT_BASIS_ID) as
$item)
{
+ if (QubitTerm::RIGHT_BASIS_POLICY_ID == $item->id)
+ {
+ $this->form->setDefault('basis',
$this->context->routing->generate(null, array($item, 'module' => 'term')));
+ }
+
$choices[$this->context->routing->generate(null, array($item,
'module' => 'term'))] = $item->__toString();
}
Modified: trunk/data/fixtures/taxonomyTerms.yml
==============================================================================
--- trunk/data/fixtures/taxonomyTerms.yml Fri Sep 16 17:12:09 2011
(r9745)
+++ trunk/data/fixtures/taxonomyTerms.yml Fri Sep 16 19:05:19 2011
(r9746)
@@ -1058,18 +1058,19 @@
source_culture: en
name:
en: Statute
- QubitTerm_right_basis_donor:
+ QubitTerm_right_basis_policy:
+ id: <?php echo QubitTerm::RIGHT_BASIS_POLICY_ID."\n" ?>
taxonomy_id: <?php echo QubitTaxonomy::RIGHT_BASIS_ID."\n" ?>
parent_id: QubitTerm_110
source_culture: en
name:
- en: Donor
- QubitTerm_right_basis_policy:
+ en: Policy
+ QubitTerm_right_basis_donor:
taxonomy_id: <?php echo QubitTaxonomy::RIGHT_BASIS_ID."\n" ?>
parent_id: QubitTerm_110
source_culture: en
name:
- en: Policy
+ en: Donor
QubitTerm_146:
taxonomy_id: QubitTaxonomy_10
parent_id: QubitTerm_110
Modified: trunk/lib/model/QubitTerm.php
==============================================================================
--- trunk/lib/model/QubitTerm.php Fri Sep 16 17:12:09 2011 (r9745)
+++ trunk/lib/model/QubitTerm.php Fri Sep 16 19:05:19 2011 (r9746)
@@ -133,7 +133,8 @@
// Rights basis
RIGHT_BASIS_COPYRIGHT_ID = 170,
RIGHT_BASIS_LICENSE_ID = 171,
- RIGHT_BASIS_STATUTE_ID = 172;
+ RIGHT_BASIS_STATUTE_ID = 172,
+ RIGHT_BASIS_POLICY_ID = 173;
public function isProtected()
{
Modified: trunk/lib/task/migrate/QubitMigrate110.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate110.class.php Fri Sep 16 17:12:09
2011 (r9745)
+++ trunk/lib/task/migrate/QubitMigrate110.class.php Fri Sep 16 19:05:19
2011 (r9746)
@@ -402,14 +402,15 @@
'taxonomy_id' => 'QubitTaxonomy_right_basis',
'source_culture' => 'en',
'name' => array('en' => 'Statute'));
- $this->data['QubitTerm']['QubitTerm_right_basis_donor'] = array(
- 'taxonomy_id' => 'QubitTaxonomy_right_basis',
- 'source_culture' => 'en',
- 'name' => array('en' => 'Donor'));
$this->data['QubitTerm']['QubitTerm_right_basis_policy'] = array(
+ 'id' => '<?php echo QubitTerm::RIGHT_BASIS_POLICY_ID."\n" ?>',
'taxonomy_id' => 'QubitTaxonomy_right_basis',
'source_culture' => 'en',
'name' => array('en' => 'Policy'));
+ $this->data['QubitTerm']['QubitTerm_right_basis_donor'] = array(
+ 'taxonomy_id' => 'QubitTaxonomy_right_basis',
+ 'source_culture' => 'en',
+ 'name' => array('en' => 'Donor'));
// Copyright status taxonomy and terms
$this->data['QubitTaxonomy']['QubitTaxonomy_copyright_status'] = array(
@@ -886,7 +887,8 @@
// Rights basis
'RIGHT_BASIS_COPYRIGHT_ID',
'RIGHT_BASIS_LICENSE_ID',
- 'RIGHT_BASIS_STATUTE_ID'
+ 'RIGHT_BASIS_STATUTE_ID',
+ 'RIGHT_BASIS_POLICY_ID'
);
// Restack array with Constant values at top
--
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.
