Added: wflow-consoleweb - Add option to hide or show list level actio…

…n when no record or no checkbox (#392) git-svn-id: http://dev.joget.org/svn/jw-community/trunk@208 1bff935d-2fe2-40b7-b00f-c2aca69a7612
jogetworkflow · Oct 24, 2011 · 3d95442 · 3d95442
1 parent 1d1b768
commit 3d95442
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/wflow-consoleweb/src/main/resources/plugin.properties b/wflow-consoleweb/src/main/resources/plugin.properties
@@ -101,6 +101,7 @@ datalist.hyperlinkdatalistaction.columnName.desc=Column name for the parameter v
 datalist.hyperlinkdatalistaction.label=Label
 datalist.hyperlinkdatalistaction.label.desc=Label shown in the column (for row actions)
 datalist.hyperlinkdatalistaction.confirmationMessage=Confirmation Message
+datalist.hyperlinkdatalistaction.visible=Visible when no record or checkbox? 
 
 #CheckBox
 form.checkbox.editCheckBox=Edit CheckBox

diff --git a/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/dbuilder/dataListView.jsp b/wflow-consoleweb/src/main/webapp/WEB-INF/jsp/dbuilder/dataListView.jsp
@@ -72,7 +72,7 @@
             <c:if test="${buttonPosition eq 'topLeft' || buttonPosition eq 'topRight' || buttonPosition eq 'bothLeft' || buttonPosition eq 'bothRight'}">
                 <div class="actions bottom ${buttonFloat}">
                     <c:forEach items="${dataList.actions}" var="action">
-                        <c:if test="${!empty dataListRows[0] || action.visibleOnNoRecord}">
+                        <c:if test="${!(empty dataListRows[0] || checkboxPosition eq 'no') || action.visibleOnNoRecord}">
                             <c:set var="buttonConfirmation" value="" />
                             <c:if test="${!empty action.confirmation}">
                                 <c:set var="buttonConfirmation" value=" onclick=\"return confirm('${action.confirmation}')\""/>
@@ -105,7 +105,7 @@
             <c:if test="${buttonPosition eq 'bottomLeft' || buttonPosition eq 'bottomRight' || buttonPosition eq 'bothLeft' || buttonPosition eq 'bothRight'}">
                 <div class="actions bottom ${buttonFloat}">
                     <c:forEach items="${dataList.actions}" var="action">
-                        <c:if test="${!empty dataListRows[0] || action.visibleOnNoRecord}">
+                        <c:if test="${!(empty dataListRows[0] || checkboxPosition eq 'no') || action.visibleOnNoRecord}">
                             <c:set var="buttonConfirmation" value="" />
                             <c:if test="${!empty action.confirmation}">
                                 <c:set var="buttonConfirmation" value=" onclick=\"return confirm('${action.confirmation}')\""/>

diff --git a/wflow-core/src/main/resources/properties/datalist/hyperlinkDataListAction.json b/wflow-core/src/main/resources/properties/datalist/hyperlinkDataListAction.json
@@ -42,5 +42,13 @@
         label : '@@datalist.hyperlinkdatalistaction.confirmationMessage@@',
         name : 'confirmation',
         type : 'textfield'
+    },
+    {
+        label : '@@datalist.hyperlinkdatalistaction.visible@@',
+        name : 'visible',
+        type : 'checkbox',
+        options : [
+            {'value' : 'true', 'label' : ''}
+        ]
     }]
 }]