From 6fc620d00682158f560441e4c7282818cb85f472 Mon Sep 17 00:00:00 2001 From: Jonathan Date: Wed, 7 Feb 2018 15:03:08 -0600 Subject: [PATCH] #13395 Added the language flag for the workflow task --- .../portlet/ext/workflows/view_tasks_list.jsp | 346 +++++++++--------- 1 file changed, 179 insertions(+), 167 deletions(-) diff --git a/dotCMS/src/main/webapp/html/portlet/ext/workflows/view_tasks_list.jsp b/dotCMS/src/main/webapp/html/portlet/ext/workflows/view_tasks_list.jsp index 39be75f7d5cd..e58ef54574cc 100644 --- a/dotCMS/src/main/webapp/html/portlet/ext/workflows/view_tasks_list.jsp +++ b/dotCMS/src/main/webapp/html/portlet/ext/workflows/view_tasks_list.jsp @@ -23,8 +23,8 @@ Map newMap = new HashMap(); newMap.putAll(request.getParameterMap()); WorkflowSearcher searcher = new WorkflowSearcher(newMap, user); - - session.setAttribute(com.dotmarketing.util.WebKeys.WORKFLOW_SEARCHER, searcher); + + session.setAttribute(com.dotmarketing.util.WebKeys.WORKFLOW_SEARCHER, searcher); WorkflowSearcher fakeSearcher =(WorkflowSearcher) BeanUtils.cloneBean(searcher) ; WorkflowAPI wapi = APILocator.getWorkflowAPI(); @@ -34,75 +34,75 @@ params.put("struts_action", new String[] { "/ext/workflows/view_workflow_tasks" }); String referer = PortletURLUtil.getActionURL(request, WindowState.MAXIMIZED - .toString(), params); - + .toString(), params); + boolean singleStep = true; String currentStep =null; for(WorkflowTask task: tasks){ if(currentStep==null && singleStep) { currentStep =task.getStatus(); - } - if(!task.getStatus().equals(currentStep)){ + } + if(!task.getStatus().equals(currentStep)){ singleStep = false; currentStep = null; - } + } } - + if(currentStep == null){ currentStep = searcher.getStepId(); } - - - List availableActions= new ArrayList(); - if(currentStep != null){ - WorkflowStep step = new WorkflowStep(); - step.setId(currentStep); - - List myActions = wapi.findActions(step, user); - for(WorkflowAction a : myActions){ - if(!a.requiresCheckout()){ - availableActions.add(a); - } - - } - if(availableActions.size() ==0){ - singleStep=false; - } - } - - - - + + + List availableActions= new ArrayList(); + if(currentStep != null){ + WorkflowStep step = new WorkflowStep(); + step.setId(currentStep); + + List myActions = wapi.findActions(step, user); + for(WorkflowAction a : myActions){ + if(!a.requiresCheckout()){ + availableActions.add(a); + } + + } + if(availableActions.size() ==0){ + singleStep=false; + } + } + + + + %> @@ -111,157 +111,169 @@
- <%if(tasks != null && tasks.size() >0 ){ %> -
+ <%if(tasks != null && tasks.size() >0 ){ %> +
- <%if(availableActions.size() > 0){ %> - <%=LanguageUtil.get(pageContext, "Workflows") %> : - + <%if(availableActions.size() > 0){ %> + <%=LanguageUtil.get(pageContext, "Workflows") %> : + - - <%} %> -
- <%} %> + + <%} %> +
+ <%} %> - - - - - - - - - - - - - - <%if(tasks==null || tasks.size() ==0){ %> + + + + + + + + + + + + + + + + <%if(tasks==null || tasks.size() ==0){ %> - <%} %> - <%for(WorkflowTask task : tasks) { %> + <%} %> + <%for(WorkflowTask task : tasks) { %> <% - Role assignedRole = APILocator.getRoleAPI().loadRoleById(task.getAssignedTo()); - String assignedRoleName = ""; - if (UtilMethods.isSet( assignedRole ) && UtilMethods.isSet( assignedRole.getId() )) { - assignedRoleName = assignedRole.getName(); - } - %> + Role assignedRole = APILocator.getRoleAPI().loadRoleById(task.getAssignedTo()); + String assignedRoleName = ""; + if (UtilMethods.isSet( assignedRole ) && UtilMethods.isSet( assignedRole.getId() )) { + assignedRoleName = assignedRole.getName(); + } + %> <%Contentlet contentlet = new Contentlet(); - try{ - contentlet = APILocator.getContentletAPI().findContentletByIdentifier(task.getWebasset(), false, task.getLanguageId(), APILocator.getUserAPI().getSystemUser(), true); - //contentlet = APILocator.getContentletAPI().search("+identifier: "+task.getWebasset(), 0, -1, null, APILocator.getUserAPI().getSystemUser(), true).get(0); - } - catch(Exception e){ - Logger.debug(this.getClass(), e.getMessage()); - } - if(contentlet == null || !UtilMethods.isSet(contentlet.getInode())){ - continue; - } + try{ + contentlet = APILocator.getContentletAPI().findContentletByIdentifier(task.getWebasset(), false, task.getLanguageId(), APILocator.getUserAPI().getSystemUser(), true); + //contentlet = APILocator.getContentletAPI().search("+identifier: "+task.getWebasset(), 0, -1, null, APILocator.getUserAPI().getSystemUser(), true).get(0); + } + catch(Exception e){ + Logger.debug(this.getClass(), e.getMessage()); + } + if(contentlet == null || !UtilMethods.isSet(contentlet.getInode())){ + continue; + } %> <%WorkflowStep step = APILocator.getWorkflowAPI().findStep(task.getStatus()); %> + + + - - + - <% - } - %> + <% + } + %>
- disabled="true"<%} %> id="checkAllCkBx" value="true" onClick="checkAll()" /> - - ')"><%=LanguageUtil.get(pageContext, "Title")%>')"><%=LanguageUtil.get(pageContext, "Status")%>')"><%=LanguageUtil.get(pageContext, "Workflow-Step")%>')"><%=LanguageUtil.get(pageContext, "Assignee")%>')"><%=LanguageUtil.get(pageContext, "Last-Updated")%>
+ disabled="true"<%} %> id="checkAllCkBx" value="true" onClick="checkAll()" /> + + ')"><%=LanguageUtil.get(pageContext, "Title")%>')"><%=LanguageUtil.get(pageContext, "Status")%><%=LanguageUtil.get(pageContext, "language")%>')"><%=LanguageUtil.get(pageContext, "Workflow-Step")%>')"><%=LanguageUtil.get(pageContext, "Assignee")%>')"><%=LanguageUtil.get(pageContext, "Last-Updated")%>
<%=LanguageUtil.get(pageContext, "No-Tasks-Found")%>
- +
- - disabled="true"<%} %> type="checkbox" dojoType="dijit.form.CheckBox" id="<%=task.getWebasset() %>" class="taskCheckBox" value="<%=task.getId() %>" /> - + disabled="true"<%} %> type="checkbox" dojoType="dijit.form.CheckBox" id="<%=task.getWebasset() %>" class="taskCheckBox" value="<%=task.getId() %>" /> + + <%=contentlet.getTitle() %> - <%if (contentlet.isLive()) {%> - - <%} else if (contentlet.isArchived()) {%> - - <%} else if (contentlet.isWorking()) {%> - - <%}%> - <%if (contentlet.isLocked()) { - - User u = APILocator.getUserAPI().loadUserById(APILocator.getVersionableAPI().getLockedBy(contentlet), APILocator.getUserAPI().getSystemUser(), false); %> - - <%} %> + + <%} else if (contentlet.isArchived()) {%> + + <%} else if (contentlet.isWorking()) {%> + + <%}%> + <%if (contentlet.isLocked()) { + + User u = APILocator.getUserAPI().loadUserById(APILocator.getVersionableAPI().getLockedBy(contentlet), APILocator.getUserAPI().getSystemUser(), false); %> + + <%} %> + <% + final Language language = APILocator.getLanguageAPI() + .getLanguage(contentlet.getLanguageId()); + + final String langIcon = language.getLanguageCode() + "_" + language.getCountryCode(); + %> + +  (<%=langIcon%>) + style="text-decoration: line-through;"<%} %> > - <%=step.getName() %> + <%=step.getName() %> <%=assignedRoleName %> <%=DateUtil.prettyDateSince(task.getModDate(), user.getLocale()) %>
- - - - - - - -
- <%if(searcher.hasBack()){ - fakeSearcher.setPage(searcher.getPage()-1); - %> - - - <%} %> - - <%if(searcher.getTotalPages() > 1){ - for(int auxPage = searcher.getPage() - 4; auxPage < searcher.getPage(); auxPage++){ - if(auxPage >= 0){ - fakeSearcher.setPage(auxPage); - %><%=auxPage+1 %> <% - } - } - - %><%=searcher.getPage() + 1%> <% - - for(int auxPage = searcher.getPage() + 1; auxPage < searcher.getPage() + 4; auxPage++){ - if(auxPage < searcher.getTotalPages()){ - fakeSearcher.setPage(auxPage); - %><%=auxPage+1 %> <% - } - } - } %> - - <%if(searcher.hasNext()){ - fakeSearcher.setPage(searcher.getPage()+1); - %> - - - - <%} %> -
- - + + + + + + + +
+ <%if(searcher.hasBack()){ + fakeSearcher.setPage(searcher.getPage()-1); + %> + + + <%} %> + + <%if(searcher.getTotalPages() > 1){ + for(int auxPage = searcher.getPage() - 4; auxPage < searcher.getPage(); auxPage++){ + if(auxPage >= 0){ + fakeSearcher.setPage(auxPage); + %><%=auxPage+1 %> <% + } + } + + %><%=searcher.getPage() + 1%> <% + + for(int auxPage = searcher.getPage() + 1; auxPage < searcher.getPage() + 4; auxPage++){ + if(auxPage < searcher.getTotalPages()){ + fakeSearcher.setPage(auxPage); + %><%=auxPage+1 %> <% + } + } + } %> + + <%if(searcher.hasNext()){ + fakeSearcher.setPage(searcher.getPage()+1); + %> + + + + <%} %> +
+ +
@@ -269,10 +281,10 @@
-<%-- -<%=request.getQueryString() %> -
 
+ <%-- + <%=request.getQueryString() %> +
 
-<%=searcher.getQueryString() %> ---%> + <%=searcher.getQueryString() %> + --%>