[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentSearchAction.java SearchForm.java

[kevinshen]

Update of 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory 
james.mmbase.org:/tmp/cvs-serv14628/java/com/finalist/cmsc/repository/forms

Modified Files:
        ContentSearchAction.java SearchForm.java 
Log Message:
CMSC-681 Asset Maintenance code refacted


See also: 
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-681


Index: ContentSearchAction.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentSearchAction.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- ContentSearchAction.java    22 Dec 2008 03:52:36 -0000      1.3
+++ ContentSearchAction.java    26 Dec 2008 11:20:44 -0000      1.4
@@ -56,7 +56,11 @@
       SearchForm searchForm = (SearchForm) form;
 
       String deleteContentRequest = 
request.getParameter("deleteContentRequest");
-
+      String index = searchForm.getIndex();
+      if(StringUtils.isEmpty(index)){
+         index = "no";
+      }
+      request.setAttribute("index", index);
       if (StringUtils.isNotEmpty(deleteContentRequest)) {
          if (deleteContentRequest.startsWith("massDelete:")) {
             massDeleteContent(deleteContentRequest.substring(11));


Index: SearchForm.java
===================================================================
RCS file: 
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchForm.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- SearchForm.java     26 Nov 2007 11:43:40 -0000      1.5
+++ SearchForm.java     26 Dec 2008 11:20:44 -0000      1.6
@@ -20,6 +20,7 @@
    private String mode = "basic";
    private String search = "true";
    private String parentchannelpath = "";
+   private String index = "";
 
 
    public String getContenttypes() {
@@ -171,4 +172,14 @@
       this.keywords = keywords;
    }
 
+
+   public void setIndex(String index) {
+      this.index = index;
+   }
+
+
+   public String getIndex() {
+      return index;
+   }
+
 }
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs