[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentAction.java ImageUploadAction.java ImageUploadForm.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv26564/src/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java ImageUploadAction.java
Removed Files:
ImageUploadForm.java
Log Message:
CMSC-1205 Assets bug container issue
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-1205
Index: ContentAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- ContentAction.java 23 Dec 2008 10:11:53 - 1.13
+++ ContentAction.java 7 Jan 2009 10:08:04 - 1.14
@@ -90,12 +90,14 @@
createdNumbers.put(String.valueOf(createdElement.getNumber()),
createdElement);
}
addToRequest(request, createdNumbers, createdNumbers);
+ //cmsc-1205 don't refresh channel tree when not necessary
+ String type = request.getParameter(type);
//cmsc-144 make reorder icon show up
- if(elementCount==2){
+ if(elementCount==2 type != null){
request.setAttribute(refresh, true);
}
//reset the show mode of assets in the session when enter another
channel
- if(request.getParameter(type)==null){
+ if(type==null){
request.getSession().removeAttribute(show);
request.getSession().removeAttribute(imageOnly);
}
Index: ImageUploadAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ImageUploadAction.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- ImageUploadAction.java 6 Jan 2009 07:59:41 - 1.4
+++ ImageUploadAction.java 7 Jan 2009 10:08:04 - 1.5
@@ -16,6 +16,9 @@
public class ImageUploadAction extends AbstractUploadAction {
+ private static final String ALL = all;
+ private static final String CREATION = creation;
+
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
@@ -24,6 +27,10 @@
String parentchannel = imageUploadForm.getParentchannel();
FormFile file = imageUploadForm.getFile();
+ if (parentchannel.equalsIgnoreCase(ALL)) {
+ parentchannel = (String) request.getSession().getAttribute(CREATION);
+ }
+
int nodeId = 0;
String exist = 0;
String exceed = no;
@@ -43,6 +50,7 @@
} else {
exceed = yes;
}
+nodeId = nodes.get(0);
}
// to archive the upload asset
addRelationsForNodes(nodes, cloud);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv26313/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java
Log Message:
CMSC-681 Asset Maintenance Thumbnail view is not remembered
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: ContentAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- ContentAction.java 26 Sep 2008 07:44:23 - 1.12
+++ ContentAction.java 23 Dec 2008 10:11:53 - 1.13
@@ -94,6 +94,11 @@
if(elementCount==2){
request.setAttribute(refresh, true);
}
+ //reset the show mode of assets in the session when enter another
channel
+ if(request.getParameter(type)==null){
+request.getSession().removeAttribute(show);
+request.getSession().removeAttribute(imageOnly);
+ }
}
return mapping.findForward(SUCCESS);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv23337/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java
Log Message:
CMSC-144(Refresh the left content channel tree when add two contents in one
channel.)
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-144
Index: ContentAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ContentAction.java 27 Jun 2008 01:51:56 - 1.11
+++ ContentAction.java 26 Sep 2008 07:44:23 - 1.12
@@ -90,6 +90,10 @@
createdNumbers.put(String.valueOf(createdElement.getNumber()),
createdElement);
}
addToRequest(request, createdNumbers, createdNumbers);
+ //cmsc-144 make reorder icon show up
+ if(elementCount==2){
+request.setAttribute(refresh, true);
+ }
}
return mapping.findForward(SUCCESS);
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentAction.java ContentMassDeleteAction.java LinkToChannelAction.java MoveContentToChanne
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv5878/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java ContentMassDeleteAction.java
LinkToChannelAction.java MoveContentToChannelAction.java
Log Message:
CMSC-412, mass move, delete of content elements
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-412
Index: ContentAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- ContentAction.java 5 Jun 2008 02:32:19 - 1.10
+++ ContentAction.java 27 Jun 2008 01:51:56 - 1.11
@@ -27,10 +27,15 @@
public class ContentAction extends MMBaseAction {
+ private final static String MOVECONTENTTOCHANNEL = moveContentToChannel;
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
+ String action = request.getParameter(action);
+ if(StringUtils.isNotEmpty(action)
action.equals(MOVECONTENTTOCHANNEL)) {
+ return mapping.findForward(MOVECONTENTTOCHANNEL);
+ }
ListLabelValueBean typesList = new ArrayListLabelValueBean();
ListNodeManager types = ContentElementUtil.getContentTypes(cloud);
Index: ContentMassDeleteAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentMassDeleteAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ContentMassDeleteAction.java23 Jun 2008 10:18:21 - 1.1
+++ ContentMassDeleteAction.java27 Jun 2008 01:51:56 - 1.2
@@ -28,10 +28,16 @@
String action = getParameter(request, action);
String channelnumber = getParameter(request, channelnumber);
String offset = getParameter(request, offset);
+ String orderBy = getParameter(request, orderby);
+ String direction = getParameter(request, direction);
Node channelNode = cloud.getNode(channelnumber);
ListInteger numbers = new ArrayListInteger();
- if (action == null) {
+ if(StringUtils.isEmpty(direction)) {
+ direction = down;
+ }
+
+ if (action == null) {
EnumerationString parameters = request.getParameterNames();
while (parameters.hasMoreElements()) {
String parameter = parameters.nextElement();
@@ -105,14 +111,23 @@
addToRequest(request, trashchannel,
RepositoryUtil.getTrashNode(cloud));
addToRequest(request, action, massmove);
addToRequest(request, offset, offset);
+ addToRequest(request, orderby, orderBy);
+ addToRequest(request, direction, direction);
return mapping.findForward(unlinkcreation);
}
}
+
String url = mapping.findForward(SUCCESS).getPath() +
?parentchannel= + channelnumber;
if(StringUtils.isNotEmpty(offset)) {
url += offset=+offset;
}
+ if(StringUtils.isNotEmpty(orderBy)) {
+url += orderby=+orderBy;
+ }
+ if(StringUtils.isNotEmpty(direction)) {
+url += direction=+direction;
+ }
return new ActionForward(url, true);
}
Index: LinkToChannelAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/LinkToChannelAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- LinkToChannelAction.java10 May 2008 16:31:23 - 1.11
+++ LinkToChannelAction.java27 Jun 2008 01:51:56 - 1.12
@@ -32,7 +32,6 @@
String action = getParameter(request, action);
String channelnumber = getParameter(request, channelnumber);
Node channelNode = cloud.getNode(channelnumber);
-
String objectnumber = getParameter(request, objectnumber);
if (action != null action.equals(unlink)) {
@@ -95,8 +94,7 @@
EnumerationString parameters = request.getParameterNames();
while (parameters.hasMoreElements()) {
String parameter = parameters.nextElement();
-
-if (parameter.startsWith(link_)) {
+if (parameter.startsWith(chk_)) {
String link = request.getParameter(parameter);
Node contentNode =
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv4814/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java
Log Message:
CMSC-280,Contentchannel screen does not give as much sort options as in
searching in the library
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-280
Index: ContentAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- ContentAction.java 4 Jun 2008 05:18:09 - 1.9
+++ ContentAction.java 5 Jun 2008 02:32:19 - 1.10
@@ -26,7 +26,7 @@
import com.finalist.cmsc.struts.MMBaseAction;
public class ContentAction extends MMBaseAction {
- private static boolean flag;
+
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
@@ -51,14 +51,7 @@
orderby = null;
}
if (StringUtils.isEmpty(direction)) {
- if(flag==true){
- direction=down;
- flag=false;
- }else{
- direction=up;
- flag=true;
- }
- //direction = null;
+direction = null;
}
// Set the offset (used for paging).
@@ -80,7 +73,8 @@
Node channel = cloud.getNode(parentchannel);
NodeList elements = RepositoryUtil.getLinkedElements(channel, null,
orderby, direction, false, offset*maxNumber, maxNumber, -1, -1, -1);
int elementCount = RepositoryUtil.countLinkedContent(channel);
-
+ addToRequest(request, direction, direction);
+ addToRequest(request, orderby, orderby);
addToRequest(request, elements, elements);
addToRequest(request, elementCount, Integer.toString(elementCount));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentAction.java SearchAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv29148/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java SearchAction.java
Log Message:
CMSC-280,Contentchannel screen does not give as much sort options as in
searching in the library
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-280
Index: ContentAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- ContentAction.java 10 May 2008 16:31:23 - 1.8
+++ ContentAction.java 4 Jun 2008 05:18:09 - 1.9
@@ -26,7 +26,7 @@
import com.finalist.cmsc.struts.MMBaseAction;
public class ContentAction extends MMBaseAction {
-
+ private static boolean flag;
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
@@ -51,7 +51,14 @@
orderby = null;
}
if (StringUtils.isEmpty(direction)) {
- direction = null;
+ if(flag==true){
+ direction=down;
+ flag=false;
+ }else{
+ direction=up;
+ flag=true;
+ }
+ //direction = null;
}
// Set the offset (used for paging).
@@ -85,7 +92,6 @@
}
addToRequest(request, createdNumbers, createdNumbers);
}
-
return mapping.findForward(SUCCESS);
}
Index: SearchAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchAction.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- SearchAction.java 16 May 2008 11:46:36 - 1.14
+++ SearchAction.java 4 Jun 2008 05:18:09 - 1.15
@@ -124,7 +124,7 @@
order = name;
}
}
-if (StringUtils.isEmpty(order)) {
+if (StringUtils.isNotEmpty(order)) {
queryStringComposer.addParameter(ORDER, searchForm.getOrder());
queryStringComposer.addParameter(DIRECTION, +
searchForm.getDirection());
query.addSortOrder(query.getStepField(nodeManager.getField(order)),
searchForm.getDirection());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms ContentAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv629/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
ContentAction.java
Log Message:
CMSC-770 - Improved the content explorer to only get the nodes from the
database needed to show.
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-770
Index: ContentAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/ContentAction.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- ContentAction.java 26 Nov 2007 11:43:40 - 1.5
+++ ContentAction.java 26 Feb 2008 17:23:19 - 1.6
@@ -54,11 +54,28 @@
direction = null;
}
+ // Set the offset (used for paging).
+ String offsetString = request.getParameter(offset);
+ int offset = 0;
+ if (offsetString != null offsetString.matches(\\d+)) {
+ offset = Integer.parseInt(offsetString);
+ }
+
+ // Set the maximum result size.
+ String resultsPerPage =
PropertiesUtil.getProperty(SearchAction.REPOSITORY_SEARCH_RESULTS_PER_PAGE);
+ int maxNumber = 25;
+ if (resultsPerPage != null resultsPerPage.matches(\\d+)) {
+ maxNumber = Integer.parseInt(resultsPerPage);
+ }
+ addToRequest(request, resultsPerPage, Integer.toString(maxNumber));
+
if (!StringUtil.isEmpty(parentchannel)) {
Node channel = cloud.getNode(parentchannel);
- NodeList elements = RepositoryUtil.getLinkedElements(channel, null,
orderby, direction, false, -1, -1, -1, -1,
- -1);
+ NodeList elements = RepositoryUtil.getLinkedElements(channel, null,
orderby, direction, false, offset*maxNumber, maxNumber, -1, -1, -1);
+ int elementCount = RepositoryUtil.countLinkedContent(channel);
+
addToRequest(request, elements, elements);
+ addToRequest(request, elementCount, Integer.toString(elementCount));
NodeList created = RepositoryUtil.getCreatedElements(channel);
MapString, Node createdNumbers = new HashMapString, Node();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
