Author: sevein
Date: Wed Sep 21 22:30:57 2011
New Revision: 9790

Log:
Update act terms, fixes issue 2085

Modified:
   trunk/data/fixtures/taxonomyTerms.yml
   trunk/lib/task/migrate/QubitMigrate110.class.php

Modified: trunk/data/fixtures/taxonomyTerms.yml
==============================================================================
--- trunk/data/fixtures/taxonomyTerms.yml       Wed Sep 21 17:30:55 2011        
(r9789)
+++ trunk/data/fixtures/taxonomyTerms.yml       Wed Sep 21 22:30:57 2011        
(r9790)
@@ -2339,90 +2339,48 @@
     source_culture: en
     name:
       en: Part
-  QubitTerm_right_act_disseminate:
-    taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
-    parent_id: QubitTerm_110
-    source_culture: en
-    name:
-      en: Disseminate
   QubitTerm_right_act_delete:
     taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
     parent_id: QubitTerm_110
     source_culture: en
     name:
       en: Delete
-  QubitTerm_right_act_emulate:
-    taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
-    parent_id: QubitTerm_110
-    source_culture: en
-    name:
-      en: Emulate
-  QubitTerm_right_act_migrate:
-    taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
-    parent_id: QubitTerm_110
-    source_culture: en
-    name:
-      en: Migrate
-  QubitTerm_right_act_modify:
-    taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
-    parent_id: QubitTerm_110
-    source_culture: en
-    name:
-      en: Modify
-  QubitTerm_right_act_replicate:
-    taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
-    parent_id: QubitTerm_110
-    source_culture: en
-    name:
-      en: Replicate
-  QubitTerm_right_act_broadcast:
-    taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
-    parent_id: QubitTerm_110
-    source_culture: en
-    name:
-      en: Broadcast
-  QubitTerm_right_act_exhibit:
-    taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
-    parent_id: QubitTerm_110
-    source_culture: en
-    name:
-      en: Exhibit
-  QubitTerm_right_act_perform:
+  QubitTerm_right_act_discover:
     taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
     parent_id: QubitTerm_110
     source_culture: en
     name:
-      en: Perform
-  QubitTerm_right_act_present:
+      en: Discover
+  QubitTerm_right_act_display:
     taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
     parent_id: QubitTerm_110
     source_culture: en
     name:
-      en: Present
-  QubitTerm_right_act_preserve:
+      en: Display
+  QubitTerm_right_act_disseminate:
     taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
     parent_id: QubitTerm_110
     source_culture: en
     name:
-      en: Preserve
-  QubitTerm_right_act_publish:
+      en: Disseminate
+  QubitTerm_right_act_migrate:
     taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
     parent_id: QubitTerm_110
     source_culture: en
     name:
-      en: Publish
-  QubitTerm_right_act_reproduce:
+      en: Migrate
+  QubitTerm_right_act_modify:
     taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
     parent_id: QubitTerm_110
     source_culture: en
     name:
-      en: Reproduce
-  QubitTerm_right_act_translate:
+      en: Modify
+  QubitTerm_right_act_replicate:
     taxonomy_id: <?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>
     parent_id: QubitTerm_110
     source_culture: en
     name:
-      en: Translate
+      en: Replicate
   QubitTerm_copyright_status_under_copyright:
     taxonomy_id: <?php echo QubitTaxonomy::COPYRIGHT_STATUS_ID."\n" ?>
     parent_id: QubitTerm_110

Modified: trunk/lib/task/migrate/QubitMigrate110.class.php
==============================================================================
--- trunk/lib/task/migrate/QubitMigrate110.class.php    Wed Sep 21 17:30:55 
2011        (r9789)
+++ trunk/lib/task/migrate/QubitMigrate110.class.php    Wed Sep 21 22:30:57 
2011        (r9790)
@@ -327,18 +327,22 @@
       'source_culture' => 'en',
       'id' => '<?php echo QubitTaxonomy::RIGHT_ACT_ID."\n" ?>',
       'name' => array('en' => 'Rights act'));
-    $this->data['QubitTerm']['QubitTerm_right_act_disseminate'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Disseminate'));
     $this->data['QubitTerm']['QubitTerm_right_act_delete'] = array(
       'taxonomy_id' => 'QubitTaxonomy_right_act',
       'source_culture' => 'en',
       'name' => array('en' => 'Delete'));
-    $this->data['QubitTerm']['QubitTerm_right_act_emulate'] = array(
+    $this->data['QubitTerm']['QubitTerm_right_act_discover'] = array(
+      'taxonomy_id' => 'QubitTaxonomy_right_act',
+      'source_culture' => 'en',
+      'name' => array('en' => 'Discover'));
+    $this->data['QubitTerm']['QubitTerm_right_act_display'] = array(
+      'taxonomy_id' => 'QubitTaxonomy_right_act',
+      'source_culture' => 'en',
+      'name' => array('en' => 'Display'));
+    $this->data['QubitTerm']['QubitTerm_right_act_disemanite'] = array(
       'taxonomy_id' => 'QubitTaxonomy_right_act',
       'source_culture' => 'en',
-      'name' => array('en' => 'Emulate'));
+      'name' => array('en' => 'Disemanite'));
     $this->data['QubitTerm']['QubitTerm_right_act_migrate'] = array(
       'taxonomy_id' => 'QubitTaxonomy_right_act',
       'source_culture' => 'en',
@@ -351,38 +355,6 @@
       'taxonomy_id' => 'QubitTaxonomy_right_act',
       'source_culture' => 'en',
       'name' => array('en' => 'Replicate'));
-    $this->data['QubitTerm']['QubitTerm_right_act_broadcast'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Broadcast'));
-    $this->data['QubitTerm']['QubitTerm_right_act_exhibit'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Exhibit'));
-    $this->data['QubitTerm']['QubitTerm_right_act_perform'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Perform'));
-    $this->data['QubitTerm']['QubitTerm_right_act_present'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Present'));
-    $this->data['QubitTerm']['QubitTerm_right_act_preserve'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Preserve'));
-    $this->data['QubitTerm']['QubitTerm_right_act_publish'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Publish'));
-    $this->data['QubitTerm']['QubitTerm_right_act_reproduce'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Reproduce'));
-    $this->data['QubitTerm']['QubitTerm_right_act_translate'] = array(
-      'taxonomy_id' => 'QubitTaxonomy_right_act',
-      'source_culture' => 'en',
-      'name' => array('en' => 'Translate'));
 
     // Right basis taxonomy and terms
     $this->data['QubitTaxonomy']['QubitTaxonomy_right_basis'] = array(

-- 
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.

Reply via email to