Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv24749/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Modified Files:
UrlCreateAction.java UrlCreateForm.java UrlDeleteAction.java
Log Message:
CMSC-1281 Assets: Relate URLs to content element - New search screen
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-1281
Index: UrlCreateAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/UrlCreateAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UrlCreateAction.java 18 Feb 2009 11:11:49 -0000 1.1
+++ UrlCreateAction.java 19 Feb 2009 12:09:01 -0000 1.2
@@ -24,19 +24,20 @@
HttpServletResponse response, Cloud cloud) throws Exception {
UrlCreateForm urlCreateForm = (UrlCreateForm) form;
- String name = urlCreateForm.getName();
+ String title = urlCreateForm.getTitle();
String description = urlCreateForm.getDescription();
String url = urlCreateForm.getUrl();
String parentchannel = urlCreateForm.getParentchannel();
-
+ String strict = urlCreateForm.getStrict();
int nodeId = 0;
+
if (parentchannel.equalsIgnoreCase(ALL) ||
StringUtils.isEmpty(parentchannel)) {
parentchannel = (String) request.getSession().getAttribute(CREATION);
}
NodeManager manager = cloud.getNodeManager("urls");
- Node node = createUrl(manager, name, description, url);
+ Node node = createUrl(manager, title, description, url);
if(node!=null){
nodeId = node.getNumber();
@@ -44,12 +45,12 @@
RelationUtil.createRelation(node,
manager.getCloud().getNode(parentchannel), "creationrel");
- return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?uploadAction=select&channelid=" + parentchannel + "&createdNode=" + nodeId,
true);
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?uploadAction=select&strict=" + strict + "&channelid=" + parentchannel +
"&createdNode=" + nodeId, true);
}
- protected Node createUrl(NodeManager manager, String name, String
description, String url) {
+ protected Node createUrl(NodeManager manager, String title, String
description, String url) {
Node node = manager.createNode();
- node.setValue("title", name);
+ node.setValue("title", title);
node.setValue("description", description);
node.setValue("url", url);
node.commit();
Index: UrlCreateForm.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/UrlCreateForm.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UrlCreateForm.java 18 Feb 2009 11:12:24 -0000 1.1
+++ UrlCreateForm.java 19 Feb 2009 12:09:01 -0000 1.2
@@ -5,16 +5,17 @@
@SuppressWarnings("serial")
public class UrlCreateForm extends ActionForm {
- private String name;
+ private String title;
private String description;
private String url;
private String parentchannel;
+ private String strict;
- public String getName() {
- return name;
+ public String getTitle() {
+ return title;
}
- public void setName(String name) {
- this.name = name;
+ public void setTitle(String name) {
+ this.title = name;
}
public String getDescription() {
return description;
@@ -34,5 +35,11 @@
public void setParentchannel(String parentchannel) {
this.parentchannel = parentchannel;
}
+ public String getStrict() {
+ return strict;
+ }
+ public void setStrict(String strict) {
+ this.strict = strict;
+ }
}
Index: UrlDeleteAction.java
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/UrlDeleteAction.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- UrlDeleteAction.java 18 Feb 2009 06:18:28 -0000 1.1
+++ UrlDeleteAction.java 19 Feb 2009 12:09:01 -0000 1.2
@@ -25,6 +25,7 @@
String channelnumber = getParameter(request, "channelnumber");
Node channelNode = cloud.getNode(channelnumber);
String objectnumber = getParameter(request, "objectnumber");
+ String strict = getParameter(request, "strict");
Node objectNode = cloud.getNode(objectnumber);
@@ -32,6 +33,6 @@
RepositoryUtil.removeCreationRelForAsset(objectNode);
RepositoryUtil.addAssetToChannel(objectNode,
RepositoryUtil.getTrashNode(cloud));
- return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?&uploadedNodes=0&channelid=" + channelnumber, true);
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?&createdNode=0&channelid=" + channelnumber + "&strict=" + strict, true);
}
}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
