Author: jstroomer
Date: 2010-04-13 10:06:15 +0200 (Tue, 13 Apr 2010)
New Revision: 41859
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
Log:
CMSC-1657 Add filter "workflow status" option to repository advanced search
screen
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java
2010-04-12 16:59:13 UTC (rev 41858)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java
2010-04-13 08:06:15 UTC (rev 41859)
@@ -149,4 +149,14 @@
public String getInsertAsset() {
return insertAsset;
}
-}
+
+
+ public String getWorkflowstate() {
+ return workflowstate;
+ }
+
+
+ public void setWorkflowstate(String workflowstate) {
+ this.workflowstate = workflowstate;
+ }
+}
\ No newline at end of file
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
===================================================================
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
2010-04-12 16:59:13 UTC (rev 41858)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
2010-04-13 08:06:15 UTC (rev 41859)
@@ -200,6 +200,4 @@
public void setWorkflowstate(String workflowstate) {
this.workflowstate = workflowstate;
}
-
-
-}
+}
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2010-04-12 16:59:13 UTC (rev 41858)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2010-04-13 08:06:15 UTC (rev 41859)
@@ -163,7 +163,8 @@
searchform.creationdate=Creation date:
searchform.expiredate=Expire date:
searchform.lastmodifieddate=Last modified date:
-searchform.publishdate=Publish date:
+searchform.publishdate=Publishdate:
+searchform.workflowstate=Workflow state:
searchform.searchfortitle=Search for:
searchform.title=Title:
searchform.keywords=Keyword(s):
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2010-04-12 16:59:13 UTC (rev 41858)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2010-04-13 08:06:15 UTC (rev 41859)
@@ -162,7 +162,8 @@
searchform.creationdate=Creatiedatum:
searchform.expiredate=Verloopdatum:
searchform.lastmodifieddate=Laatste wijziging:
-searchform.publishdate=Publicatie datum:
+searchform.publishdate=Publicatiedatum:
+searchform.workflowstate=Workflow status:
searchform.searchfortitle=Zoek naar:
searchform.title=Titel:
searchform.keywords=Trefwoord(en):
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java
2010-04-12 16:59:13 UTC (rev 41858)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchForm.java
2010-04-13 08:06:15 UTC (rev 41859)
@@ -20,6 +20,7 @@
private String parentchannelpath = "";
private String searchShow = "list";
private String insertAsset = "insertAsset";
+ private String workflowstate = "0";
public String getAssettypes() {
return assettypes;
@@ -148,4 +149,14 @@
public String getInsertAsset() {
return insertAsset;
}
-}
+
+
+ public String getWorkflowstate() {
+ return workflowstate;
+ }
+
+
+ public void setWorkflowstate(String workflowstate) {
+ this.workflowstate = workflowstate;
+ }
+}
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
2010-04-12 16:59:13 UTC (rev 41858)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java
2010-04-13 08:06:15 UTC (rev 41859)
@@ -21,6 +21,7 @@
private String search = "true";
private String parentchannelpath = "";
private String index = "";
+ private String workflowstate = "0";
public String getContenttypes() {
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-12 16:59:13 UTC (rev 41858)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp
2010-04-13 08:06:15 UTC (rev 41859)
@@ -8,8 +8,14 @@
%><%@ page import="com.finalist.cmsc.security.SecurityUtil"
%><mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
+<!-- we check to see if we have workflow, this is done by looking if the
editors for the workflow are on the HD -->
+<c:set var="hasWorkflow" value="false"/>
+<mm:haspage page="/editors/workflow">
+ <c:set var="hasWorkflow" value="true"/>
+</mm:haspage>
+
<html:html xhtml="true">
-
<mm:import externid="action">search</mm:import><%-- either: search, link, of
select --%>
<mm:import externid="mode" id="mode">basic</mm:import>
<mm:import externid="returnurl"/>
@@ -235,6 +241,21 @@
<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>
<tr>
<td></td>
<td></td>
@@ -367,12 +388,6 @@
</select>
</div>
-<!-- we check to see if we have workflow, this is done by looking if the
editors for the workflow are on the HD -->
-<c:set var="hasWorkflow" value="false"/>
-<mm:haspage page="/editors/workflow">
- <c:set var="hasWorkflow" value="true"/>
-</mm:haspage>
-
<%-- Now print if no results --%>
<mm:isempty referid="results">
<div style="padding:10px 0px 0px 11px">
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===================================================================
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-04-12 16:59:13 UTC (rev 41858)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2010-04-13 08:06:15 UTC (rev 41859)
@@ -8,6 +8,13 @@
%><%@ page import="net.sf.mmapps.modules.cloudprovider.CloudProviderFactory"
%><mm:content type="text/html" encoding="UTF-8" expires="0">
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
+
+<!-- we check to see if we have workflow, this is done by looking if the
editors for the workflow are on the HD -->
+<c:set var="hasWorkflow" value="false"/>
+<mm:haspage page="/editors/workflow">
+ <c:set var="hasWorkflow" value="true"/>
+</mm:haspage>
+
<html:html xhtml="true">
<cmscedit:head title="search.title">
<script src="../../mmbase/edit/wizard/javascript/validator.js"
type="text/javascript"></script>
@@ -274,6 +281,21 @@
<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="content.status.finished" /></html:option>
+ <html:option value="2"><fmt:message
key="content.status.approved" /></html:option>
+ <html:option value="3"><fmt:message
key="content.status.published" /></html:option>
+ <html:option value="4"><fmt:message
key="content.status.onlive" /></html:option>
+ </html:select>
+ </td>
+ <td colspan="2"> </td>
+ </tr>
+ </c:if>
<tr>
<td></td>
<td></td>
@@ -388,12 +410,6 @@
<div class="ruler_green"><div><fmt:message key="searchform.results"
/></div></div>
<div class="body">
-<!-- we check to see if we have workflow, this is done by looking if the
editors for the workflow are on the HD -->
-<c:set var="hasWorkflow" value="false"/>
-<mm:haspage page="/editors/workflow">
- <c:set var="hasWorkflow" value="true"/>
-</mm:haspage>
-
<%-- Now print if no results --%>
<mm:isempty referid="results">
<div style="padding:10px 0px 0px 11px">
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
