Merge branch 'master' of git.evergreen-ils.org:Evergreen into social

diff --combined Open-ILS/examples/fm_IDL.xml
index 23b131e,706ab89..1c46440
--- 1/Open-ILS/examples/fm_IDL.xml
--- 2/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@@ -4511,79 -4511,6 +4511,79 @@@ SELECT  usr
                        <link field="editor" reltype="has_a" key="id" map="" class="au"/>
                        <link field="record" reltype="has_a" key="id" map="" class="bre"/>
                </links>
 +      </class>
 +      <class id="socrates" controller="open-ils.cstore" oils_obj:fieldmapper="social::user_rating" oils_persist:tablename="social.user_rating" reporter:label="Bib Rating">
 +              <fields oils_persist:primary="id" oils_persist:sequence="social.user_rating_id_seq">
 +                      <field name="create_date" reporter:datatype="timestamp"/>
 +                      <field name="creator" reporter:datatype="link"/>
 +                      <field name="edit_date" reporter:datatype="timestamp"/>
 +                      <field name="id" reporter:datatype="id" />
 +                      <field name="record" reporter:datatype="link"/>
 +                      <field name="value"  reporter:datatype="text"/>
 +              </fields>
 +              <links>
 +                      <link field="creator" reltype="has_a" key="id" map="" class="au"/>
 +                      <link field="record" reltype="has_a" key="id" map="" class="bre"/>
 +              </links>
 +      </class>
 +      <class id="socr" controller="open-ils.cstore" oils_obj:fieldmapper="social::user_review" oils_persist:tablename="social.user_review" reporter:label="Bib Review">
 +              <fields oils_persist:primary="id" oils_persist:sequence="social.user_review_id_seq">
 +                      <field name="create_date" reporter:datatype="timestamp"/>
 +                      <field name="creator" reporter:datatype="link"/>
 +                      <field name="edit_date" reporter:datatype="timestamp"/>
 +                      <field name="editor" reporter:datatype="link"/>
 +                      <field name="approver" reporter:datatype="link"/>
 +                      <field name="approved" reporter:datatype="bool"/>
 +                      <field name="id" reporter:datatype="id" />
 +                      <field name="record" reporter:datatype="link"/>
 +                      <field name="value"  reporter:datatype="text"/>
 +              </fields>
 +              <links>
 +                      <link field="creator" reltype="has_a" key="id" map="" class="au"/>
 +                      <link field="editor" reltype="has_a" key="id" map="" class="au"/>
 +                      <link field="approver" reltype="has_a" key="id" map="" class="au"/>
 +                      <link field="record" reltype="has_a" key="id" map="" class="bre"/>
 +              </links>
 +      </class>
 +      <class id="soct" controller="open-ils.cstore" oils_obj:fieldmapper="social::tag" oils_persist:tablename="social.tag" reporter:label="Bib Tag">
 +              <fields oils_persist:primary="id" oils_persist:sequence="social.tag_id_seq">
 +                      <field name="edit_date" reporter:datatype="timestamp"/>
 +                      <field name="editor" reporter:datatype="link"/>
 +                      <field name="approver" reporter:datatype="link"/>
 +                      <field name="approved" reporter:datatype="bool"/>
 +                      <field name="id" reporter:datatype="id" />
 +                      <field name="value"  reporter:datatype="text"/>
 +              </fields>
 +              <links>
 +                      <link field="editor" reltype="has_a" key="id" map="" class="au"/>
 +                      <link field="approver" reltype="has_a" key="id" map="" class="au"/>
 +              </links>
 +      </class>
 +      <class id="socbtm" controller="open-ils.cstore" oils_obj:fieldmapper="social::biblio_tag_map" oils_persist:tablename="social.biblio_tag_map" reporter:label="Bib Tag Map">
 +              <fields oils_persist:primary="id" oils_persist:sequence="biblio.tag_id_seq">
 +                      <field name="create_date" reporter:datatype="timestamp"/>
 +                      <field name="creator" reporter:datatype="link"/>
 +                      <field name="id" reporter:datatype="id" />
 +                      <field name="record" reporter:datatype="link"/>
 +                      <field name="tag"  reporter:datatype="link"/>
 +              </fields>
 +              <links>
 +                      <link field="creator" reltype="has_a" key="id" map="" class="au"/>
 +                      <link field="record" reltype="has_a" key="id" map="" class="bre"/>
 +                      <link field="tag" reltype="has_a" key="id" map="" class="soct"/>
 +              </links>
 +      </class>
 +      <class id="socas" controller="open-ils.cstore" oils_obj:fieldmapper="social::activity_stream" reporter:label="Social Activity Stream" oils_persist:readonly="true">
 +              <fields>
 +                      <field reporter:label="Actor" name="actor" reporter:datatype="id"/>
 +                      <field reporter:label="Object" name="object" reporter:datatype="int"/>
 +                      <field reporter:label="Target" name="target" reporter:datatype="int"/>
 +                      <field reporter:label="Activity Time" name="stamped" reporter:datatype="timestamp"/>
 +                      <field reporter:label="Activity" name="activity" reporter:datatype="text"/>
 +              </fields>
 +              <links>
 +                      <link field="actor" reltype="has_a" key="id" map="" class="au"/>
 +              </links>
        </class>
        <class id="mucs" controller="open-ils.cstore" oils_obj:fieldmapper="money::user_circulation_summary" oils_persist:tablename="money.usr_circulation_summary" reporter:label="User Circulation Summary">
                <fields oils_persist:primary="usr" oils_persist:sequence="">
@@@ -8882,6 -8809,31 +8882,31 @@@
                        </actions>
                </permacrud>
        </class>
+       <class id="cbc" controller="open-ils.cstore open-ils.pcrud" oils_obj:fieldmapper="config::barcode_completion" oils_persist:tablename="config.barcode_completion" reporter:label="Barcode Completions">
+               <fields oils_persist:primary="id" oils_persist:sequence="config.barcode_completion_id_seq">
+                       <field reporter:label="ID" name="id" reporter:datatype="id"/>
+                       <field reporter:label="Active" name="active" reporter:datatype="bool"/>
+                       <field reporter:label="Owner" name="org_unit" reporter:datatype="org_unit"/>
+                       <field reporter:label="Prefix" name="prefix" reporter:datatype="text"/>
+                       <field reporter:label="Suffix" name="suffix" reporter:datatype="text"/>
+                       <field reporter:label="Length" name="length" reporter:datatype="int"/>
+                       <field reporter:label="Padding" name="padding" reporter:datatype="text"/>
+                       <field reporter:label="Padding At End" name="padding_end" reporter:datatype="bool"/>
+                       <field reporter:label="Applies to Items" name="asset" reporter:datatype="bool"/>
+                       <field reporter:label="Applies to Users" name="actor" reporter:datatype="bool"/>
+               </fields>
+               <links>
+                       <link field="org_unit" reltype="has_a" key="id" map="" class="aou"/>
+               </links>
+               <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">
+                       <actions>
+                               <create permission="UPDATE_ORG_UNIT_SETTING_ALL" context_field="org_unit"/>
+                               <retrieve/>
+                               <update permission="UPDATE_ORG_UNIT_SETTING_ALL" context_field="org_unit"/>
+                               <delete permission="UPDATE_ORG_UNIT_SETTING_ALL" context_field="org_unit"/>
+                       </actions>
+               </permacrud>
+       </class>
  
        <!-- ********************************************************************************************************************* -->