zmi: minor fix of action manage_tab_tasks / wf (minerva)

zms-publishing · Oct 21, 2024 · 8036fde · 8036fde
1 parent 3901241
commit 8036fde
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/Products/zms/conf/metacmd_manager/manage_tab_tasks/__init__.py b/Products/zms/conf/metacmd_manager/manage_tab_tasks/__init__.py
@@ -34,7 +34,7 @@ class manage_tab_tasks:
 	package = "com.zms.foundation.metacmd.tabs"
 
 	# Revision
-	revision = "5.0.2"
+	revision = "5.0.3"
 
 	# Roles
 	roles = ["*"]

diff --git a/Products/zms/conf/metacmd_manager/manage_tab_tasks/manage_tab_tasks.zpt b/Products/zms/conf/metacmd_manager/manage_tab_tasks/manage_tab_tasks.zpt
@@ -10,24 +10,28 @@
 	task_ids python:['TASK_ZMSNOTE', 'TASK_UNTRANSLATED', 'TASK_CHANGED_BY_DATE','TASK_INACTIVE_NODES'];
 	global obs python:[]">
 
-<form class="form-horizontal card border-bottom" role="form" name="form0" method="get" action="manage_tab_tasks">
+<form class="form-horizontal card border-bottom" role="form" name="form0" method="get">
 	<input type="hidden" name="id" value="manage_tab_tasks" />
 	<legend><span tal:replace="python:here.getZMILangStr('TAB_TASKS')">the task-type</span></legend>
 	<div class="card-body">
-		<div class="form-group row task_type my-0">
-			<div class="col-sm-2">
-				<button type="submit" class="btn btn-secondary w-100 text-nowrap"
-					onclick="$(this).html('<i class=\'fas fa-spinner fa-spin\'></i>')"
-					tal:content="python:here.getZMILangStr('BTN_DISPLAY')">
-					Display
-				</button>
-			</div>
-			<div class="col-sm-10">
-				<select class="form-control" id="task_type" name="task_type" onchange="$('.btn.btn-secondary').removeClass('btn-secondary').addClass('btn-primary')">
+		<div class="form-group task_type">
+			<div class="input-group">
+				<select class="form-control" id="task_type" name="task_type" 
+					onchange="$('.btn.btn-secondary').removeClass('btn-secondary').addClass('btn-primary').removeAttr('disabled')">
 					<option value="" tal:content="python:'----- %s -----'%(here.getZMILangStr('ACTION_SELECT')%here.getZMILangStr('ATTR_DISPLAY'))">--- ACTION_SELECT%ATTR_DISPLAY ---</option>
 					<option tal:repeat="wfActivity python:here.getWfActivities()" tal:attributes="value python:wfActivity['id']; selected python:['','selected'][int(request.get('task_type','')==wfActivity['id'])]" tal:content="python:wfActivity['name']">the name</option>
 					<option tal:repeat="id task_ids" tal:attributes="value id; selected python:['','selected'][int(request.get('task_type','')==id)]" tal:content="python:here.getZMILangStr(id)">the name</option>
 				</select>
+				<div class="input-group-append">
+					<button type="submit" class="btn btn-secondary text-nowrap" disabled="disabled"
+						onclick="$(this).html('<i class=\'fas fa-spinner fa-spin\'></i>')"
+						tal:attributes="
+							disabled python:request.get('task_type')==None and 'disabled' or None;
+							data-task_type python:request.get('task_type') and request.get('task_type') or '';"
+						tal:content="python:here.getZMILangStr('BTN_DISPLAY')">
+						Display
+					</button>
+				</div>
 			</div>
 		</div><!-- .form-group -->
 	</div>

diff --git a/Products/zms/import/example1.workflow.xml b/Products/zms/import/example1.workflow.xml
@@ -106,12 +106,12 @@
   <div class="card-body">
 		<div class="form-group row">
 			<label class="col-sm-2 control-label mandatory" for="comment"><span>Comment</span></label>
-			<div class="col-sm-10"><input type="text" name="comment" class="form-control form-control-sm" /><br /></div><!-- .col-sm-10 -->
+			<div class="col-sm-10"><input type="text" name="comment" class="form-control form-control-sm" /></div><!-- .col-sm-10 -->
 		</div><!-- .form-group.row -->
 		<div class="form-group row">
 			<div class="controls save">
 				<button name="btn" class="btn btn-primary" value="BTN_SEND" tal:content="python:here.getZMILangStr('BTN_SEND')">Send</button>
-				<button name="btn" class="btn" value="BTN_CANCEL" tal:content="python:here.getZMILangStr('BTN_CANCEL')">Cancel</button>
+				<button name="btn" class="btn btn-secondary" value="BTN_CANCEL" tal:content="python:here.getZMILangStr('BTN_CANCEL')">Cancel</button>
 			</div><!-- .controls.save -->
 		</div><!-- .form-group.row -->
   </div><!-- .card-body -->
@@ -191,12 +191,12 @@
   <div class="card-body">
 		<div class="form-group row">
 			<label class="col-sm-2 control-label mandatory" for="comment"><span>Comment</span></label>
-			<div class="col-sm-10"><input type="text" name="comment" class="form-control form-control-sm" /><br /></div><!-- .col-sm-10 -->
+			<div class="col-sm-10"><input type="text" name="comment" class="form-control form-control-sm" /></div><!-- .col-sm-10 -->
 		</div><!-- .form-group.row -->
 		<div class="form-group row">
 			<div class="controls save">
 				<button name="btn" class="btn btn-primary" value="BTN_SEND" tal:content="python:here.getZMILangStr('BTN_SEND')">Send</button>
-				<button name="btn" class="btn" value="BTN_CANCEL" tal:content="python:here.getZMILangStr('BTN_CANCEL')">Cancel</button>
+				<button name="btn" class="btn btn-secondary" value="BTN_CANCEL" tal:content="python:here.getZMILangStr('BTN_CANCEL')">Cancel</button>
 			</div><!-- .controls.save -->
 		</div><!-- .form-group.row -->
 	</div><!-- .card-body -->