Merge pull request #84 from SalesforceFoundation/feature/trial-flow-fix

Update Trial Org Flow
SalesforceFoundation · Oct 10, 2019 · c37dc1e · c37dc1e
2 parents 3f499f9 + 471e21b
commit c37dc1e
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 15 deletions.
diff --git a/cumulusci.yml b/cumulusci.yml
@@ -71,7 +71,7 @@ flows:
             1:
                 flow: dependencies
             2:
-                flow: install_managed
+                task: install_managed
             3:
                 flow: config_managed
             4:

diff --git a/unpackaged/post/config/layouts/Account-K12 Educational Institution Layout.layout b/unpackaged/post/config/layouts/Account-K12 Educational Institution Layout.layout
@@ -42,21 +42,21 @@
         <layoutColumns>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>Pre_school__c</field>
+                <field>%%%NAMESPACE%%%Pre_school__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>Middle_School__c</field>
+                <field>%%%NAMESPACE%%%Middle_School__c</field>
             </layoutItems>
         </layoutColumns>
         <layoutColumns>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>Elementary_School__c</field>
+                <field>%%%NAMESPACE%%%Elementary_School__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>High_School__c</field>
+                <field>%%%NAMESPACE%%%High_School__c</field>
             </layoutItems>
         </layoutColumns>
         <style>TwoColumnsLeftToRight</style>

diff --git a/unpackaged/post/config/layouts/Contact-K12 Faculty Layout.layout b/unpackaged/post/config/layouts/Contact-K12 Faculty Layout.layout
@@ -29,7 +29,7 @@
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>Highest_Level_of_Education__c</field>
+                <field>%%%NAMESPACE%%%Highest_Level_of_Education__c</field>
             </layoutItems>
         </layoutColumns>
         <layoutColumns>
@@ -43,7 +43,7 @@
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>Years_of_Experience__c</field>
+                <field>%%%NAMESPACE%%%Years_of_Experience__c</field>
             </layoutItems>
         </layoutColumns>
         <style>TwoColumnsLeftToRight</style>
@@ -329,7 +329,7 @@
         <fields>NAME</fields>
         <fields>hed__RelatedContact__c</fields>
         <fields>hed__Relationship_Explanation__c</fields>
-        <fields>FERPA_Approved__c</fields>
+        <fields>%%%NAMESPACE%%%FERPA_Approved__c</fields>
         <fields>hed__Emergency_Contact__c</fields>
         <fields>hed__Type__c</fields>
         <fields>hed__Status__c</fields>

diff --git a/unpackaged/post/config/layouts/Contact-K12 Guardian Layout.layout b/unpackaged/post/config/layouts/Contact-K12 Guardian Layout.layout
@@ -296,7 +296,7 @@
         <fields>NAME</fields>
         <fields>hed__RelatedContact__c</fields>
         <fields>hed__Relationship_Explanation__c</fields>
-        <fields>FERPA_Approved__c</fields>
+        <fields>%%%NAMESPACE%%%FERPA_Approved__c</fields>
         <fields>hed__Emergency_Contact__c</fields>
         <fields>hed__Type__c</fields>
         <fields>hed__Status__c</fields>

diff --git a/unpackaged/post/config/layouts/Contact-K12 Student Layout.layout b/unpackaged/post/config/layouts/Contact-K12 Student Layout.layout
@@ -29,7 +29,7 @@
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>Student_ID__c</field>
+                <field>%%%NAMESPACE%%%Student_ID__c</field>
             </layoutItems>
         </layoutColumns>
         <layoutColumns>
@@ -301,7 +301,7 @@
         <fields>NAME</fields>
         <fields>hed__RelatedContact__c</fields>
         <fields>hed__Relationship_Explanation__c</fields>
-        <fields>FERPA_Approved__c</fields>
+        <fields>%%%NAMESPACE%%%FERPA_Approved__c</fields>
         <fields>hed__Emergency_Contact__c</fields>
         <fields>hed__Type__c</fields>
         <fields>hed__Status__c</fields>

diff --git a/unpackaged/post/config/layouts/hed__Relationship__c-K12 Relationship Layout.layout b/unpackaged/post/config/layouts/hed__Relationship__c-K12 Relationship Layout.layout
@@ -21,11 +21,11 @@
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>FERPA_Approved__c</field>
+                <field>%%%NAMESPACE%%%FERPA_Approved__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>
-                <field>HIPPA_Approved__c</field>
+                <field>%%%NAMESPACE%%%HIPPA_Approved__c</field>
             </layoutItems>
             <layoutItems>
                 <behavior>Edit</behavior>

diff --git a/unpackaged/post/config/objects/Contact.object b/unpackaged/post/config/objects/Contact.object
@@ -33,7 +33,7 @@
         <fields>RecordTypeId</fields>
         <fields>AccountId</fields>
         <fields>Birthdate</fields>
-        <fields>Student_ID__c</fields>
+        <fields>%%%NAMESPACE%%%Student_ID__c</fields>
         <label>K12 Student Contact Compact Layout</label>
     </compactLayouts>
     <compactLayouts>

diff --git a/unpackaged/post/config/objects/hed__Relationship__c.object b/unpackaged/post/config/objects/hed__Relationship__c.object
@@ -15,7 +15,7 @@
         <fields>hed__Contact__c</fields>
         <fields>hed__RelatedContact__c</fields>
         <fields>hed__Relationship_Explanation__c</fields>
-        <fields>FERPA_Approved__c</fields>
+        <fields>%%%NAMESPACE%%%FERPA_Approved__c</fields>
         <fields>hed__Status__c</fields>
         <label>K12 Relationship Compact Layout</label>
     </compactLayouts>