Author: fpunt Date: 2010-04-20 17:51:11 +0200 (Tue, 20 Apr 2010) New Revision: 41986
Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp Log: CMSC-1657 Fixed for the assets Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java 2010-04-20 15:34:24 UTC (rev 41985) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java 2010-04-20 15:51:11 UTC (rev 41986) @@ -121,7 +121,18 @@ SearchUtil.addConstraint(query, channelConstraint); query.setNodeStep(assetStep); } - + + // Search on Workflow status when needed, onlive basicly means not in workflow rel + String workflowstate = searchForm.getWorkflowstate(); + if(!StringUtils.isEmpty(workflowstate)) { + NodeManager workflowNodeManager = cloud.getNodeManager("workflowitem"); + Step workflowStep = query.addRelationStep(workflowNodeManager, "workflowrel", "SOURCE").getNext(); + StepField workflowStatusField = query.createStepField(workflowStep, workflowNodeManager.getField("status")); + FieldValueConstraint workflowConstraint = query.createConstraint(workflowStatusField, FieldCompareConstraint.EQUAL, + workflowstate); + SearchUtil.addConstraint(query, workflowConstraint); + } + // Order the result by: String order = searchForm.getOrder(); Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java 2010-04-20 15:34:24 UTC (rev 41985) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java 2010-04-20 15:51:11 UTC (rev 41986) @@ -149,7 +149,6 @@ query.setNodeStep(contentStep); } - // Search on Workflow status when needed, onlive basicly means not in workflow rel String workflowstate = searchForm.getWorkflowstate(); if(!StringUtils.isEmpty(workflowstate)) { @@ -160,6 +159,7 @@ workflowstate); SearchUtil.addConstraint(query, workflowConstraint); } + // Order the result by: String order = searchForm.getOrder(); Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp =================================================================== --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp 2010-04-20 15:34:24 UTC (rev 41985) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp 2010-04-20 15:51:11 UTC (rev 41986) @@ -241,21 +241,22 @@ <td><fmt:message key="searchform.number" /></td> <td><html:text style="width:145px" property="objectid"/></td> </tr> - <c:if test="${hasWorkflow}"> - <tr height="31px"> - <td><fmt:message key="searchform.workflowstate" /></td> - <td> - <html:select style="width:145px" property="workflowstate" size="1"> - <html:option value="0"> - </html:option> - <html:option value="1"><fmt:message key="asset.status.finished" /></html:option> - <html:option value="2"><fmt:message key="asset.status.approved" /></html:option> - <html:option value="3"><fmt:message key="asset.status.published" /></html:option> - <html:option value="4"><fmt:message key="asset.status.onlive" /></html:option> - </html:select> - </td> - <td colspan="2"> </td> - </tr> - </c:if> + <c:if test="${hasWorkflow}"> + <tr height="31px"> + <td><fmt:message key="searchform.workflowstate" /></td> + <td> + <html:select style="width:145px" property="workflowstate" size="1"> + <html:option value=""><fmt:message key="content.status.all" /></html:option> + <html:option value="draft"><fmt:message key="content.status.draft" /></html:option> + <html:option value="finished"><fmt:message key="content.status.finished" /></html:option> + <html:option value="approved"><fmt:message key="content.status.approved" /></html:option> + <html:option value="published"><fmt:message key="content.status.published" /></html:option> +<%-- <html:option value="onlive"><fmt:message key="content.status.onlive" /></html:option> --%> + </html:select> + </td> + <td colspan="2"> </td> + </tr> + </c:if> <tr> <td></td> <td></td> _______________________________________________ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs