Implement #1722 "FB: Configure whether services/actions are present i…

…n toolbox"
orbeon · May 30, 2014 · 42930a5 · 42930a5
1 parent 2f390ba
commit 42930a5
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 20 deletions.
diff --git a/src/resources/forms/orbeon/builder/form/model.xml b/src/resources/forms/orbeon/builder/form/model.xml
@@ -475,7 +475,11 @@
                 <edit-source/>
                 <custom-xml/>
                 <permissions/>
-                <services-actions/>
+                <services>
+                    <http/>
+                    <database/>
+                </services>
+                <actions/>
             </toolbox>
         </metadata>
     </xf:instance>
@@ -486,13 +490,16 @@
 
     <xf:bind ref="instance('fb-metadata-instance')">
         <!-- Triggers -->
-        <xf:bind ref="next-trigger" readonly="../@valid = 'false'"/>
-        <xf:bind ref="toolbox/schema" relevant="xxf:property('oxf.fb.menu.schema')"/>
-        <xf:bind ref="toolbox/css" relevant="xxf:property('oxf.fb.menu.css')"/>
-        <xf:bind ref="toolbox/pdf" relevant="xxf:property('oxf.fb.menu.pdf')"/>
-        <xf:bind ref="toolbox/edit-source" relevant="xxf:property('oxf.fb.menu.edit-source')"/>
-        <xf:bind ref="toolbox/custom-xml" relevant="xxf:property('oxf.fb.menu.custom-xml')"/>
-        <xf:bind ref="toolbox/permissions" relevant="xxf:property('oxf.fb.menu.permissions')"/>
+        <xf:bind ref="next-trigger"              readonly="../@valid = 'false'"/>
+        <xf:bind ref="toolbox/schema"            relevant="xxf:property('oxf.fb.menu.schema')"/>
+        <xf:bind ref="toolbox/css"               relevant="xxf:property('oxf.fb.menu.css')"/>
+        <xf:bind ref="toolbox/pdf"               relevant="xxf:property('oxf.fb.menu.pdf')"/>
+        <xf:bind ref="toolbox/edit-source"       relevant="xxf:property('oxf.fb.menu.edit-source')"/>
+        <xf:bind ref="toolbox/custom-xml"        relevant="xxf:property('oxf.fb.menu.custom-xml')"/>
+        <xf:bind ref="toolbox/permissions"       relevant="xxf:property('oxf.fb.menu.permissions')"/>
+        <xf:bind ref="toolbox/services/http"     relevant="xxf:property('oxf.fb.menu.services.http')"/>
+        <xf:bind ref="toolbox/services/database" relevant="xxf:property('oxf.fb.menu.services.database')"/>
+        <xf:bind ref="toolbox/actions"           relevant="xxf:property('oxf.fb.menu.actions')"/>
     </xf:bind>
 
     <!-- Cut/copy/paste instance -->

diff --git a/src/resources/forms/orbeon/builder/form/toolbox.xml b/src/resources/forms/orbeon/builder/form/toolbox.xml
@@ -216,11 +216,8 @@
             </xh:div>
         </xh:div>
 
-        <!-- To facilitate marking buttons read-only -->
-        <xf:var name="trigger" value="instance('fb-metadata-instance')/toolbox/services-actions" as="element()"/>
-
         <!-- Services -->
-        <xh:div class="fb-tools">
+        <xf:group xxf:element="div" class="fb-tools" ref="instance('fb-metadata-instance')/toolbox/services/http">
             <xf:group class="fb-hide-alert">
                 <xh:legend><xf:output ref="$form-resources/http-services/label"/></xh:legend>
                 <!-- Repeat over existing services -->
@@ -237,7 +234,7 @@
                     </xh:div>
                 </xf:repeat>
                 <xh:div class="fb-tool">
-                    <xf:trigger ref="$trigger">
+                    <xf:trigger>
                         <xf:label>
                             <xh:i class="icon-plus-sign"/>
                             <xf:output value="$form-resources/add/label"/>
@@ -247,10 +244,10 @@
                     </xf:trigger>
                 </xh:div>
             </xf:group>
-        </xh:div>
+        </xf:group>
 
         <!-- Database services -->
-        <xh:div class="fb-tools">
+        <xf:group xxf:element="div" class="fb-tools" ref="instance('fb-metadata-instance')/toolbox/services/database">
             <xf:group class="fb-hide-alert">
                 <xh:legend><xf:output ref="$form-resources/database-services/label"/></xh:legend>
                 <!-- Repeat over existing services -->
@@ -267,7 +264,7 @@
                         </xh:div>
                 </xf:repeat>
                 <xh:div class="fb-tool">
-                    <xf:trigger ref="$trigger">
+                    <xf:trigger>
                         <xf:label>
                             <xh:i class="icon-plus-sign"/>
                             <xf:output value="$form-resources/add/label"/>
@@ -277,10 +274,10 @@
                     </xf:trigger>
                 </xh:div>
             </xf:group>
-        </xh:div>
+        </xf:group>
 
         <!-- Actions -->
-        <xh:div class="fb-tools">
+        <xf:group xxf:element="div" class="fb-tools" ref="instance('fb-metadata-instance')/toolbox/actions">
             <xf:group class="fb-hide-alert">
                 <xh:legend><xf:output ref="$form-resources/actions/label"/></xh:legend>
                 <!-- Repeat over existing bindings -->
@@ -297,7 +294,7 @@
                     </xh:div>
                 </xf:repeat>
                 <xh:div class="fb-tool">
-                    <xf:trigger ref="$trigger">
+                    <xf:trigger>
                         <xf:label>
                             <xh:i class="icon-plus-sign"/>
                             <xf:output value="$form-resources/add/label"/>
@@ -307,7 +304,7 @@
                     </xf:trigger>
                 </xh:div>
             </xf:group>
-        </xh:div>
+        </xf:group>
         <!-- Orbeon Forms version -->
         <fr:version/>
     </xh:div>