Author: david
Date: 2008-11-13 14:43:05 -0800 (Thu, 13 Nov 2008)
New Revision: 1587

Modified:
   trunk/qubit/data/fixtures/sampleData.yml
   trunk/qubit/lib/form/SettingsDefaultTemplateForm.class.php
   trunk/qubit/lib/model/QubitTerm.php
Log:
- Add event type "Accumulation" and related display note "Accumulator" to 
QubitTerm and sampleData.yml.
- Correct name of "Canadian Council *of* Archives" in sampleData.yml and 
SettingsDefaultTemplateForm.

Modified: trunk/qubit/data/fixtures/sampleData.yml
===================================================================
--- trunk/qubit/data/fixtures/sampleData.yml    2008-11-13 18:54:58 UTC (rev 
1586)
+++ trunk/qubit/data/fixtures/sampleData.yml    2008-11-13 22:43:05 UTC (rev 
1587)
@@ -121,14 +121,14 @@
     source_culture: en
     id: <?php echo QubitTaxonomy::RAD_NOTE_ID."\n" ?>
     name: { en: 'RAD Note' }
-    note: { en: 'Note types that occur specifically within the Canadian 
Council on Archives', Rules: 'for Archival Description (RAD)''' }
+    note: { en: 'Note types that occur specifically within the Canadian 
Council of Archives', Rules: 'for Archival Description (RAD)''' }
   QubitTaxonomy_22:
     created_at: '2008-10-18 12:00:00'
     updated_at: '2008-10-18 12:00:00'
     source_culture: en
     id: <?php echo QubitTaxonomy::RAD_TITLE_NOTE_ID."\n" ?>
     name: { en: 'RAD Title Note' }
-    note: { en: 'Title note types that occur specifically within the Canadian 
Council on Archives', Rules: 'for Archival Description (RAD)''' }
+    note: { en: 'Title note types that occur specifically within the Canadian 
Council of Archives', Rules: 'for Archival Description (RAD)''' }
 QubitTerm:
   QubitTerm_111:
     taxonomy_id: QubitTaxonomy_10
@@ -190,6 +190,12 @@
     updated_at: '2008-11-10 15:48:21'
     source_culture: en
     name: { en: Collection, fr: Collection, nl: Collectie, pt: Coleção }
+  QubitTerm_Accumulation:
+    taxonomy_id: QubitTaxonomy_10
+    class_name: QubitTerm
+    id: <?php echo QubitTerm::ACCUMULATION_ID."\n" ?>
+    source_culture: en
+    name: { en: Accumulation }
   QubitTerm_118:
     taxonomy_id: QubitTaxonomy_7
     class_name: QubitTerm
@@ -1247,42 +1253,6 @@
     updated_at: '2008-11-10 15:43:20'
     source_culture: en
     name: { en: 'Textual record' }
-  QubitTerm_234:
-    taxonomy_id: QubitTaxonomy_20
-    class_name: QubitTerm
-    lft: '241'
-    rgt: '242'
-    created_at: '2008-11-10 15:43:20'
-    updated_at: '2008-11-10 15:43:20'
-    source_culture: en
-    name: { en: Electronic }
-  QubitTerm_235:
-    taxonomy_id: QubitTaxonomy_20
-    class_name: QubitTerm
-    lft: '243'
-    rgt: '244'
-    created_at: '2008-11-10 15:43:20'
-    updated_at: '2008-11-10 15:43:20'
-    source_culture: en
-    name: { en: 'Large print' }
-  QubitTerm_236:
-    taxonomy_id: QubitTaxonomy_20
-    class_name: QubitTerm
-    lft: '245'
-    rgt: '246'
-    created_at: '2008-11-10 15:43:20'
-    updated_at: '2008-11-10 15:43:20'
-    source_culture: en
-    name: { en: Microform }
-  QubitTerm_237:
-    taxonomy_id: QubitTaxonomy_20
-    class_name: QubitTerm
-    lft: '247'
-    rgt: '248'
-    created_at: '2008-11-10 15:43:20'
-    updated_at: '2008-11-10 15:43:20'
-    source_culture: en
-    name: { en: Tactile }
   QubitTerm_238:
     taxonomy_id: QubitTaxonomy_21
     class_name: QubitTerm
@@ -3186,6 +3156,13 @@
     updated_at: '2008-11-10 15:48:21'
     source_culture: en
     content: { en: Collector, fr: Collectionneur, nl: Verzamelaar, pt: Coletor 
}
+  QubitNote_Accumulator:
+    object_id: QubitTerm_Accumulation
+    type_id: QubitTerm_122
+    user_id: QubitUser_252
+    scope: QubitTerm
+    source_culture: en
+    content: { en: Accumulator }
   QubitNote_30:
     object_id: QubitTerm_144
     type_id: QubitTerm_122

Modified: trunk/qubit/lib/form/SettingsDefaultTemplateForm.class.php
===================================================================
--- trunk/qubit/lib/form/SettingsDefaultTemplateForm.class.php  2008-11-13 
18:54:58 UTC (rev 1586)
+++ trunk/qubit/lib/form/SettingsDefaultTemplateForm.class.php  2008-11-13 
22:43:05 UTC (rev 1587)
@@ -32,7 +32,7 @@
   // Available templates
   protected static $informationObjectTemplates = array(
     'isad' => 'ISAD(G), International Council on Archives',
-    'rad' => 'RAD, Canadian Council on Archives'
+    'rad' => 'RAD, Canadian Council of Archives'
   );
 
   protected static $actorTemplates = array(

Modified: trunk/qubit/lib/model/QubitTerm.php
===================================================================
--- trunk/qubit/lib/model/QubitTerm.php 2008-11-13 18:54:58 UTC (rev 1586)
+++ trunk/qubit/lib/model/QubitTerm.php 2008-11-13 22:43:05 UTC (rev 1587)
@@ -31,26 +31,27 @@
   const PUBLICATION_ID = 114;
   const CONTRIBUTION_ID = 115;
   const COLLECTION_ID = 117;
+  const ACCUMULATION_ID = 118;
   //NoteType taxonomy
-  const TITLE_NOTE_ID = 118;
-  const PUBLICATION_NOTE_ID = 119;
-  const SOURCE_NOTE_ID = 120;
-  const SCOPE_NOTE_ID = 121;
-  const DISPLAY_NOTE_ID = 122;
+  const TITLE_NOTE_ID = 119;
+  const PUBLICATION_NOTE_ID = 120;
+  const SOURCE_NOTE_ID = 121;
+  const SCOPE_NOTE_ID = 122;
+  const DISPLAY_NOTE_ID = 123;
   //CollectionType taxonomy
-  const ARCHIVAL_MATERIAL_ID = 123;
-  const FINDING_AIDS_ID = 124;
-  const PUBLISHED_MATERIAL_ID = 125;
-  const ARTEFACT_MATERIAL_ID = 126;
+  const ARCHIVAL_MATERIAL_ID = 124;
+  const FINDING_AIDS_ID = 125;
+  const PUBLISHED_MATERIAL_ID = 126;
+  const ARTEFACT_MATERIAL_ID = 127;
   //ActorEntityType taxonomy
-  const CORPORATE_BODY_ID = 127;
-  const PERSON_ID = 128;
-  const FAMILY_ID = 129;
+  const CORPORATE_BODY_ID = 128;
+  const PERSON_ID = 129;
+  const FAMILY_ID = 130;
   //OtherNameType taxonomy
-  const FAMILY_NAME_FIRST_NAME_ID = 130;
+  const FAMILY_NAME_FIRST_NAME_ID = 131;
   //MediaType taxonomy
-  const AUDIO_ID = 131;
-  const IMAGE_ID = 132;
+  const AUDIO_ID = 132;
+  const IMAGE_ID = 133;
   const TEXT_ID = 134;
   const VIDEO_ID = 135;
   const OTHER_ID = 136;
@@ -70,10 +71,12 @@
   {
     //The following terms cannot be edited by users because their values are 
used in application logic
     return $this->getId() == QubitTerm::CREATION_ID ||
+           $this->getId() == QubitTerm::SUBJECT_ID ||
            $this->getId() == QubitTerm::CUSTODY_ID ||
            $this->getId() == QubitTerm::PUBLICATION_ID ||
            $this->getId() == QubitTerm::CONTRIBUTION_ID ||
-           $this->getId() == QubitTerm::SUBJECT_ID ||
+           $this->getId() == QubitTerm::COLLECTION_ID ||
+           $this->getId() == QubitTerm::ACCUMULATION_ID ||
            $this->getId() == QubitTerm::TITLE_NOTE_ID ||
            $this->getId() == QubitTerm::PUBLICATION_NOTE_ID ||
            $this->getId() == QubitTerm::SOURCE_NOTE_ID ||


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

Reply via email to