From aa03a8a7c667ac810a87a0c84344882ee472e8b8 Mon Sep 17 00:00:00 2001 From: Will Ezell Date: Tue, 15 Jan 2013 15:16:17 -0500 Subject: [PATCH 1/2] more work #1853 --- src/com/dotcms/publisher/business/PublisherQueueJob.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/com/dotcms/publisher/business/PublisherQueueJob.java b/src/com/dotcms/publisher/business/PublisherQueueJob.java index 5093c4d13367..dacbeac479ca 100644 --- a/src/com/dotcms/publisher/business/PublisherQueueJob.java +++ b/src/com/dotcms/publisher/business/PublisherQueueJob.java @@ -135,11 +135,13 @@ private void updatePublishExpireDates(Date fireTime) throws DotDataException, Do String toPublish="select working_inode from identifier join contentlet_version_info " + " on (identifier.id=contentlet_version_info.identifier) " + " where syspublish_date is not null and syspublish_date<=? " + + " and (sysexpire_date is null or sysexpire_date >= ?) " + " and (live_inode is null or live_inode<>working_inode) "; DotConnect dc=new DotConnect(); dc.setSQL(toPublish); dc.addParam(fireTime); + dc.addParam(fireTime); for(Map mm : (List>)dc.loadResults()){ try{ From ee6e5b08b28bdb841a495ffb1f94ad9050712bb7 Mon Sep 17 00:00:00 2001 From: Will Ezell Date: Tue, 15 Jan 2013 16:01:36 -0500 Subject: [PATCH 2/2] fixes #1850 --- .../contentlet/contentlet_assign_comment.jsp | 223 ++++++++++++------ .../ext/contentlet/edit_contentlet_js_inc.jsp | 57 +++-- .../portlet/ext/structure/edit_structure.jsp | 2 +- 3 files changed, 185 insertions(+), 97 deletions(-) diff --git a/dotCMS/html/portlet/ext/contentlet/contentlet_assign_comment.jsp b/dotCMS/html/portlet/ext/contentlet/contentlet_assign_comment.jsp index dd6987060614..9d8cac54b6b8 100644 --- a/dotCMS/html/portlet/ext/contentlet/contentlet_assign_comment.jsp +++ b/dotCMS/html/portlet/ext/contentlet/contentlet_assign_comment.jsp @@ -1,3 +1,5 @@ +<%@page import="com.dotmarketing.portlets.structure.factories.StructureFactory"%> +<%@page import="com.dotmarketing.portlets.structure.model.Structure"%> <%@page import="com.dotmarketing.portlets.workflows.actionlet.PushPublishActionlet"%> <%@page import="com.dotmarketing.portlets.workflows.model.WorkflowActionClass"%> <%@ include file="/html/common/init.jsp" %> @@ -27,6 +29,19 @@ if(action.isAssignable() || action.isCommentable() || UtilMethods.isSet(action.g mustShow = true; } +String conPublishDateVar = request.getParameter("publishDate"); +String conExpireDateVar = request.getParameter("expireDate"); +String structureInode = request.getParameter("structureInode"); +if(conPublishDateVar ==null && structureInode != null){ + Structure s = StructureFactory.getStructureByInode(structureInode); + if(s!=null){ + conPublishDateVar = s.getPublishDateVar(); + conExpireDateVar = s.getExpireDateVar(); + } +} + + + %> + <% if(mustShow){ %> - <%if(hasPushPublishActionlet){ %> -
- <%}else{ %> -
- <%} %> -
- <%= LanguageUtil.get(pageContext, "Perform-Workflow") %>: <%=action.getName() %> -
- <%if(action.isCommentable()){ %> -
- <%= LanguageUtil.get(pageContext, "Comments") %>:
- -
- <%}else{ %> -
- <%= LanguageUtil.get(pageContext, "Comments") %>: <%= LanguageUtil.get(pageContext, "None") %> -
- <%} %> -
- <%= LanguageUtil.get(pageContext, "Assignee") %>: - - <%if(action.isAssignable()){ %> - +
+
"> +
+ <%= LanguageUtil.get(pageContext, "Perform-Workflow") %>: <%=action.getName() %> +
+ <%if(action.isCommentable()){ %> +
+ <%= LanguageUtil.get(pageContext, "Comments") %>:
+ +
<%}else{ %> - <%=role.getName() %> - +
+ <%= LanguageUtil.get(pageContext, "Comments") %>: <%= LanguageUtil.get(pageContext, "None") %> +
<%} %> -
- <%if(hasPushPublishActionlet){ - String hour = (cal.get(GregorianCalendar.HOUR_OF_DAY) < 10) ? "0"+cal.get(GregorianCalendar.HOUR_OF_DAY) : ""+cal.get(GregorianCalendar.HOUR_OF_DAY); - String min = (cal.get(GregorianCalendar.MINUTE) < 10) ? "0"+cal.get(GregorianCalendar.MINUTE) : ""+cal.get(GregorianCalendar.MINUTE); - %> - -
- <%= LanguageUtil.get(pageContext, "Publish") %> :
- - - - -
- -
- <%= LanguageUtil.get(pageContext, "publisher_Expire") %> :
- - - - +
+ <%= LanguageUtil.get(pageContext, "Assignee") %>: + + <%if(action.isAssignable()){ %> + + <%}else{ %> + <%=role.getName() %> + + <%} %> +
+ <%if(hasPushPublishActionlet){ + String hour = (cal.get(GregorianCalendar.HOUR_OF_DAY) < 10) ? "0"+cal.get(GregorianCalendar.HOUR_OF_DAY) : ""+cal.get(GregorianCalendar.HOUR_OF_DAY); + String min = (cal.get(GregorianCalendar.MINUTE) < 10) ? "0"+cal.get(GregorianCalendar.MINUTE) : ""+cal.get(GregorianCalendar.MINUTE); + %> + +
+ <%= LanguageUtil.get(pageContext, "Publish") %> :
+ + + + +
+ +
+ <%= LanguageUtil.get(pageContext, "publisher_Expire") %> :
+ <%= LanguageUtil.get(pageContext, "publisher_Never_Expire") %> + style="width: 110px;"> + + + + +    +
+ <%}%> +
+ + + +
+
- <%}%> -
- - - -
-
+ <% } %> + diff --git a/dotCMS/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp b/dotCMS/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp index 3ae37cc10578..f270c1d12ebb 100644 --- a/dotCMS/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp +++ b/dotCMS/html/portlet/ext/contentlet/edit_contentlet_js_inc.jsp @@ -650,9 +650,15 @@ dojo.require("dojox.layout.ContentPane"); :workingContentletInode; - var r = Math.floor(Math.random() * 1000000000); - var url = "/DotAjaxDirector/com.dotmarketing.portlets.workflows.ajax.WfTaskAjax?cmd=renderAction&actionId=" + wfId + "&inode=" + inode + "&showpush=" + showpush + "&r=" + r; + var url = "/DotAjaxDirector/com.dotmarketing.portlets.workflows.ajax.WfTaskAjax?cmd=renderAction&actionId=" + wfId + + "&inode=" + inode + + "&showpush=" + showpush + + "&publishDate=<%=structure.getPublishDateVar()%>" + + "&expireDate=<%=structure.getExpireDateVar()%>" + + "&structureInode=<%=structure.getInode()%>" + + "&r=" + r; + console.log(url); myCp.attr("href", url); return; } @@ -681,35 +687,42 @@ dojo.require("dojox.layout.ContentPane"); ? dojo.byId("taskCommentsAux").value : ""; + + + + + + + // BEGIN: PUSH PUBLISHING ACTIONLET - var publishDate = (dijit.byId("publishDate")) - ? dojo.date.locale.format(dijit.byId("publishDate").getValue(),{datePattern: "yyyy-MM-dd", selector: "date"}) - : (dojo.byId("publishDate")) - ? dojo.date.locale.format(dojo.byId("publishDate").value,{datePattern: "yyyy-MM-dd", selector: "date"}) + var publishDate = (dijit.byId("wfPublishDateAux")) + ? dojo.date.locale.format(dijit.byId("wfPublishDateAux").getValue(),{datePattern: "yyyy-MM-dd", selector: "date"}) + : (dojo.byId("wfPublishDateAux")) + ? dojo.date.locale.format(dojo.byId("wfPublishDateAux").value,{datePattern: "yyyy-MM-dd", selector: "date"}) : ""; - var publishTime = (dijit.byId("publishTime")) - ? dojo.date.locale.format(dijit.byId("publishTime").getValue(),{timePattern: "H-m", selector: "time"}) - : (dojo.byId("publishTime")) - ? dojo.date.locale.format(dojo.byId("publishTime").value,{timePattern: "H-m", selector: "time"}) + var publishTime = (dijit.byId("wfPublishTimeAux")) + ? dojo.date.locale.format(dijit.byId("wfPublishTimeAux").getValue(),{timePattern: "H-m", selector: "time"}) + : (dojo.byId("wfPublishTimeAux")) + ? dojo.date.locale.format(dojo.byId("wfPublishTimeAux").value,{timePattern: "H-m", selector: "time"}) : ""; - var expireDate = (dijit.byId("expireDate")) - ? dijit.byId("expireDate").getValue()!=null ? dojo.date.locale.format(dijit.byId("expireDate").getValue(),{datePattern: "yyyy-MM-dd", selector: "date"}) : "" - : (dojo.byId("expireDate")) - ? dojo.byId("expireDate").value!=null ? dojo.date.locale.format(dojo.byId("expireDate").value,{datePattern: "yyyy-MM-dd", selector: "date"}) : "" + var expireDate = (dijit.byId("wfExpireDateAux")) + ? dijit.byId("wfExpireDateAux").getValue()!=null ? dojo.date.locale.format(dijit.byId("expireDate").getValue(),{datePattern: "yyyy-MM-dd", selector: "date"}) : "" + : (dojo.byId("wfExpireDateAux")) + ? dojo.byId("wfExpireDateAux").value!=null ? dojo.date.locale.format(dojo.byId("expireDate").value,{datePattern: "yyyy-MM-dd", selector: "date"}) : "" : ""; - var expireTime = (dijit.byId("expireTime")) - ? dijit.byId("expireTime").getValue()!=null ? dojo.date.locale.format(dijit.byId("expireTime").getValue(),{timePattern: "H-m", selector: "time"}) : "" - : (dojo.byId("expireTime")) - ? dojo.byId("expireTime").value!=null ? dojo.date.locale.format(dojo.byId("expireTime").value,{timePattern: "H-m", selector: "time"}) : "" + var expireTime = (dijit.byId("wfExpireTimeAux")) + ? dijit.byId("wfExpireTimeAux").getValue()!=null ? dojo.date.locale.format(dijit.byId("expireTime").getValue(),{timePattern: "H-m", selector: "time"}) : "" + : (dojo.byId("wfExpireTimeAux")) + ? dojo.byId("wfExpireTimeAux").value!=null ? dojo.date.locale.format(dojo.byId("expireTime").value,{timePattern: "H-m", selector: "time"}) : "" : ""; - var neverExpire = (dijit.byId("neverExpire")) - ? dijit.byId("neverExpire").getValue() - : (dojo.byId("neverExpire")) - ? dojo.byId("neverExpire").value + var neverExpire = (dijit.byId("wfNeverExpire")) + ? dijit.byId("wfNeverExpire").getValue() + : (dojo.byId("wfNeverExpire")) + ? dojo.byId("wfNeverExpire").value : ""; // END: PUSH PUBLISHING ACTIONLET diff --git a/dotCMS/html/portlet/ext/structure/edit_structure.jsp b/dotCMS/html/portlet/ext/structure/edit_structure.jsp index 945cdcfe19d0..60f07068758c 100644 --- a/dotCMS/html/portlet/ext/structure/edit_structure.jsp +++ b/dotCMS/html/portlet/ext/structure/edit_structure.jsp @@ -776,7 +776,7 @@ function disableFormFields(){ ArrayList dateFields=new ArrayList(); if(UtilMethods.isSet(structure.getInode())) for(Field f : structure.getFields()) - if(f.getFieldType().equals(Field.FieldType.DATE_TIME.toString())) + if(f.getFieldType().equals(Field.FieldType.DATE_TIME.toString()) && f.isIndexed()) dateFields.add(f); %>