[MMBASE SCM] r41567 - CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms
Author: billyxie
Date: 2010-03-23 04:43:57 +0100 (Tue, 23 Mar 2010)
New Revision: 41567
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
Log:
CMSC-1664 - User rank listbox does not show the currently set rank for the user
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
2010-03-23 03:43:37 UTC (rev 41566)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
2010-03-23 03:43:57 UTC (rev 41567)
@@ -67,7 +67,7 @@
Node rankNode = iter.nextNode();
String name = rankNode.getStringValue("name");
String number = rankNode.getStringValue("number");
- if("basic user".equalsIgnoreCase(name)){
+ if("basic user".equalsIgnoreCase(name) && userForm.getId() == -1){
userForm.setRank(number);
}
userForm.addRank(number, name);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41566 - CMSContainer/branches/b1_7/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms
Author: billyxie
Date: 2010-03-23 04:43:37 +0100 (Tue, 23 Mar 2010)
New Revision: 41566
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
Log:
CMSC-1664 - User rank listbox does not show the currently set rank for the user
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
2010-03-22 20:40:29 UTC (rev 41565)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
2010-03-23 03:43:37 UTC (rev 41566)
@@ -67,7 +67,7 @@
Node rankNode = iter.nextNode();
String name = rankNode.getStringValue("name");
String number = rankNode.getStringValue("number");
- if("basic user".equalsIgnoreCase(name)){
+ if("basic user".equalsIgnoreCase(name) && userForm.getId() == -1){
userForm.setRank(number);
}
userForm.addRank(number, name);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41552 - CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms
Author: billyxie
Date: 2010-03-22 10:22:03 +0100 (Mon, 22 Mar 2010)
New Revision: 41552
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
Log:
CMSC-1666 - Several problems in the personal page editors.
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 09:10:03 UTC (rev 41551)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 09:22:03 UTC (rev 41552)
@@ -21,6 +21,7 @@
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
import org.mmbase.storage.search.FieldValueDateConstraint;
+import org.mmbase.storage.search.SortOrder;
import org.mmbase.storage.search.StepField;
import org.mmbase.storage.search.implementation.BasicFieldValueDateConstraint;
import org.mmbase.util.logging.Logger;
@@ -121,6 +122,9 @@
searchForm.setKeywords(resultsPerPage);
String direction = null;
+ if(SortOrder.ORDER_DESCENDING == searchForm.getDirection()){
+ direction = "DOWN";
+ }
NodeQuery query = createLinkedElementsQuery(subsiteNode, order,
direction, offset*maxNumber, maxNumber, -1, -1, -1);
// Add the title constraint:
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41551 - CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms
Author: billyxie
Date: 2010-03-22 10:10:03 +0100 (Mon, 22 Mar 2010)
New Revision: 41551
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
Log:
CMSC-1666 - Several problems in the personal page editors.
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 09:08:59 UTC (rev 41550)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 09:10:03 UTC (rev 41551)
@@ -21,6 +21,7 @@
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
import org.mmbase.storage.search.FieldValueDateConstraint;
+import org.mmbase.storage.search.SortOrder;
import org.mmbase.storage.search.StepField;
import org.mmbase.storage.search.implementation.BasicFieldValueDateConstraint;
import org.mmbase.util.logging.Logger;
@@ -121,6 +122,9 @@
searchForm.setKeywords(resultsPerPage);
String direction = null;
+ if(SortOrder.ORDER_DESCENDING == searchForm.getDirection()){
+ direction = "DOWN";
+ }
NodeQuery query = createLinkedElementsQuery(subsiteNode, order,
direction, offset*maxNumber, maxNumber, -1, -1, -1);
// Add the title constraint:
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41550 - CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms
Author: billyxie
Date: 2010-03-22 10:08:59 +0100 (Mon, 22 Mar 2010)
New Revision: 41550
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
Log:
CMSC-1666 - Several problems in the personal page editors.
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 07:55:02 UTC (rev 41549)
+++
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 09:08:59 UTC (rev 41550)
@@ -28,6 +28,7 @@
import org.mmbase.bridge.util.SearchUtil;
import org.mmbase.storage.search.Constraint;
import org.mmbase.storage.search.FieldValueDateConstraint;
+import org.mmbase.storage.search.SortOrder;
import org.mmbase.storage.search.StepField;
import org.mmbase.storage.search.implementation.BasicFieldValueDateConstraint;
import org.mmbase.util.logging.Logger;
@@ -128,6 +129,9 @@
searchForm.setKeywords(resultsPerPage);
String direction = null;
+ if(SortOrder.ORDER_DESCENDING == searchForm.getDirection()){
+ direction = "DOWN";
+ }
NodeQuery query = createLinkedElementsQuery(subsiteNode, order,
direction, offset*maxNumber, maxNumber, -1, -1, -1);
// Add the title constraint:
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41549 - in CMSContainer/trunk/CMSContainer_Modules/subsite/src: java/com/finalist/cmsc/subsite/forms webapp/editors/subsite
Author: billyxie
Date: 2010-03-22 08:55:02 +0100 (Mon, 22 Mar 2010)
New Revision: 41549
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
Log:
CMSC-1666 - Several problems in the personal page editors.
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
===
---
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-22 07:48:27 UTC (rev 41548)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-22 07:55:02 UTC (rev 41549)
@@ -51,11 +51,11 @@
SubSiteUtil.createPersonalPageContentChannel(newPage);
addToRequest(request, "showsubsite", ewnodelastedited);
-ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from);
+ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from +
"&subsite=" + parentpage);
return ret;
}
request.getSession().removeAttribute("parentpage");
- ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from);
+ ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from +
"&subsite=" + parentpage);
return ret;
}
}
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 07:48:27 UTC (rev 41548)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 07:55:02 UTC (rev 41549)
@@ -49,12 +49,8 @@
// Initialize
SearchForm searchForm = (SearchForm) form;
- String subsite = (String) request.getSession().getAttribute("subsite");
- request.getSession().removeAttribute("subsite");
+ String subsite = request.getParameter("subsite");
String from = request.getParameter("from");
- if (StringUtils.isBlank(subsite) || !cloud.hasNode(subsite)) {
- subsite = request.getParameter("subsite");
- }
/* Purpose of this file
* - retrieve list of subsites
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
===
---
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-22 07:48:27 UTC (rev 41548)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-22 07:55:02 UTC (rev 41549)
@@ -36,6 +36,7 @@
if (from != null) {
request.setAttribute("from", from);
}
+ String subsite = getParameter(request, "subsite");
if (isRemoveAction(request)) {
String objectnumber = getParameter(request, "number", true);
Node subsiteNode = cloud.getNode(objectnumber);
@@ -47,15 +48,15 @@
if (isEditor) {
NavigationUtil.deleteItem(subsiteNode);
}
- return mapping.findForward(SUCCESS);
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from + "&subsite=" + subsite);
}
if (isCancelAction(request)) {
- return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from);
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from + "&subsite=" + subsite);
}
// neither remove or cancel, show confirmation page
- return new ActionForward(mapping.findForward("delete").getPath() +
"?from=" + from)
[MMBASE SCM] r41548 - in CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src: java/com/finalist/cmsc/subsite/forms webapp/editors/subsite
Author: billyxie
Date: 2010-03-22 08:48:27 +0100 (Mon, 22 Mar 2010)
New Revision: 41548
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
Log:
CMSC-1666 - Several problems in the personal page editors.
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-22 07:36:10 UTC (rev 41547)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-22 07:48:27 UTC (rev 41548)
@@ -51,11 +51,11 @@
SubSiteUtil.createPersonalPageContentChannel(newPage);
addToRequest(request, "showsubsite", ewnodelastedited);
-ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from);
+ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from +
"&subsite=" + parentpage);
return ret;
}
request.getSession().removeAttribute("parentpage");
- ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from);
+ ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from +
"&subsite=" + parentpage);
return ret;
}
}
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 07:36:10 UTC (rev 41547)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 07:48:27 UTC (rev 41548)
@@ -49,12 +49,8 @@
// Initialize
SearchForm searchForm = (SearchForm) form;
- String subsite = (String) request.getSession().getAttribute("subsite");
- request.getSession().removeAttribute("subsite");
+ String subsite = request.getParameter("subsite");
String from = request.getParameter("from");
- if (StringUtils.isBlank(subsite) || !cloud.hasNode(subsite)) {
- subsite = request.getParameter("subsite");
- }
/* Purpose of this file
* - retrieve list of subsites
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-22 07:36:10 UTC (rev 41547)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-22 07:48:27 UTC (rev 41548)
@@ -36,6 +36,7 @@
if (from != null) {
request.setAttribute("from", from);
}
+ String subsite = getParameter(request, "subsite");
if (isRemoveAction(request)) {
String objectnumber = getParameter(request, "number", true);
Node subsiteNode = cloud.getNode(objectnumber);
@@ -47,15 +48,15 @@
if (isEditor) {
NavigationUtil.deleteItem(subsiteNode);
}
- return mapping.findForward(SUCCESS);
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from + "&subsite=" + subsite);
}
if (isCancelAction(request)) {
- return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from);
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from + "&subsite=" + subsite);
}
// neither remove or cancel, show confirmation page
- return new ActionForward(mapping.findForward("delete&
[MMBASE SCM] r41547 - in CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src: java/com/finalist/cmsc/subsite/forms webapp/editors/subsite
Author: billyxie
Date: 2010-03-22 08:36:10 +0100 (Mon, 22 Mar 2010)
New Revision: 41547
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
Log:
CMSC-1666 - Several problems in the personal page editors.
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 18:07:00 UTC (rev 41546)
+++
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-22 07:36:10 UTC (rev 41547)
@@ -51,11 +51,11 @@
SubSiteUtil.createPersonalPageContentChannel(newPage);
addToRequest(request, "showsubsite", ewnodelastedited);
-ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from);
+ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from +
"&subsite=" + parentpage);
return ret;
}
request.getSession().removeAttribute("parentpage");
- ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from);
+ ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from +
"&subsite=" + parentpage);
return ret;
}
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 18:07:00 UTC (rev 41546)
+++
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-22 07:36:10 UTC (rev 41547)
@@ -15,8 +15,6 @@
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
-
-import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-19 18:07:00 UTC (rev 41546)
+++
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-22 07:36:10 UTC (rev 41547)
@@ -36,6 +36,7 @@
if (from != null) {
request.setAttribute("from", from);
}
+ String subsite = getParameter(request, "subsite");
if (isRemoveAction(request)) {
String objectnumber = getParameter(request, "number", true);
Node subsiteNode = cloud.getNode(objectnumber);
@@ -47,15 +48,15 @@
if (isEditor) {
NavigationUtil.deleteItem(subsiteNode);
}
- return mapping.findForward(SUCCESS);
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from + "&subsite=" + subsite);
}
if (isCancelAction(request)) {
- return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from);
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?from=" + from + "&subsite=" + subsite);
}
// neither remove or cancel, show confirmation page
- return new ActionForward(mapping.findForward("delete").getPath() +
"?from=" + from);
+ return new ActionForward(mapping.findForward("delete").getPath() +
"?from=" + from + "&subsite=" + subsite);
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subs
[MMBASE SCM] r41531 - in CMSContainer/trunk/CMSContainer_Modules/subsite/src: java/com/finalist/cmsc/subsite/forms java/com/finalist/cmsc/subsite/tree webapp/WEB-INF webapp/editors/subsite
Author: billyxie
Date: 2010-03-19 04:39:47 +0100 (Fri, 19 Mar 2010)
New Revision: 41531
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/SubSiteTreeItemRenderer.java
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages_newbuttons.jsp
CMSContainer/trunk/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
Log:
CMSC-1577 - Error when exiting personalpage editwizards
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
===
---
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 03:39:05 UTC (rev 41530)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 03:39:47 UTC (rev 41531)
@@ -29,12 +29,13 @@
String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
+ String from = getParameter(request, "from");
if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentpage", parentpage);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
- + "&contenttype=personalpage" + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ + "&contenttype=personalpage" + "&returnurl=" +
mapping.findForward("returnurl").getPath() + "?from=" + from);
ret.setRedirect(true);
return ret;
}
@@ -50,11 +51,11 @@
SubSiteUtil.createPersonalPageContentChannel(newPage);
addToRequest(request, "showsubsite", ewnodelastedited);
-ActionForward ret = mapping.findForward(SUCCESS);
+ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from);
return ret;
}
request.getSession().removeAttribute("parentpage");
- ActionForward ret = mapping.findForward(CANCEL);
+ ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from);
return ret;
}
}
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 03:39:05 UTC (rev 41530)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 03:39:47 UTC (rev 41531)
@@ -51,6 +51,10 @@
String subsite = (String) request.getSession().getAttribute("subsite");
request.getSession().removeAttribute("subsite");
+ String from = request.getParameter("from");
+ if (StringUtils.isBlank(subsite) || !cloud.hasNode(subsite)) {
+ subsite = request.getParameter("subsite");
+ }
/* Purpose of this file
* - retrieve list of subsites
@@ -79,6 +83,9 @@
if (subsiteNode != null){
request.setAttribute("subsite",
String.valueOf(subsiteNode.getNumber()));
}
+ if (from != null) {
+ request.setAttribute("from", from);
+ }
if (subsiteNode == null){ //If there are no subsites at all, return
empty list
searchForm.setResultCount(0);
Modified:
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
===
---
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-19 03:39:05 UTC (rev 41530)
+++
CMSContainer/trunk/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.ja
[MMBASE SCM] r41530 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules
Author: billyxie Date: 2010-03-19 04:39:05 +0100 (Fri, 19 Mar 2010) New Revision: 41530 Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp Log: CMSC-1577 - Error when exiting personalpage editwizards Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-03-19 03:38:53 UTC (rev 41529) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-03-19 03:39:05 UTC (rev 41530) @@ -75,7 +75,7 @@ -" target="rightpane"> +" target="rightpane"> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41529 - in CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src: java/com/finalist/cmsc/subsite/forms java/com/finalist/cmsc/subsite/tree webapp/WEB-INF webapp/editors/subsite
Author: billyxie
Date: 2010-03-19 04:38:53 +0100 (Fri, 19 Mar 2010)
New Revision: 41529
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/SubSiteTreeItemRenderer.java
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages_newbuttons.jsp
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
Log:
CMSC-1577 - Error when exiting personalpage editwizards
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 03:38:53 UTC (rev 41529)
@@ -29,12 +29,13 @@
String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
+ String from = getParameter(request, "from");
if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentpage", parentpage);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
- + "&contenttype=personalpage" + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ + "&contenttype=personalpage" + "&returnurl=" +
mapping.findForward("returnurl").getPath() + "?from=" + from);
ret.setRedirect(true);
return ret;
}
@@ -50,11 +51,11 @@
SubSiteUtil.createPersonalPageContentChannel(newPage);
addToRequest(request, "showsubsite", ewnodelastedited);
-ActionForward ret = mapping.findForward(SUCCESS);
+ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from);
return ret;
}
request.getSession().removeAttribute("parentpage");
- ActionForward ret = mapping.findForward(CANCEL);
+ ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from);
return ret;
}
}
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 03:38:30 UTC (rev 41528)
+++
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 03:38:53 UTC (rev 41529)
@@ -51,6 +51,10 @@
String subsite = (String) request.getSession().getAttribute("subsite");
request.getSession().removeAttribute("subsite");
+ String from = request.getParameter("from");
+ if (StringUtils.isBlank(subsite) || !cloud.hasNode(subsite)) {
+ subsite = request.getParameter("subsite");
+ }
/* Purpose of this file
* - retrieve list of subsites
@@ -79,6 +83,9 @@
if (subsiteNode != null){
request.setAttribute("subsite",
String.valueOf(subsiteNode.getNumber()));
}
+ if (from != null) {
+ request.setAttribute("from", from);
+ }
if (subsiteNode == null){ //If there are no subsites at all, return
empty list
searchForm.setResultCount(0);
Modified:
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
===
---
CMSContainer/branches/b1_7/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2
[MMBASE SCM] r41528 - in CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src: java/com/finalist/cmsc/subsite/forms java/com/finalist/cmsc/subsite/tree webapp/WEB-INF webapp/editors/subsite
Author: billyxie
Date: 2010-03-19 04:38:30 +0100 (Fri, 19 Mar 2010)
New Revision: 41528
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteEdit.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/tree/SubSiteTreeItemRenderer.java
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/WEB-INF/struts-subsite.xml
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages.jsp
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/personalpages_newbuttons.jsp
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/subsitedelete.jsp
Log:
CMSC-1577 - Error when exiting personalpage editwizards
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 03:38:15 UTC (rev 41527)
+++
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/PersonalPageCreate.java
2010-03-19 03:38:30 UTC (rev 41528)
@@ -29,12 +29,13 @@
String parentpage = getParameter(request, "parentpage", true);
String action = getParameter(request, "action");
+ String from = getParameter(request, "from");
if (StringUtils.isBlank(action)) {
request.getSession().setAttribute("parentpage", parentpage);
ActionForward ret = new
ActionForward(mapping.findForward("openwizard").getPath() + "?action=create"
- + "&contenttype=personalpage" + "&returnurl=" +
mapping.findForward("returnurl").getPath());
+ + "&contenttype=personalpage" + "&returnurl=" +
mapping.findForward("returnurl").getPath() + "?from=" + from);
ret.setRedirect(true);
return ret;
}
@@ -50,11 +51,11 @@
SubSiteUtil.createPersonalPageContentChannel(newPage);
addToRequest(request, "showsubsite", ewnodelastedited);
-ActionForward ret = mapping.findForward(SUCCESS);
+ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?from=" + from);
return ret;
}
request.getSession().removeAttribute("parentpage");
- ActionForward ret = mapping.findForward(CANCEL);
+ ActionForward ret = new
ActionForward(mapping.findForward(CANCEL).getPath() + "?from=" + from);
return ret;
}
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 03:38:15 UTC (rev 41527)
+++
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteAction.java
2010-03-19 03:38:30 UTC (rev 41528)
@@ -59,6 +59,7 @@
SearchForm searchForm = (SearchForm) form;
String subsite = request.getParameter("subsite");
+ String from = request.getParameter("from");
/* Purpose of this file
* - retrieve list of subsites
@@ -85,8 +86,11 @@
}
if (subsiteNode != null){
- request.setAttribute("subsite",
String.valueOf(subsiteNode.getNumber()));
+ request.setAttribute("subsite",
String.valueOf(subsiteNode.getNumber()));
}
+ if (from != null) {
+ request.setAttribute("from", from);
+ }
if (subsiteNode == null){ //If there are no subsites at all, return
empty list
searchForm.setResultCount(0);
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/java/com/finalist/cmsc/subsite/forms/SubSiteDelete.java
2010-03-19 03:38:15 UTC (rev 41527)
+++
CMSContainer/branches/b1_5/C
[MMBASE SCM] r41527 - CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules
Author: billyxie Date: 2010-03-19 04:38:15 +0100 (Fri, 19 Mar 2010) New Revision: 41527 Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp Log: CMSC-1577 - Error when exiting personalpage editwizards Modified: CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp === --- CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-03-18 22:26:02 UTC (rev 41526) +++ CMSContainer/branches/b1_7/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-03-19 03:38:15 UTC (rev 41527) @@ -63,7 +63,7 @@ -" target="rightpane"> +" target="rightpane"> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r41488 - CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules
Author: billyxie Date: 2010-03-18 08:55:03 +0100 (Thu, 18 Mar 2010) New Revision: 41488 Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp Log: CMSC-1577 - Error when exiting personalpage editwizards Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp === --- CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-03-17 22:35:27 UTC (rev 41487) +++ CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-03-18 07:55:03 UTC (rev 41488) @@ -63,7 +63,7 @@ -" target="rightpane"> +" target="rightpane"> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40749 - CMSContainer/trunk/CMSContainer_Modules/community
Author: billyxie Date: 2010-01-29 04:47:34 +0100 (Fri, 29 Jan 2010) New Revision: 40749 Modified: CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt Log: CMSC-1624 - SSO - create tag for register page Modified: CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt === --- CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt 2010-01-29 03:45:03 UTC (rev 40748) +++ CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt 2010-01-29 03:47:34 UTC (rev 40749) @@ -14,11 +14,18 @@ - https://replace.with.cashost/single-sign-on/login"; override="false"/> + https://replace.with.cashost/single-sign-on/login_en"; override="false"/> + https://replace.with.cashost/single-sign-on/login_en"; override="false"/> + https://replace.with.cashost/single-sign-on/login_nl"; override="false"/> https://replace.with.cmschost"; override="false"/> https://replace.with.cashost/single-sign-on"; override="false"/> - https://replace.with.cashost/single-sign-on/logout"; override="false"/> + https://replace.with.cashost/single-sign-on/logout_en"; override="false"/> + https://replace.with.cashost/single-sign-on/logout_en"; override="false"/> + https://replace.with.cashost/single-sign-on/logout_nl"; override="false"/> + https://replace.with.cashost/single-sign-on/register_en"; override="false"/> + https://replace.with.cashost/single-sign-on/register_en"; override="false"/> + https://replace.with.cashost/single-sign-on/register_nl"; override="false"/> 2. Change web.xml. ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40748 - in CMSContainer/trunk/CMSContainer_Modules/community/src: java/com/finalist/cmsc/community/taglib java/com/finalist/cmsc/services/community/person tld
Author: billyxie
Date: 2010-01-29 04:45:03 +0100 (Fri, 29 Jan 2010)
New Revision: 40748
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/GenderTag.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/InfixTag.java
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonLDAPService.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonService.java
CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
Log:
CMSC-1629 - SSO - create tag gender and infix
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/GenderTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/GenderTag.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/GenderTag.java
2010-01-29 03:45:03 UTC (rev 40748)
@@ -0,0 +1,59 @@
+package com.finalist.cmsc.community.taglib;
+
+import java.io.IOException;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+
+import org.acegisecurity.context.SecurityContextHolder;
+import org.springframework.beans.factory.annotation.Autowire;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.finalist.cmsc.services.community.person.PersonLDAPService;
+import com.finalist.cmsc.services.community.person.PersonService;
+
+public class GenderTag extends SimpleTagSupport {
+
+ private String var;
+
+ public void setVar(String var) {
+ this.var = var;
+ }
+
+ @Override
+ public void doTag() throws JspException, IOException {
+ PageContext pctx = (PageContext) getJspContext();
+ WebApplicationContext ctx =
WebApplicationContextUtils.getRequiredWebApplicationContext(pctx.getServletContext());
+ ctx.getAutowireCapableBeanFactory().autowireBeanProperties(this,
Autowire.BY_NAME.value(), false);
+ HttpServletRequest req = (HttpServletRequest) pctx.getRequest();
+
+ PersonService ps = getPersonLDAPService();
+ org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
+ if(authentication != null) {
+ String value = ps.getGenderByUserId(authentication.getName());
+ if (var != null) {
+if (value != null) {
+ req.setAttribute(var, value);
+} else {
+ req.removeAttribute(var);
+}
+ } else {
+pctx.getOut().print(value);
+ }
+ }
+ }
+
+ private PersonService personLDAPService;
+
+ public PersonService getPersonLDAPService() {
+ return personLDAPService;
+ }
+
+ public void setPersonLDAPService(PersonService personLDAPService) {
+ this.personLDAPService = personLDAPService;
+ }
+
+}
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/InfixTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/InfixTag.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/InfixTag.java
2010-01-29 03:45:03 UTC (rev 40748)
@@ -0,0 +1,11 @@
+package com.finalist.cmsc.community.taglib;
+
+import com.finalist.cmsc.services.community.person.Person;
+
+public class InfixTag extends AbstractCommunityTag {
+
+ @Override
+ protected String getValue(Person person) {
+ return person.getInfix();
+ }
+}
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
2010-01-28 15:21:22 UTC (rev 40747)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/person/PersonHibernateService.java
2010-01-29 03:45:03 UTC (rev 40748)
@@ -578,4 +578,9 @@
return query;
}
+ public String getGenderByUserId(String userId) {
+ // TODO Auto-generated method stub
+ return null;
+ }
+
}
Modified:
CMSContainer/trunk/CMSContainer_Modules/community
[MMBASE SCM] r40741 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules
Author: billyxie
Date: 2010-01-27 11:41:42 +0100 (Wed, 27 Jan 2010)
New Revision: 40741
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
Log:
CMSC-1614 - Groups on syncronise on user logg in
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
2010-01-27 09:24:26 UTC (rev 40740)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
2010-01-27 10:41:42 UTC (rev 40741)
@@ -1,8 +1,9 @@
<%...@page language="java" contentType="text/html;charset=UTF-8"%>
+<%...@page import="com.finalist.cmsc.portalImpl.SecureUtil" %>
<%...@include file="../globals.jsp"%>
<%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %>
-
+ <%= SecureUtil.getEnvironment("useSSO")%>
http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";>
@@ -49,9 +50,8 @@
-
-
-
+
+
@@ -60,8 +60,16 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -69,14 +77,6 @@
-
-
-
-
-
-
-
-
" target="rightpane">
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40739 - CMSContainer/branches/b1_7/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders
Author: billyxie
Date: 2010-01-27 08:47:08 +0100 (Wed, 27 Jan 2010)
New Revision: 40739
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
Log:
CMSC-1620 - When assets are created inline, the lastmodifier and lastmodifier
date are not set
Modified:
CMSContainer/branches/b1_7/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
===
---
CMSContainer/branches/b1_7/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
2010-01-27 07:46:19 UTC (rev 40738)
+++
CMSContainer/branches/b1_7/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
2010-01-27 07:47:08 UTC (rev 40739)
@@ -1,22 +1,36 @@
package com.finalist.cmsc.richtext.builders;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
import org.apache.commons.lang.StringUtils;
import org.mmbase.applications.wordfilter.WordHtmlCleaner;
import org.mmbase.bridge.Field;
import org.mmbase.bridge.NodeManager;
+import org.mmbase.bridge.util.CloudUtil;
import org.mmbase.core.CoreField;
import org.mmbase.module.core.MMObjectBuilder;
import org.mmbase.module.core.MMObjectNode;
-import org.mmbase.storage.search.*;
+import org.mmbase.storage.search.FieldCompareConstraint;
+import org.mmbase.storage.search.SearchQueryException;
+import org.mmbase.storage.search.StepField;
import org.mmbase.storage.search.implementation.BasicFieldValueConstraint;
import org.mmbase.storage.search.implementation.NodeSearchQuery;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import com.finalist.cmsc.richtext.RichText;
@@ -417,7 +431,7 @@
else {
if (link.hasAttribute(RichText.HREF_ATTR) &&
!(link.getAttribute(RichText.HREF_ATTR).startsWith("#")) ) {
String href = link.getAttribute(RichText.HREF_ATTR);
- String name = link.getAttribute("name");
+ String name = link.getFirstChild().getNodeValue();
String owner = mmObj.getStringValue("owner");
MMObjectNode urlNode = createUrl(owner, href, name);
@@ -809,7 +823,14 @@
urlNode.setValue("title", href.trim());
}
urlNode.setValue("url", href.trim());
+ setLastModifier(urlNode);
urlNode.insert(owner);
return urlNode;
}
+
+ private void setLastModifier(MMObjectNode node) {
+ String username =
CloudUtil.getCloudFromThread().getUser().getIdentifier();
+ node.setValue("lastmodifier", username);
+ node.setValue("lastmodifieddate", System.currentTimeMillis()/1000);
+ }
}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40738 - CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders
Author: billyxie
Date: 2010-01-27 08:46:19 +0100 (Wed, 27 Jan 2010)
New Revision: 40738
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
Log:
CMSC-1620 - When assets are created inline, the lastmodifier and lastmodifier
date are not set
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
2010-01-27 07:04:49 UTC (rev 40737)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
2010-01-27 07:46:19 UTC (rev 40738)
@@ -1,22 +1,36 @@
package com.finalist.cmsc.richtext.builders;
-import java.io.*;
+import java.io.BufferedInputStream;
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
import java.net.URL;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Enumeration;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+import java.util.StringTokenizer;
import org.apache.commons.lang.StringUtils;
import org.mmbase.applications.wordfilter.WordHtmlCleaner;
import org.mmbase.bridge.Field;
import org.mmbase.bridge.NodeManager;
+import org.mmbase.bridge.util.CloudUtil;
import org.mmbase.core.CoreField;
import org.mmbase.module.core.MMObjectBuilder;
import org.mmbase.module.core.MMObjectNode;
-import org.mmbase.storage.search.*;
+import org.mmbase.storage.search.FieldCompareConstraint;
+import org.mmbase.storage.search.SearchQueryException;
+import org.mmbase.storage.search.StepField;
import org.mmbase.storage.search.implementation.BasicFieldValueConstraint;
import org.mmbase.storage.search.implementation.NodeSearchQuery;
import org.mmbase.util.logging.Logger;
import org.mmbase.util.logging.Logging;
-import org.w3c.dom.*;
+import org.w3c.dom.Document;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+import org.w3c.dom.NodeList;
import com.finalist.cmsc.richtext.RichText;
@@ -417,7 +431,7 @@
else {
if (link.hasAttribute(RichText.HREF_ATTR) &&
!(link.getAttribute(RichText.HREF_ATTR).startsWith("#")) ) {
String href = link.getAttribute(RichText.HREF_ATTR);
- String name = link.getAttribute("name");
+ String name = link.getFirstChild().getNodeValue();
String owner = mmObj.getStringValue("owner");
MMObjectNode urlNode = createUrl(owner, href, name);
@@ -809,7 +823,14 @@
urlNode.setValue("title", href.trim());
}
urlNode.setValue("url", href.trim());
+ setLastModifier(urlNode);
urlNode.insert(owner);
return urlNode;
}
+
+ private void setLastModifier(MMObjectNode node) {
+ String username =
CloudUtil.getCloudFromThread().getUser().getIdentifier();
+ node.setValue("lastmodifier", username);
+ node.setValue("lastmodifieddate", System.currentTimeMillis()/1000);
+ }
}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40734 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select
Author: billyxie Date: 2010-01-27 04:59:45 +0100 (Wed, 27 Jan 2010) New Revision: 40734 Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select/selectorpopup.jsp Log: CMSC-1628 - SSO - page selector in the portlet editor is breaking Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select/selectorpopup.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select/selectorpopup.jsp 2010-01-27 01:00:27 UTC (rev 40733) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/select/selectorpopup.jsp 2010-01-27 03:59:45 UTC (rev 40734) @@ -15,6 +15,7 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40714 - in CMSContainer/trunk/CMSContainer_Modules/community/src: java/com/finalist/cmsc/community/taglib tld
Author: billyxie
Date: 2010-01-25 11:41:25 +0100 (Mon, 25 Jan 2010)
New Revision: 40714
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/RegisterTag.java
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
Log:
CMSC-1624 - SSO - create tag for register page
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/RegisterTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/RegisterTag.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/RegisterTag.java
2010-01-25 10:41:25 UTC (rev 40714)
@@ -0,0 +1,44 @@
+package com.finalist.cmsc.community.taglib;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.PageContext;
+
+public class RegisterTag extends AbstractSSOTag {
+
+ private static final String CAS_REGISTOR_LOCALE = "cas_registor_locale";
+// private String referurl;
+ private String locale;
+
+// public void setReferurl(String referurl) {
+// this.referurl = referurl;
+// }
+
+ public void setLocale(String locale) {
+ this.locale = locale;
+ }
+
+ @Override
+ protected String getValue() {
+ PageContext ctx = (PageContext) getJspContext();
+ HttpServletRequest req = (HttpServletRequest) ctx.getRequest();
+
+ String link = "";
+// StringBuffer backUrl = new StringBuffer();
+// if (referurl != null) {
+// backUrl = backUrl.append(ctx.getAttribute(referurl));
+// }
+// else {
+// backUrl.append(HttpUtil.getWebappUri(req));
+// backUrl.append(getPath());
+// }
+ String defaultRegisterUrl = "casServerRegisterUrl";
+ if (locale != null) {
+ defaultRegisterUrl += "_" + locale;
+ }
+// link = getParameter(defaultRegisterUrl) + "?service=" + backUrl;
+ link = getParameter(defaultRegisterUrl);
+ req.getSession().setAttribute(CAS_REGISTOR_LOCALE, locale);
+ return link;
+ }
+
+}
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
===
--- CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
2010-01-25 10:40:21 UTC (rev 40713)
+++ CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
2010-01-25 10:41:25 UTC (rev 40714)
@@ -130,6 +130,24 @@
+ register
+ com.finalist.cmsc.community.taglib.RegisterTag
+ scriptless
+ Link to resister page
+
+ var
+ JSP variable name to value of the path of register
page.
+ false
+ false
+
+
+ locale
+ JSP variable name to value of locale.
+ false
+ false
+
+
+
remoteUser
com.finalist.cmsc.community.taglib.RemoteUserTag
scriptless
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40713 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF
Author: billyxie Date: 2010-01-25 11:40:21 +0100 (Mon, 25 Jan 2010) New Revision: 40713 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml Log: CMSC-1624 - SSO - create tag for register page Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-25 10:29:22 UTC (rev 40712) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-community/src/webapp/META-INF/context.xml 2010-01-25 10:40:21 UTC (rev 40713) @@ -140,4 +140,7 @@ https://replace.with.cashost/single-sign-on/logout_en"; override="false"/> https://replace.with.cashost/single-sign-on/logout_en"; override="false"/> https://replace.with.cashost/single-sign-on/logout_nl"; override="false"/> + https://replace.with.cashost/single-sign-on/register_en"; override="false"/> + https://replace.with.cashost/single-sign-on/register_en"; override="false"/> + https://replace.with.cashost/single-sign-on/register_nl"; override="false"/> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40710 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select
Author: billyxie Date: 2010-01-25 09:07:19 +0100 (Mon, 25 Jan 2010) New Revision: 40710 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selectorpopup.jsp Log: CMSC-1625 - SSO - channel selector in the portlet editor is breaking Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selectorpopup.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selectorpopup.jsp 2010-01-25 07:12:21 UTC (rev 40709) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selectorpopup.jsp 2010-01-25 08:07:19 UTC (rev 40710) @@ -8,6 +8,7 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40609 - in CMSContainer/trunk/CMSContainer/cmsc/edit-webapp: resources src/webapp/editors/css src/webapp/editors/gfx/icons src/webapp/editors/modules
Author: billyxie
Date: 2010-01-19 10:45:28 +0100 (Tue, 19 Jan 2010)
New Revision: 40609
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/icons/group.png
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_fr.properties
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
Log:
CMSC-1614 - Groups on syncronise on user logg in
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
===
--- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
2010-01-19 09:45:02 UTC (rev 40608)
+++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc.properties
2010-01-19 09:45:28 UTC (rev 40609)
@@ -127,6 +127,7 @@
modules.messageoftheday=Message of the Day
modules.newsletter=Newsletter Management
modules.community=Community
+modules.groups=Groups
modules.subsite=Sub Sites
modules.tagcloud=Tag Cloud
modules.community.reference=Community Preferences
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_fr.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_fr.properties
2010-01-19 09:45:02 UTC (rev 40608)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_fr.properties
2010-01-19 09:45:28 UTC (rev 40609)
@@ -111,6 +111,7 @@
modules.messageoftheday=Message du Jour
modules.newsletter=Gestion de la newsletter
modules.community=Communauté
+modules.groups=Groups
modules.subsite=Sub Sites
modules.tagcloud=Tag Cloud
modules.community.reference=Préférences globales
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
2010-01-19 09:45:02 UTC (rev 40608)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_nl.properties
2010-01-19 09:45:28 UTC (rev 40609)
@@ -127,6 +127,7 @@
modules.messageoftheday=Bericht van de dag
modules.newsletter=Nieuwsbriefbeheer
modules.community=Community
+modules.groups=Groups
modules.subsite=Subsites
modules.tagcloud=Tagcloud
modules.community.reference=Community Voorkeuren
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
2010-01-19 09:45:02 UTC (rev 40608)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/resources/cmsc_zh.properties
2010-01-19 09:45:28 UTC (rev 40609)
@@ -120,6 +120,7 @@
modules.messageoftheday=当日信息
modules.newsletter=Newsletter 管理
modules.community=Community 管理
+modules.groups=Groups 管理
modules.subsite=子站点
modules.community.reference=Community 参数
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
2010-01-19 09:45:02 UTC (rev 40608)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
2010-01-19 09:45:28 UTC (rev 40609)
@@ -314,6 +314,7 @@
ul.shortcuts li.glossary { background-image:
url('../gfx/icons/glossary.png');}
ul.shortcuts li.newsletter { background-image:
url('../gfx/icons/mail.png');}
ul.shortcuts li.community { background-image:
url('../gfx/icons/rights.png');}
+ul.shortcuts li.groups { background-image:
url('../gfx/icons/group.png');}
div.side_block div.body
{
@@ -832,6 +833,11 @@
width: 100%;
}
+div.editor div.body div.syn
+{
+ margin-bottom: 10px;
+}
+
div.editor th a
{
display: block;
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/icons/group.png
===
(Binary files differ)
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/icons/group.png
___
Name: svn:mime-type
+ application/octet-stream
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp
===
---
CMSContainer/trunk/CMSConta
[MMBASE SCM] r40608 - in CMSContainer/trunk/CMSContainer_Modules/community: . config config/applications config/applications/community resources src/java/com/finalist/cmsc/community src/java/com/final
Author: billyxie
Date: 2010-01-19 10:45:02 +0100 (Tue, 19 Jan 2010)
New Revision: 40608
Added:
CMSContainer/trunk/CMSContainer_Modules/community/config/
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community.xml
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community/
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community/cronjobs.xml
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/forms/SyncronizeGroupsFromIDstoreAction.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/groups/
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/groups/SyncronizeGroupsCronJob.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/GroupsService.java
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/editors/community/syncronizeGroups.jsp
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community.properties
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/spring-community.xml
CMSContainer/trunk/CMSContainer_Modules/community/src/webapp/WEB-INF/struts-community.xml
Log:
CMSC-1614 - Groups on syncronise on user logg in
Added:
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community/cronjobs.xml
===
---
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community/cronjobs.xml
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community/cronjobs.xml
2010-01-19 09:45:02 UTC (rev 40608)
@@ -0,0 +1,10 @@
+
+
+
+ Syncronize Groups Job
+ 0 23 * * *
+
com.finalist.cmsc.community.groups.SyncronizeGroupsCronJob
+
+ 2
+
+
\ No newline at end of file
Added:
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community.xml
===
---
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community.xml
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/config/applications/community.xml
2010-01-19 09:45:02 UTC (rev 40608)
@@ -0,0 +1,23 @@
+
+http://www.mmbase.org/dtd/application_1_1.dtd";>
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community.properties
2010-01-19 09:38:50 UTC (rev 40607)
+++
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community.properties
2010-01-19 09:45:02 UTC (rev 40608)
@@ -78,6 +78,12 @@
community.data.import.option = You choose to {0}, are you sure?
community.datafile.import.success = Succeeded
+community.groups.title = Groups
+community.groups.groups = Groups
+community.groups.synchronization = Synchronization
+community.groups.result = RESULTS
+community.groups.noresult = No groups be synchronized!
+
community.data.export.title = Export Community Users
community.data.import.title = Import Community Users
community.data.export.xml = Export users to XML
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
2010-01-19 09:38:50 UTC (rev 40607)
+++
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_nl.properties
2010-01-19 09:45:02 UTC (rev 40608)
@@ -77,6 +77,12 @@
community.data.import.option = U koos voor het {0}, weet u dit zeker?
community.datafile.import.success = DOORGAAN
+community.groups.title = Groups
+community.groups.groups = Groups
+community.groups.synchronization = Synchronization
+community.groups.result = RESULTATEN
+community.groups.noresult = No groups be synchronized!
+
community.data.export.title = Exporteer Community leden
community.data.import.title = Importeer Community leden
community.data.export.xml = Exporteer leden naar XML
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/resources/cmsc-community_zh.properties
===
---
CMSContain
[MMBASE SCM] r40497 - CMSContainer/trunk/CMSContainer_Modules/community
Author: billyxie Date: 2010-01-12 07:56:00 +0100 (Tue, 12 Jan 2010) New Revision: 40497 Modified: CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt Log: Modified: CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt === --- CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt 2010-01-12 06:15:11 UTC (rev 40496) +++ CMSContainer/trunk/CMSContainer_Modules/community/SSO_SIMPLE_GUIDE.txt 2010-01-12 06:56:00 UTC (rev 40497) @@ -95,7 +95,7 @@ /* -3. Change the sprint-community.xml, uncomment the following beans +3. Change the spring-community.xml, uncomment the following beans ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40496 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation
Author: billyxie Date: 2010-01-12 07:15:11 +0100 (Tue, 12 Jan 2010) New Revision: 40496 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp Log: CMSC-1603 - add the PageReadable Tag Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-12 06:13:44 UTC (rev 40495) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-12 06:15:11 UTC (rev 40496) @@ -1,6 +1,6 @@ <%...@include file="/WEB-INF/templates/portletglobals.jsp" %> <%...@taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %> - +<%...@taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40495 - CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates
Author: billyxie Date: 2010-01-12 07:13:44 +0100 (Tue, 12 Jan 2010) New Revision: 40495 Modified: CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/portletglobals.jsp Log: CMSC-1603 - add the PageReadable Tag Modified: CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/portletglobals.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/portletglobals.jsp 2010-01-12 06:05:21 UTC (rev 40494) +++ CMSContainer/trunk/CMSContainer/cmsc/portlets/src/webapp/WEB-INF/templates/portletglobals.jsp 2010-01-12 06:13:44 UTC (rev 40495) @@ -9,6 +9,5 @@ <%@ taglib uri="http://finalist.com/cmsc-basicmodel"; prefix="cmsc-bm"%> <%@ taglib uri="http://www.mmbase.org/mmbase-taglib-2.0"; prefix="mm"%> <%@ taglib uri="http://jsptags.com/tags/navigation/pager"; prefix="pg" %> -<%@ taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40494 - in CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp: . editors/modules
Author: billyxie Date: 2010-01-12 07:05:21 +0100 (Tue, 12 Jan 2010) New Revision: 40494 Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/globals.jsp Log: CMSC-1606 - hidden the community and community data Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-01-11 22:21:05 UTC (rev 40493) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/modules/modulesmenu.jsp 2010-01-12 06:05:21 UTC (rev 40494) @@ -1,5 +1,6 @@ <%...@page language="java" contentType="text/html;charset=UTF-8"%> -<%...@include file="../globals.jsp"%> +<%...@include file="../globals.jsp"%><%@ +taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd";> Modified: CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/globals.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/globals.jsp 2010-01-11 22:21:05 UTC (rev 40493) +++ CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/globals.jsp 2010-01-12 06:05:21 UTC (rev 40494) @@ -8,5 +8,4 @@ taglib uri="http://java.sun.com/jsp/jstl/core"; prefix="c" %><%@ taglib uri="http://java.sun.com/jsp/jstl/fmt"; prefix="fmt" %><%@ taglib uri="http://java.sun.com/jsp/jstl/functions"; prefix="fn" %><%@ -taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %><%@ -taglib uri="http://finalist.com/cmsc/community"; prefix="community" %> \ No newline at end of file +taglib uri="http://finalist.com/cmsc"; prefix="cmsc" %> \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40416 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib
Author: billyxie
Date: 2010-01-08 08:44:40 +0100 (Fri, 08 Jan 2010)
New Revision: 40416
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
Log:
CMSC-1603 - add the PageReadable Tag
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
2010-01-08 07:15:25 UTC (rev 40415)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
2010-01-08 07:44:40 UTC (rev 40416)
@@ -32,17 +32,17 @@
@Override
public int doStartTag() throws JspException {
super.doStartTag();
- AuthorityService authorityService = (AuthorityService)
ApplicationContextFactory.getBean("authorityService");
- org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
- if(authentication == null) return SKIP_BODY;
- Set authorityNames =
authorityService.getAuthorityNamesForUser(authentication.getName());
-
Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
Node pageNode = cloud.getNode(getPageId());
NodeList pagegroups = pageNode.getRelatedNodes("pagegroup");
if(pagegroups.size() == 0) return EVAL_BODY_INCLUDE;;
+ AuthorityService authorityService = (AuthorityService)
ApplicationContextFactory.getBean("authorityService");
+ org.acegisecurity.Authentication authentication =
SecurityContextHolder.getContext().getAuthentication();
+ if(authentication == null) return SKIP_BODY;
+ Set authorityNames =
authorityService.getAuthorityNamesForUser(authentication.getName());
+
for(int i = 0; i < pagegroups.size(); i++){
Node group = pagegroups.get(i);
if(authorityNames.contains(group.getValue("name")))
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40415 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib
Author: billyxie
Date: 2010-01-08 08:15:25 +0100 (Fri, 08 Jan 2010)
New Revision: 40415
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
Log:
CMSC-1603 - add the PageReadable Tag
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
2010-01-08 07:14:43 UTC (rev 40414)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/PageReadableTag.java
2010-01-08 07:15:25 UTC (rev 40415)
@@ -41,6 +41,8 @@
Node pageNode = cloud.getNode(getPageId());
NodeList pagegroups = pageNode.getRelatedNodes("pagegroup");
+ if(pagegroups.size() == 0) return EVAL_BODY_INCLUDE;;
+
for(int i = 0; i < pagegroups.size(); i++){
Node group = pagegroups.get(i);
if(authorityNames.contains(group.getValue("name")))
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40414 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation
Author: billyxie Date: 2010-01-08 08:14:43 +0100 (Fri, 08 Jan 2010) New Revision: 40414 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp Log: CMSC-1603 - add the PageReadable Tag Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-08 07:13:38 UTC (rev 40413) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-08 07:14:43 UTC (rev 40414) @@ -14,13 +14,23 @@ - - class="selected"> -" title=""> - - - - + + + +class="selected"> + " title=""> + + + + + + +class="selected"> + " title=""> + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40412 - CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation
Author: billyxie Date: 2010-01-08 07:28:23 +0100 (Fri, 08 Jan 2010) New Revision: 40412 Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp Log: CMSC-1603 - add the PageReadable Tag Modified: CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp === --- CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-08 06:11:45 UTC (rev 40411) +++ CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/templates/view/demo/navigation/submenu.jsp 2010-01-08 06:28:23 UTC (rev 40412) @@ -14,11 +14,13 @@ -class="selected"> - " title=""> - - - + + class="selected"> +" title=""> + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40375 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure
Author: billyxie Date: 2010-01-07 09:17:19 +0100 (Thu, 07 Jan 2010) New Revision: 40375 Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp Log: CMSC-1604 - add two tags and use them. Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp 2010-01-07 07:38:24 UTC (rev 40374) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp 2010-01-07 08:17:19 UTC (rev 40375) @@ -33,7 +33,10 @@ - + + + +
[MMBASE SCM] r40374 - CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib
Author: billyxie
Date: 2010-01-07 08:38:24 +0100 (Thu, 07 Jan 2010)
New Revision: 40374
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AddAuthorityTag.java
Log:
CMSC-1604 - add two tags and use them.
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AddAuthorityTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AddAuthorityTag.java
2010-01-07 07:31:48 UTC (rev 40373)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AddAuthorityTag.java
2010-01-07 07:38:24 UTC (rev 40374)
@@ -41,7 +41,10 @@
ctx.getAutowireCapableBeanFactory().autowireBeanProperties(this,
Autowire.BY_NAME.value(), false);
AuthorityService as = getAuthorityService();
- as.createAuthority("", getValue());
+ boolean exist = as.authorityExists(getValue());
+ if(!exist){
+ as.createAuthority("", getValue());
+ }
}
private AuthorityService authorityService;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r40372 - in CMSContainer/trunk/CMSContainer_Modules/community/src: java/com/finalist/cmsc/community/taglib java/com/finalist/cmsc/services/community/security tld
Author: billyxie
Date: 2010-01-07 08:08:56 +0100 (Thu, 07 Jan 2010)
New Revision: 40372
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AddAuthorityTag.java
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
Modified:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/services/community/security/AuthorityLDAPService.java
CMSContainer/trunk/CMSContainer_Modules/community/src/tld/community.tld
Log:
CMSC-1604 - add two tags and use them.
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AddAuthorityTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AddAuthorityTag.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/AddAuthorityTag.java
2010-01-07 07:08:56 UTC (rev 40372)
@@ -0,0 +1,57 @@
+/**
+ *
+ */
+package com.finalist.cmsc.community.taglib;
+
+import java.io.IOException;
+
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+
+import org.springframework.beans.factory.annotation.Autowire;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.finalist.cmsc.services.community.security.AuthorityService;
+
+
+/**
+ * @author Billy
+ *
+ */
+public class AddAuthorityTag extends SimpleTagSupport {
+
+ private String value;
+
+
+ public String getValue() {
+ return value;
+ }
+
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public void doTag() throws JspException, IOException {
+ PageContext pctx = (PageContext) getJspContext();
+ WebApplicationContext ctx =
WebApplicationContextUtils.getRequiredWebApplicationContext(pctx.getServletContext());
+ ctx.getAutowireCapableBeanFactory().autowireBeanProperties(this,
Autowire.BY_NAME.value(), false);
+
+ AuthorityService as = getAuthorityService();
+ as.createAuthority("", getValue());
+ }
+
+ private AuthorityService authorityService;
+
+ public AuthorityService getAuthorityService() {
+ return authorityService;
+ }
+
+ public void setAuthorityService(AuthorityService authorityService) {
+ this.authorityService = authorityService;
+ }
+
+}
Added:
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
===
---
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer_Modules/community/src/java/com/finalist/cmsc/community/taglib/ListLDAPGroupsTag.java
2010-01-07 07:08:56 UTC (rev 40372)
@@ -0,0 +1,60 @@
+package com.finalist.cmsc.community.taglib;
+
+import java.io.IOException;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.jsp.JspException;
+import javax.servlet.jsp.PageContext;
+import javax.servlet.jsp.tagext.SimpleTagSupport;
+
+import org.springframework.beans.factory.annotation.Autowire;
+import org.springframework.web.context.WebApplicationContext;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import com.finalist.cmsc.services.community.security.AuthorityLDAPService;
+import com.finalist.cmsc.services.community.security.AuthorityService;
+
+/**
+ * @author Wouter Heijke
+ */
+public class ListLDAPGroupsTag extends SimpleTagSupport {
+
+ private String var;
+
+ public void setVar(String var) {
+ this.var = var;
+ }
+
+ @Override
+ public void doTag() throws JspException, IOException {
+ PageContext pctx = (PageContext) getJspContext();
+ WebApplicationContext ctx =
WebApplicationContextUtils.getRequiredWebApplicationContext(pctx.getServletContext());
+ ctx.getAutowireCapableBeanFactory().autowireBeanProperties(this,
Autowire.BY_NAME.value(), false);
+ HttpServletRequest req = (HttpServletRequest) pctx.getRequest();
+
+ AuthorityService as = getAuthorityLDAPService();
+ Set < String > list = as.getAuthorityNames();
+
+ if (var != null) {
+ if (list != null) {
+req.setAttribute(var, list);
+ } else {
+req.removeAttribute(var);
+ }
+ } else {
+ pctx.getOut().print(list);
+ }
+ }
+
+ private AuthorityLDAPService authorityLDAPService;
+
+ public AuthorityLDAPService getAuthorityLDAPService() {
+ return authorityLDAPService;
+ }
+
+ public void setAuth
[MMBASE SCM] r40371 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure
Author: billyxie Date: 2010-01-07 08:05:14 +0100 (Thu, 07 Jan 2010) New Revision: 40371 Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp Log: CMSC-1604 - add two tags and use them. Modified: CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp 2010-01-06 22:49:03 UTC (rev 40370) +++ CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/secure/selectGroup.jsp 2010-01-07 07:05:14 UTC (rev 40371) @@ -33,6 +33,7 @@ +
[MMBASE SCM] r39626 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository: resources src/webapp/editors/repository
Author: billyxie Date: 2009-11-11 07:37:33 +0100 (Wed, 11 Nov 2009) New Revision: 39626 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp Log: CMSC-1581 - Content/Asset channel explorer: select all checkbox is missing label Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-11-10 23:18:05 UTC (rev 39625) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-11-11 06:37:33 UTC (rev 39626) @@ -134,6 +134,7 @@ locate.edit=Edit content element. locate.showitem=Show details. locate.showchannels=Show where this item is linked. +locate.selectall=Select all channelrefresh.title=Channel reload Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-11-10 23:18:05 UTC (rev 39625) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-11-11 06:37:33 UTC (rev 39626) @@ -133,6 +133,7 @@ locate.edit=Bewerk dit contentelement. locate.showitem=Toon details. locate.showchannels=Toon waarin dit element is gekoppeld. +locate.selectall=Selecteer alles channelrefresh.title=Rubriek herladen Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-11-10 23:18:05 UTC (rev 39625) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-11-11 06:37:33 UTC (rev 39626) @@ -131,6 +131,7 @@ locate.edit=编辑contentelement. locate.showitem=显示详细信息. locate.showchannels=显示这些item被那里引用. +locate.selectall=选择所有 channelrefresh.title=频道刷新 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp 2009-11-10 23:18:05 UTC (rev 39625) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp 2009-11-11 06:37:33 UTC (rev 39626) @@ -406,7 +406,7 @@ "/> - + Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp 2009-11-10 23:18:05 UTC (rev 39625) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp 2009-11-11 06:37:33 UTC (rev 39626) @@ -421,11 +421,11 @@ " /> " /> "/> - + - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r39461 - CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
Author: billyxie
Date: 2009-10-30 10:18:35 +0100 (Fri, 30 Oct 2009)
New Revision: 39461
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/refreshpages.jsp
Log:
CMSC-1577 - Error when exiting personalpage editwizards
Modified:
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/refreshpages.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/refreshpages.jsp
2009-10-30 09:18:07 UTC (rev 39460)
+++
CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/refreshpages.jsp
2009-10-30 09:18:35 UTC (rev 39461)
@@ -5,11 +5,42 @@
function refreshPages() {
- refreshFrame('pages');
+ if(existFrameWithName('pages') ) {
+ refreshFrame('pages');
+}
if (window.opener) {
window.close();
}
}
+
+ function existFrameWithName(name, win, parentcall) {
+if (!win) {
+ if (!existFrameWithName(name, window)) {
+ return false;
+ }
+ else {
+ return true;
+ }
+}
+if (win.name == name) {
+ return true;
+}
+else {
+ for (var i = 0; i < win.frames.length; i++) {
+ if(existFrameWithName(name, win.frames[i], true)) {
+ return true;
+ }
+ }
+ if (win.parent && win != parent && !parentcall) {
+ return existFrameWithName(name, win.parent);
+ }
+ if (win.opener) {
+ return existFrameWithName(name, win.opener);
+ }
+ return false;
+}
+ }
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r39460 - CMSContainer/branches/b1_6/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site
Author: billyxie
Date: 2009-10-30 10:18:07 +0100 (Fri, 30 Oct 2009)
New Revision: 39460
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/refreshpages.jsp
Log:
CMSC-1577 - Error when exiting personalpage editwizards
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/refreshpages.jsp
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/refreshpages.jsp
2009-10-30 09:17:22 UTC (rev 39459)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/sitemanagement/src/webapp/editors/site/refreshpages.jsp
2009-10-30 09:18:07 UTC (rev 39460)
@@ -5,11 +5,42 @@
function refreshPages() {
- refreshFrame('pages');
+ if(existFrameWithName('pages') ) {
+ refreshFrame('pages');
+}
if (window.opener) {
window.close();
}
}
+
+ function existFrameWithName(name, win, parentcall) {
+if (!win) {
+ if (!existFrameWithName(name, window)) {
+ return false;
+ }
+ else {
+ return true;
+ }
+}
+if (win.name == name) {
+ return true;
+}
+else {
+ for (var i = 0; i < win.frames.length; i++) {
+ if(existFrameWithName(name, win.frames[i], true)) {
+ return true;
+ }
+ }
+ if (win.parent && win != parent && !parentcall) {
+ return existFrameWithName(name, win.parent);
+ }
+ if (win.opener) {
+ return existFrameWithName(name, win.opener);
+ }
+ return false;
+}
+ }
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r39459 - CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite
Author: billyxie
Date: 2009-10-30 10:17:22 +0100 (Fri, 30 Oct 2009)
New Revision: 39459
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
Log:
CMSC-1577 - Error when exiting personalpage editwizards
Modified:
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
===
---
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
2009-10-29 18:22:13 UTC (rev 39458)
+++
CMSContainer/branches/b1_5/CMSContainer_Modules/subsite/src/webapp/editors/subsite/refreshandshow.jsp
2009-10-30 09:17:22 UTC (rev 39459)
@@ -11,13 +11,44 @@
- function refreshPages() {
- refreshFrame('pages');
- if (window.opener) {
- window.close();
- }
- document.location.href = '<mm:write
referid="pagepath"/>';
- }
+ function refreshPages() {
+if( existFrameWithName('pages') ) {
+ refreshFrame('pages');
+}
+if (window.opener) {
+ window.close();
+}
+document.location.href = '<mm:write referid="pagepath"/>';
+ }
+
+ function existFrameWithName(name, win, parentcall) {
+if (!win) {
+ if (!existFrameWithName(name, window)) {
+ return false;
+ }
+ else {
+ return true;
+ }
+}
+if (win.name == name) {
+ return true;
+}
+else {
+ for (var i = 0; i < win.frames.length; i++) {
+ if(existFrameWithName(name, win.frames[i], true)) {
+ return true;
+ }
+ }
+ if (win.parent && win != parent && !parentcall) {
+ return existFrameWithName(name, win.parent);
+ }
+ if (win.opener) {
+ return existFrameWithName(name, win.opener);
+ }
+ return false;
+}
+ }
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r39398 - in CMSContainer/trunk: CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/select/forms CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/se
Author: billyxie
Date: 2009-10-28 08:09:47 +0100 (Wed, 28 Oct 2009)
New Revision: 39398
Added:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/icons/type/collectionchannel_available.png
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/icons/type/contentchannel_chiefeditor_gray.gif
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/icons/type/contentchannel_editor_gray.gif
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/icons/type/contentchannel_webmaster_gray.gif
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/gfx/icons/type/contentchannel_writer_gray.gif
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/collectionchannel/
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/collectionchannel/search_rssfeed_related_collectionchannel.xml
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/select/forms/SelectorAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selectorpopup.jsp
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
CMSContainer/trunk/CMSContainer/cmsc/utilities/src/webapp/editors/utils/ajaxtree/ajaxtree.js
CMSContainer/trunk/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationItemManager.java
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/RssFeedNavigationRenderer.java
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/beans/om/RssFeed.java
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/java/com/finalist/cmsc/rssfeed/util/RssFeedUtil.java
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/contentchannel/search_rssfeed_related_contentchannel.xml
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/rssfeed/edit_rssfeed.xml
CMSContainer/trunk/CMSContainer_Modules/rssfeed/src/webapp/editors/config/rssfeed/load_rssfeed.xml
Log:
CMSC-1150 - Cannot create RSS feed on collectionchannel / multiple channels
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/select/forms/SelectorAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/select/forms/SelectorAction.java
2009-10-27 22:02:51 UTC (rev 39397)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/select/forms/SelectorAction.java
2009-10-28 07:09:47 UTC (rev 39398)
@@ -9,18 +9,25 @@
*/
package com.finalist.cmsc.repository.select.forms;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
import org.apache.commons.lang.StringUtils;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
-import org.apache.struts.action.*;
-import org.mmbase.bridge.*;
-
import com.finalist.cmsc.mmbase.TreeUtil;
-import com.finalist.cmsc.repository.*;
+import com.finalist.cmsc.repository.RepositoryInfo;
+import com.finalist.cmsc.repository.RepositoryTreeModel;
+import com.finalist.cmsc.repository.RepositoryUtil;
import com.finalist.cmsc.repository.select.SelectRenderer;
import com.finalist.cmsc.util.bundles.JstlUtil;
import com.finalist.tree.TreeInfo;
@@ -38,6 +45,7 @@
String action = request.getParameter("action");
String portletId = request.getParameter("portletId");
+ String from = request.getParameter("onlycollection");
if (StringUtils.isEmpty(action)) {
RepositoryInfo info = new
RepositoryInfo(RepositoryUtil.getRepositoryInfo(cloud));
cloud.setProperty("Selector" + RepositoryInfo.class.getName(), info);
@@ -50,6 +58,7 @@
addToRequest(request, "actionname", mapping.getPath());
addToRequest(request, "portletId", portletId);
+ addToRequest(request, "onlycollection", from);
JstlUtil.setResourceBundle(request, "cmsc-repository");
return super.execute(mapping, form, request, response, cloud);
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selectorpopup.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepositor
[MMBASE SCM] r39294 - in CMSContainer/trunk/CMSContainer/cmsc/security: resources src/java/com/finalist/cmsc/security/forms
Author: billyxie
Date: 2009-10-23 09:27:54 +0200 (Fri, 23 Oct 2009)
New Revision: 39294
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserForm.java
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/UserInitAction.java
Log:
CMSC-1572 - Some little improvements on the Add a user screen
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties
2009-10-22 14:24:23 UTC (rev 39293)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties
2009-10-23 07:27:54 UTC (rev 39294)
@@ -1,107 +1,109 @@
-role.legend.userrights=User Rights
-
-role.inherit=-
-role.none=none
-role.writer=writer
-role.editor=editor
-role.chiefeditor=chief editor
-role.webmaster=webmaster
-
-changeprofile.title=My Profile
-changeprofile.succeeded=My Profile information is updated successfully.
-changeprofile.current=Old password
-changeprofile.new=New password
-changeprofile.confirm=Confirm password
-changeprofile.submit=Save
-
-changelanguage.title=Change Language
-changelanguage.succeeded=The language setting is updated successfully.
-changelanguage.language=Language
-changelanguage.default=The default (browser) language
-changelanguage.english=English
-changelanguage.dutch=Dutch
-changelanguage.chinese=Chinese
-changelanguage.french=French
-changelanguage.submit=Save
-
-profile.title=Profile
-
-edit_defaults.channelselect=Select
-edit_defaults.erase=Erase
-
-group.title=Group
-group.name=Name
-group.description=Description
-group.simpleeditorchannel=Simple ed. channel:
-group.members=Members
-group.nonmembers=Users
-group.submit=Save
-group.cancel=Cancel
-
-user.title=User: {0}
-user.edit.title=User
-user.account=Account
-user.name=Name
-user.firstname=First name
-user.prefix=Prefix
-user.surname=Surname
-user.email=Email
-user.company=Company
-user.department=Department
-user.note=Note
-user.password=Password
-user.confirmpassword=Confirm password
-user.emailsignal=Email notification
-user.rank=Rank
-user.rank.admin=Administrator
-user.status=Status
-user.status.active=Active
-user.submit=Save
-user.cancel=Cancel
-user.info=Info
-
-userlist.title=User Management
-userlist.groups=Groups
-userlist.contentroles=Content Roles
-userlist.siteroles=Site Roles
-userlist.removegroup=Delete Group
-userlist.removegroupquestion=Delete group?
-userlist.newgroup=New Group
-userlist.users=Users
-userlist.removeuser=Delete User
-userlist.removeuserquestion=Delete user?
-userlist.newuser=New User
-userlist.info=User Information
-
-contentroles.title=Roles
-contentroles.description=When no role is selected for a channel then the role
is used of the nearest ancestor channel.
-contentroles.submit=Save
-contentroles.cancel=Cancel
-
-siteroles.title=Roles
-siteroles.description=When no role is selected for a page then the role is
used of the nearest ancestor page.
-siteroles.submit=Save
-siteroles.cancel=Cancel
-
-rights.page.title=Page rights
-rights.userson=Users with rights on the {0} {1} :
-rights.groupson=Groups with rights on the {0} {1} :
-
-rights.content.title=Content rights
-
-error.password.incorrect=Password is incorrect.
-error.password.invalid=Password has to be at least 6 and at most 15 characters
long.
-error.password.nomatch=New passwords are not the same.
-error.newpassword.incorrect=New password can't be the same as the old password.
-
-error.username.invalid=Account has to be at least 3 and at most 15 characters
long.
-error.username.alreadyexists=Account already exists.
-error.email.empty=E-mail should be filled in.
-error.groupname.invalid=Account has to be at least 3 characters long.
-error.groupname.alreadyexists=group already exists.
-
-showitem.close=Close this screen.
-showitem.groups=The user is a member of the following group(s):
-
-user.notice=Items with a * are required!
-user.textlength=Up to 40 characters
\ No newline at end of file
+role.legend.userrights=User Rights
+
+role.inherit=-
+role.none=none
+role.writer=writer
+role.editor=editor
+role.chiefeditor=chief editor
+role.webmaster=webmaster
+
+changeprofile.title=My Profile
+changeprofile.succeeded=My Profile information is updated successfully.
+changeprofile.current=Old password
+changeprofile.new=New password
+changeprofile.confirm=Confirm password
+changeprofile.submit
[MMBASE SCM] r39271 - in CMSContainer/trunk/CMSContainer_Modules/workflow: resources src/webapp/editors/css src/webapp/editors/workflow
Author: billyxie
Date: 2009-10-21 10:12:00 +0200 (Wed, 21 Oct 2009)
New Revision: 39271
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
Log:
CMSC-1562 - Workflow-screen is ugly when builders have long names
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
2009-10-21 08:09:58 UTC (rev 39270)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
2009-10-21 08:12:00 UTC (rev 39271)
@@ -16,7 +16,7 @@
workflow.status.finished=Voltooid
workflow.status.approved=Goed-gekeurd
workflow.status.published=Inpublicatiewachtrij
-workflow.status.allcontent=All content
+workflow.status.allcontent=Alle content
workflow.status.content=Content
workflow.status.content.article=Artikel
workflow.status.content.banners=Banner
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
===
---
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
2009-10-21 08:09:58 UTC (rev 39270)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
2009-10-21 08:12:00 UTC (rev 39271)
@@ -6,17 +6,34 @@
}
table.centerData td {
text-align: center;
- padding:0;
- width:50px
+ padding:0px;
+ width:50px;
}
+table.centerData th {
+ text-align: center;
+ padding:0px;
+ width:50px;
+}
table.centerData td.leftData {
text-align: left;
- width:56px;
+ width:73px;
}
+table.centerData td.leftData2 {
+ text-align: left;
+ width:68px;
+}
table.centerData td.indent {
+ width:14px;
+}
+table.centerData td.indent2 {
width:19px;
}
-
+#tree-page table{
+ height:18px;
+}
+#tree-link table {
+ height:18px;
+}
a.sortup {
background: url( ../gfx/icons/sort_up.gif ) no-repeat right !important;
padding-right: 20px;
Modified:
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
===
---
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
2009-10-21 08:09:58 UTC (rev 39270)
+++
CMSContainer/trunk/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
2009-10-21 08:12:00 UTC (rev 39271)
@@ -63,7 +63,7 @@
-
+
@@ -81,7 +81,7 @@
-
+
style="display:none" >
-
+
<%--
--%>
@@ -130,7 +130,7 @@
style="display:none">
-
+
- ${contentType.label}
+
+
+ ${contentType.label}
+
+
+ ${fn:substring(contentType.label,0,11)}...
+
+
${statusInfo.contentChildrenDraft[contentType.value]}
-
+
<%--
--%>
@@ -187,21 +194,28 @@
style="display:none" >
-
+
-
+
- ${assetType.label}
+
+
+ ${assetType.label}
+
+
+ ${fn:substring(assetType.label,0,11)}...
+
+
[MMBASE SCM] r39270 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
Author: billyxie
Date: 2009-10-21 10:09:58 +0200 (Wed, 21 Oct 2009)
New Revision: 39270
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
Log:
CMSC-1562 - Workflow-screen is ugly when builders have long names
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
2009-10-21 07:59:26 UTC (rev 39269)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
2009-10-21 08:09:58 UTC (rev 39270)
@@ -317,7 +317,7 @@
div.side_block div.body
{
- padding: 10px;
+ padding: 5px;
}
div.side_block_gray div.body,
div.side_block_green div.body{
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r39269 - in CMSContainer/branches/b1_6/CMSContainer_Modules/workflow: resources src/webapp/editors/css src/webapp/editors/workflow
Author: billyxie
Date: 2009-10-21 09:59:26 +0200 (Wed, 21 Oct 2009)
New Revision: 39269
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
Log:
CMSC-1562 - Workflow-screen is ugly when builders have long names
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
===
---
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
2009-10-21 07:58:28 UTC (rev 39268)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/resources/cmsc-workflow_nl.properties
2009-10-21 07:59:26 UTC (rev 39269)
@@ -16,7 +16,7 @@
workflow.status.finished=Voltooid
workflow.status.approved=Goed-gekeurd
workflow.status.published=Inpublicatiewachtrij
-workflow.status.allcontent=All content
+workflow.status.allcontent=Alle content
workflow.status.content=Content
workflow.status.content.article=Artikel
workflow.status.content.banners=Banner
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
===
---
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
2009-10-21 07:58:28 UTC (rev 39268)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/webapp/editors/css/workflow.css
2009-10-21 07:59:26 UTC (rev 39269)
@@ -6,17 +6,34 @@
}
table.centerData td {
text-align: center;
- padding:0;
- width:50px
+ padding:0px;
+ width:50px;
}
+table.centerData th {
+ text-align: center;
+ padding:0px;
+ width:50px;
+}
table.centerData td.leftData {
text-align: left;
- width:56px;
+ width:73px;
}
+table.centerData td.leftData2 {
+ text-align: left;
+ width:68px;
+}
table.centerData td.indent {
+ width:14px;
+}
+table.centerData td.indent2 {
width:19px;
}
-
+#tree-page table{
+ height:18px;
+}
+#tree-link table {
+ height:18px;
+}
a.sortup {
background: url( ../gfx/icons/sort_up.gif ) no-repeat right !important;
padding-right: 20px;
Modified:
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
===
---
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
2009-10-21 07:58:28 UTC (rev 39268)
+++
CMSContainer/branches/b1_6/CMSContainer_Modules/workflow/src/webapp/editors/workflow/workflow.jsp
2009-10-21 07:59:26 UTC (rev 39269)
@@ -62,7 +62,7 @@
-
+
@@ -80,7 +80,7 @@
-
+
style="display:none" >
-
+
<%--
--%>
@@ -129,7 +129,7 @@
style="display:none">
-
+
- ${contentType.label}
+
+
+ ${contentType.label}
+
+
+ ${fn:substring(contentType.label,0,11)}...
+
+
${statusInfo.contentChildrenDraft[contentType.value]}
-
+
<%--
--%>
@@ -186,21 +193,28 @@
style="display:none" >
-
+
-
+
- ${assetType.label}
+
+
+ ${assetType.label}
+
+
+
[MMBASE SCM] r39268 - CMSContainer/branches/b1_6/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
Author: billyxie
Date: 2009-10-21 09:58:28 +0200 (Wed, 21 Oct 2009)
New Revision: 39268
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
Log:
CMSC-1562 - Workflow-screen is ugly when builders have long names
Modified:
CMSContainer/branches/b1_6/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
===
---
CMSContainer/branches/b1_6/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
2009-10-20 21:04:06 UTC (rev 39267)
+++
CMSContainer/branches/b1_6/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css
2009-10-21 07:58:28 UTC (rev 39268)
@@ -317,7 +317,7 @@
div.side_block div.body
{
- padding: 10px;
+ padding: 5px;
}
div.side_block_gray div.body,
div.side_block_green div.body{
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r39170 - in CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist: newsletter/services portlets/newsletter
Author: billyxie
Date: 2009-10-16 10:15:38 +0200 (Fri, 16 Oct 2009)
New Revision: 39170
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/CommunityModuleAdapter.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterSubscriptionPortlet.java
Log:
CMSC-1534 - Validate the user which still exists and still is active.
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/CommunityModuleAdapter.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/CommunityModuleAdapter.java
2009-10-16 07:25:26 UTC (rev 39169)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/CommunityModuleAdapter.java
2009-10-16 08:15:38 UTC (rev 39170)
@@ -45,7 +45,7 @@
public static int getCurrentUserId() {
Person person = getCurrentUser();
- if (null == person) {
+ if (null == person || !"active".equalsIgnoreCase(person.getActive())) {
return -1;
}
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterSubscriptionPortlet.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterSubscriptionPortlet.java
2009-10-16 07:25:26 UTC (rev 39169)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/portlets/newsletter/NewsletterSubscriptionPortlet.java
2009-10-16 08:15:38 UTC (rev 39170)
@@ -86,6 +86,10 @@
String[] newsletters = request.getParameterValues(SUBSCRIPTIONS);
NewsletterSubscriptionServices services =
(NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
int subscriberId = CommunityModuleAdapter.getCurrentUserId();
+ if(subscriberId == -1) {
+ response.setRenderParameter("isChanged", isChanged);
+ return ;
+ }
List allSubscribtions =
services.getSubscriptions(allNewsletters, subscriberId);
if(newsletters == null) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r39090 - CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms
Author: billyxie
Date: 2009-10-13 10:49:24 +0200 (Tue, 13 Oct 2009)
New Revision: 39090
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/DiffAction.java
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/ShowVersionsAction.java
Log:
CMSC-1381 - Add diff view to versions
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/DiffAction.java
===
---
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/DiffAction.java
2009-10-13 08:41:42 UTC (rev 39089)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/DiffAction.java
2009-10-13 08:49:24 UTC (rev 39090)
@@ -22,7 +22,6 @@
String objectNumber = getParameter(request, OBJECTNUMBER);
String archiveNumber = getParameter(request, ARCHIVENUMBER);
Diff_Match_Patch diff = new Diff_Match_Patch();
-// String elementData = Versioning.toXml(cloud.getNode(objectNumber));
String elementData =
cloud.getNode(objectNumber).getStringValue(VersioningService.NODE_DATA);
String versionData =
cloud.getNode(archiveNumber).getStringValue(VersioningService.NODE_DATA);
request.setAttribute("diffs",
diff.diff_prettyHtml(diff.diff_main(elementData, versionData)));
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/ShowVersionsAction.java
===
---
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/ShowVersionsAction.java
2009-10-13 08:41:42 UTC (rev 39089)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/ShowVersionsAction.java
2009-10-13 08:49:24 UTC (rev 39090)
@@ -21,7 +21,6 @@
import com.finalist.cmsc.security.UserRole;
import com.finalist.cmsc.services.versioning.VersioningService;
import com.finalist.cmsc.struts.MMBaseAction;
-import com.finalist.cmsc.util.ServerUtil;
/**
* @author Jeoffrey Bakker, Finalist IT Group
@@ -49,9 +48,6 @@
UserRole role = RepositoryUtil.getRole(cloud,
RepositoryUtil.getCreationChannel(node), false);
request.setAttribute("isAllowed", SecurityUtil.isWriter(role));
- if(ServerUtil.isStaging()){
-request.setAttribute("action", "workflow");
- }
}
else {
String message = getResources(request,
"VERSIONING").getMessage(locale, "incorrect.nodenumber", nodeNumber);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38934 - in CMSContainer/trunk/CMSContainer_Modules/versioning: resources src/java/com/finalist/cmsc/versioning/forms src/webapp/editors/versioning
Author: billyxie
Date: 2009-09-30 12:31:46 +0200 (Wed, 30 Sep 2009)
New Revision: 38934
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning.properties
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_nl.properties
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_zh.properties
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/DiffAction.java
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/ShowVersionsAction.java
CMSContainer/trunk/CMSContainer_Modules/versioning/src/webapp/editors/versioning/versioning.jsp
Log:
CMSC-1381 - Add diff view to versions
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning.properties
2009-09-30 09:56:37 UTC (rev 38933)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning.properties
2009-09-30 10:31:46 UTC (rev 38934)
@@ -27,4 +27,4 @@
versioning.workflow.restore=Select a published version from the history to
restore
versioning.title.diff=Versioning Diff
-versioning.diff=Diff
\ No newline at end of file
+versioning.compare=Compare 2 versions
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_nl.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_nl.properties
2009-09-30 09:56:37 UTC (rev 38933)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_nl.properties
2009-09-30 10:31:46 UTC (rev 38934)
@@ -27,4 +27,4 @@
versioning.workflow.restore=Kies een gepubliceerde versie uit de geschiedenis
om terug te halen
versioning.title.diff=Versioning Diff
-versioning.diff=Diff
\ No newline at end of file
+versioning.compare=Compare 2 versions
\ No newline at end of file
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_zh.properties
===
---
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_zh.properties
2009-09-30 09:56:37 UTC (rev 38933)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/resources/cmsc-versioning_zh.properties
2009-09-30 10:31:46 UTC (rev 38934)
@@ -27,4 +27,4 @@
versioning.workflow.restore=选择一个发布版本进行恢复
versioning.title.diff=版本比较
-versioning.diff=比较
+versioning.compare=比较2个版本
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/DiffAction.java
===
---
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/DiffAction.java
2009-09-30 09:56:37 UTC (rev 38933)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/DiffAction.java
2009-09-30 10:31:46 UTC (rev 38934)
@@ -5,9 +5,7 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
-import org.mmbase.bridge.Node;
-import com.finalist.cmsc.services.versioning.Versioning;
import com.finalist.cmsc.services.versioning.VersioningService;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
import com.finalist.cmsc.versioning.Diff_Match_Patch;
@@ -24,9 +22,9 @@
String objectNumber = getParameter(request, OBJECTNUMBER);
String archiveNumber = getParameter(request, ARCHIVENUMBER);
Diff_Match_Patch diff = new Diff_Match_Patch();
- String elementData = Versioning.toXml(cloud.getNode(objectNumber));
- Node versionNode = cloud.getNode(archiveNumber);
- String versionData =
versionNode.getStringValue(VersioningService.NODE_DATA);
+// String elementData = Versioning.toXml(cloud.getNode(objectNumber));
+ String elementData =
cloud.getNode(objectNumber).getStringValue(VersioningService.NODE_DATA);
+ String versionData =
cloud.getNode(archiveNumber).getStringValue(VersioningService.NODE_DATA);
request.setAttribute("diffs",
diff.diff_prettyHtml(diff.diff_main(elementData, versionData)));
return mapping.findForward("success");
}
Modified:
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/ShowVersionsAction.java
===
---
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/cmsc/versioning/forms/ShowVersionsAction.java
2009-09-30 09:56:37 UTC (rev 38933)
+++
CMSContainer/trunk/CMSContainer_Modules/versioning/src/java/com/finalist/c
[MMBASE SCM] r38904 - in CMSContainer/trunk/CMSContainer/cmsc/richtext/src: java/com/finalist/cmsc/richtext/builders webapp/mmbase/edit/wizard/xinha webapp/mmbase/edit/wizard/xinha/modules/CreateLink
Author: billyxie
Date: 2009-09-29 08:29:08 +0200 (Tue, 29 Sep 2009)
New Revision: 38904
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
Log:
CMSC-892 - Rich-text editor: add button and functionality for Anchor links
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
2009-09-28 21:16:51 UTC (rev 38903)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/java/com/finalist/cmsc/richtext/builders/RichTextBuilder.java
2009-09-29 06:29:08 UTC (rev 38904)
@@ -392,7 +392,7 @@
idsList.add(id);
}
else {
- if (link.hasAttribute(RichText.HREF_ATTR)) {
+ if (link.hasAttribute(RichText.HREF_ATTR) &&
!(link.getAttribute(RichText.HREF_ATTR).startsWith("#")) ) {
String href = link.getAttribute(RichText.HREF_ATTR);
String name = link.getAttribute("name");
String owner = mmObj.getStringValue("owner");
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
2009-09-28 21:16:51 UTC (rev 38903)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/modules/CreateLink/insertinline_link.html
2009-09-29 06:29:08 UTC (rev 38904)
@@ -70,7 +70,7 @@
function onOK() {
var elhref = document.getElementById("f_href");
- var re = new RegExp("\://|javascript\:|mailto\:");
+ var re = new RegExp("\://|javascript\:|mailto\:|#");
var destination = document.getElementById("f_destination");
if(!elhref.value.match(re) && !destination.value ){
if (!elhref.value.match(re)) {
Modified:
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
===
---
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2009-09-28 21:16:51 UTC (rev 38903)
+++
CMSContainer/trunk/CMSContainer/cmsc/richtext/src/webapp/mmbase/edit/wizard/xinha/my-htmlarea.js
2009-09-29 06:29:08 UTC (rev 38904)
@@ -6,6 +6,7 @@
var xinha_plugins = [
'CharacterMap',
'ContextMenu',
+ 'InsertAnchor',
// 'ListType',
// 'FullScreen',
// 'SpellChecker',
@@ -333,7 +334,7 @@
}
}
} catch(ex) {}
-x }
+ }
else
{
var href = param.f_href.trim();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38882 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Author: billyxie
Date: 2009-09-28 11:46:57 +0200 (Mon, 28 Sep 2009)
New Revision: 38882
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
Log:
CMSC-1541 - Number newsletter subscriptions in overview is not matching number
of subscriptions
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 09:46:44 UTC (rev 38881)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 09:46:57 UTC (rev 38882)
@@ -101,14 +101,16 @@
String stauts = subscription.getStatus().toString();
Node record = cloud.getNode(subscription.getId());
- record.setStringValue("status", stauts);
- record.commit();
-
if ("INACTIVE".equals(stauts)) {
- record.deleteRelations("termed");
- record.commit();
+ if (Publish.isPublished(record)) {
+Publish.unpublish(record);
+ }
+ record.deleteRelations();
+ record.delete();
+ } else {
+ record.setStringValue("status", stauts);
+ record.commit();
}
-
}
public void pause(int subscriptionId) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38881 - CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Author: billyxie
Date: 2009-09-28 11:46:44 +0200 (Mon, 28 Sep 2009)
New Revision: 38881
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
Log:
CMSC-1541 - Number newsletter subscriptions in overview is not matching number
of subscriptions
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 09:46:21 UTC (rev 38880)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 09:46:44 UTC (rev 38881)
@@ -101,14 +101,16 @@
String stauts = subscription.getStatus().toString();
Node record = cloud.getNode(subscription.getId());
- record.setStringValue("status", stauts);
- record.commit();
-
if ("INACTIVE".equals(stauts)) {
- record.deleteRelations("termed");
- record.commit();
+ if (Publish.isPublished(record)) {
+Publish.unpublish(record);
+ }
+ record.deleteRelations();
+ record.delete();
+ } else {
+ record.setStringValue("status", stauts);
+ record.commit();
}
-
}
public void pause(int subscriptionId) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38880 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl
Author: billyxie
Date: 2009-09-28 11:46:21 +0200 (Mon, 28 Sep 2009)
New Revision: 38880
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
Log:
CMSC-1541 - Number newsletter subscriptions in overview is not matching number
of subscriptions
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 09:34:04 UTC (rev 38879)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 09:46:21 UTC (rev 38880)
@@ -101,14 +101,16 @@
String stauts = subscription.getStatus().toString();
Node record = cloud.getNode(subscription.getId());
- record.setStringValue("status", stauts);
- record.commit();
-
if ("INACTIVE".equals(stauts)) {
- record.deleteRelations("termed");
- record.commit();
+ if (Publish.isPublished(record)) {
+Publish.unpublish(record);
+ }
+ record.deleteRelations();
+ record.delete();
+ } else {
+ record.setStringValue("status", stauts);
+ record.commit();
}
-
}
public void pause(int subscriptionId) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38874 - in CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter: cao cao/impl services/impl
Author: billyxie
Date: 2009-09-28 09:59:18 +0200 (Mon, 28 Sep 2009)
New Revision: 38874
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
Log:
CMSC-1542 - If an user cancels his newslettersubscription on live, it is not
changed on staging
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
2009-09-28 07:57:31 UTC (rev 38873)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
2009-09-28 07:59:18 UTC (rev 38874)
@@ -30,6 +30,8 @@
public Set getTerms(int id);
public Subscription getSubscriptionById(int id);
+
+ public Node getSubscriptionNodeById(int id);
public void createSubscription(int userId, int newsletterId);
@@ -38,6 +40,7 @@
public List getSubscriptionByUserIdAndStatus(int userId,
Subscription.STATUS status);
public List getAllSubscriptions();
+
public ListgetSubscriptionsByTerms(int newsletterId, String terms);
void updateLastBounce(int subscriptionId);
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 07:57:31 UTC (rev 38873)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 07:59:18 UTC (rev 38874)
@@ -389,7 +389,7 @@
subscription.commit();
}
- private Node getSubscriptionNodeById(int subscriptionId) {
+ public Node getSubscriptionNodeById(int subscriptionId) {
return cloud.getNode(subscriptionId);
}
@@ -473,4 +473,5 @@
subscription.delete(true);
}
}
+
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
2009-09-28 07:57:31 UTC (rev 38873)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
2009-09-28 07:59:18 UTC (rev 38874)
@@ -1,6 +1,11 @@
package com.finalist.newsletter.services.impl;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -9,12 +14,18 @@
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.person.PersonService;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.util.DateUtil;
-import com.finalist.newsletter.cao.*;
-import com.finalist.newsletter.domain.*;
+import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
+import com.finalist.newsletter.cao.NewsletterCAO;
+import com.finalist.newsletter.cao.NewsletterSubscriptionCAO;
+import com.finalist.newsletter.domain.Newsletter;
+import com.finalist.newsletter.domain.Subscription;
+import com.finalist.newsletter.domain.Term;
import com.finalist.newsletter.domain.StatisticResult.HANDLE;
import com.finalist.newsletter.domain.Subscription.STATUS;
-import com.finalist.newsletter.services.*;
+import com.finalist.newsletter.services.NewsletterService;
+import com.finalist.newsletter.services.NewsletterSubscriptionServices;
import com.finalist.newsletter.util.NewsletterSubscriptionUtil;
public class NewsletterSubscriptionServicesImpl implements
NewsletterSubscriptionServices {
@@ -220,12 +231,11 @@
}
public void terminateUserSubscription(String subscriptionId) {
- Subscription subscription =
subscriptionCAO.getSubscriptionById(Integer.parseInt(subscriptionId));
- subscription.setStatus(STATUS.INACTIVE
[MMBASE SCM] r38873 - in CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter: cao cao/impl services/impl
Author: billyxie
Date: 2009-09-28 09:57:31 +0200 (Mon, 28 Sep 2009)
New Revision: 38873
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
Log:
CMSC-1542 - If an user cancels his newslettersubscription on live, it is not
changed on staging
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
2009-09-28 07:57:14 UTC (rev 38872)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
2009-09-28 07:57:31 UTC (rev 38873)
@@ -30,6 +30,8 @@
public Set getTerms(int id);
public Subscription getSubscriptionById(int id);
+
+ public Node getSubscriptionNodeById(int id);
public void createSubscription(int userId, int newsletterId);
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 07:57:14 UTC (rev 38872)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 07:57:31 UTC (rev 38873)
@@ -389,7 +389,7 @@
subscription.commit();
}
- private Node getSubscriptionNodeById(int subscriptionId) {
+ public Node getSubscriptionNodeById(int subscriptionId) {
return cloud.getNode(subscriptionId);
}
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
2009-09-28 07:57:14 UTC (rev 38872)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
2009-09-28 07:57:31 UTC (rev 38873)
@@ -14,6 +14,7 @@
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.person.PersonService;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.util.DateUtil;
import com.finalist.newsletter.cao.NewsLetterStatisticCAO;
import com.finalist.newsletter.cao.NewsletterCAO;
@@ -231,12 +232,11 @@
}
public void terminateUserSubscription(String subscriptionId) {
- Subscription subscription =
subscriptionCAO.getSubscriptionById(Integer.parseInt(subscriptionId));
- subscription.setStatus(STATUS.INACTIVE);
- subscriptionCAO.updateSubscription(subscription);
- int newsletterId =
newsletterCAO.getNewsletterIdBySubscription(Integer.parseInt(subscriptionId));
- int userId = CommunityModuleAdapter.getCurrentUserId();
- statisticCAO.logPublication(userId, newsletterId, HANDLE.INACTIVE);
+ Node subscription =
subscriptionCAO.getSubscriptionNodeById(Integer.parseInt(subscriptionId));
+ if (Publish.isPublished(subscription)) {
+ Publish.unpublish(subscription);
+ }
+ subscription.delete(true);
}
public Subscription getSubscription(String sId) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38872 - in CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter: cao cao/impl services/impl
Author: billyxie
Date: 2009-09-28 09:57:14 +0200 (Mon, 28 Sep 2009)
New Revision: 38872
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
Log:
CMSC-1542 - If an user cancels his newslettersubscription on live, it is not
changed on staging
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
2009-09-27 08:04:02 UTC (rev 38871)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/NewsletterSubscriptionCAO.java
2009-09-28 07:57:14 UTC (rev 38872)
@@ -31,6 +31,8 @@
public Subscription getSubscriptionById(int id);
+ public Node getSubscriptionNodeById(int id);
+
public void createSubscription(int userId, int newsletterId);
public void updateSubscription(Subscription subscription);
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-27 08:04:02 UTC (rev 38871)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/cao/impl/NewsletterSubscriptionCAOImpl.java
2009-09-28 07:57:14 UTC (rev 38872)
@@ -389,7 +389,7 @@
subscription.commit();
}
- private Node getSubscriptionNodeById(int subscriptionId) {
+ public Node getSubscriptionNodeById(int subscriptionId) {
return cloud.getNode(subscriptionId);
}
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
2009-09-27 08:04:02 UTC (rev 38871)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/services/impl/NewsletterSubscriptionServicesImpl.java
2009-09-28 07:57:14 UTC (rev 38872)
@@ -9,6 +9,7 @@
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.person.PersonService;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.util.DateUtil;
import com.finalist.newsletter.cao.*;
import com.finalist.newsletter.domain.*;
@@ -220,12 +221,11 @@
}
public void terminateUserSubscription(String subscriptionId) {
- Subscription subscription =
subscriptionCAO.getSubscriptionById(Integer.parseInt(subscriptionId));
- subscription.setStatus(STATUS.INACTIVE);
- subscriptionCAO.updateSubscription(subscription);
- int newsletterId =
newsletterCAO.getNewsletterIdBySubscription(Integer.parseInt(subscriptionId));
- int userId = CommunityModuleAdapter.getCurrentUserId();
- statisticCAO.logPublication(userId, newsletterId, HANDLE.INACTIVE);
+ Node subscription =
subscriptionCAO.getSubscriptionNodeById(Integer.parseInt(subscriptionId));
+ if (Publish.isPublished(subscription)) {
+ Publish.unpublish(subscription);
+ }
+ subscription.delete(true);
}
public Subscription getSubscription(String sId) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38854 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Author: billyxie
Date: 2009-09-25 10:31:39 +0200 (Fri, 25 Sep 2009)
New Revision: 38854
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
Log:
CMSC-1540 - Removing newsletter subscriptions from staging does not work
properly
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-25 08:30:16 UTC (rev 38853)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-25 08:31:39 UTC (rev 38854)
@@ -10,9 +10,8 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import com.finalist.cmsc.services.community.ApplicationContextFactory;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
-import com.finalist.newsletter.services.NewsletterSubscriptionServices;
/**
* using for deleting newsletter subscriber from newsletter
@@ -21,8 +20,6 @@
*/
public class NewsletterSubscriberDeleteAction extends MMBaseFormlessAction {
- private NewsletterSubscriptionServices service;
-
/**
* @param mapping
* @param request
@@ -43,8 +40,11 @@
String subscriberId = subscription.getStringValue("subscriber");
if (subscriberId.equals(authId)) {
- service = (NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
- service.modifyStauts(Integer.parseInt(authId),
Integer.parseInt(newsletterId), "INACTIVE");
+ if (Publish.isPublished(subscription)) {
+ Publish.unpublish(subscription);
+ }
+ subscription.deleteRelations();
+ subscription.delete(true);
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38853 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Author: billyxie
Date: 2009-09-25 10:30:16 +0200 (Fri, 25 Sep 2009)
New Revision: 38853
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
Log:
CMSC-1540 - Removing newsletter subscriptions from staging does not work
properly
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-25 08:28:34 UTC (rev 38852)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-25 08:30:16 UTC (rev 38853)
@@ -10,9 +10,8 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import com.finalist.cmsc.services.community.ApplicationContextFactory;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
-import com.finalist.newsletter.services.NewsletterSubscriptionServices;
/**
* using for deleting newsletter subscriber from newsletter
@@ -22,8 +21,6 @@
*/
public class NewsletterSubscriberDeleteAction extends MMBaseFormlessAction {
- private NewsletterSubscriptionServices service;
-
/**
* @param mapping
* @param request
@@ -44,8 +41,11 @@
String subscriberId = subscription.getStringValue("subscriber");
if (subscriberId.equals(authId)) {
- service = (NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
- service.modifyStauts(Integer.parseInt(authId),
Integer.parseInt(newsletterId), "INACTIVE");
+ if (Publish.isPublished(subscription)) {
+ Publish.unpublish(subscription);
+ }
+ subscription.deleteRelations();
+ subscription.delete(true);
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38852 - CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Author: billyxie
Date: 2009-09-25 10:28:34 +0200 (Fri, 25 Sep 2009)
New Revision: 38852
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
Log:
CMSC-1540 - Removing newsletter subscriptions from staging does not work
properly
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-25 08:28:12 UTC (rev 38851)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-25 08:28:34 UTC (rev 38852)
@@ -10,9 +10,8 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import com.finalist.cmsc.services.community.ApplicationContextFactory;
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
-import com.finalist.newsletter.services.NewsletterSubscriptionServices;
/**
* using for deleting newsletter subscriber from newsletter
@@ -21,8 +20,6 @@
*/
public class NewsletterSubscriberDeleteAction extends MMBaseFormlessAction {
- private NewsletterSubscriptionServices service;
-
/**
* @param mapping
* @param request
@@ -43,8 +40,11 @@
String subscriberId = subscription.getStringValue("subscriber");
if (subscriberId.equals(authId)) {
- service = (NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
- service.modifyStauts(Integer.parseInt(authId),
Integer.parseInt(newsletterId), "INACTIVE");
+ if (Publish.isPublished(subscription)) {
+ Publish.unpublish(subscription);
+ }
+ subscription.deleteRelations();
+ subscription.delete(true);
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38842 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Author: billyxie
Date: 2009-09-24 09:03:06 +0200 (Thu, 24 Sep 2009)
New Revision: 38842
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
Log:
CMSC-1540 - Removing newsletter subscriptions from staging does not work
properly
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-24 06:49:42 UTC (rev 38841)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-24 07:03:06 UTC (rev 38842)
@@ -10,7 +10,9 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
+import com.finalist.newsletter.services.NewsletterSubscriptionServices;
/**
* using for deleting newsletter subscriber from newsletter
@@ -19,6 +21,8 @@
*/
public class NewsletterSubscriberDeleteAction extends MMBaseFormlessAction {
+ private NewsletterSubscriptionServices service;
+
/**
* @param mapping
* @param request
@@ -39,8 +43,8 @@
String subscriberId = subscription.getStringValue("subscriber");
if (subscriberId.equals(authId)) {
- subscription.deleteRelations();
- subscription.delete();
+ service = (NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
+ service.modifyStauts(Integer.parseInt(authId),
Integer.parseInt(newsletterId), "INACTIVE");
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38840 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Author: billyxie
Date: 2009-09-24 08:42:46 +0200 (Thu, 24 Sep 2009)
New Revision: 38840
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
Log:
CMSC-1540 - Removing newsletter subscriptions from staging does not work
properly
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-24 06:42:31 UTC (rev 38839)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-24 06:42:46 UTC (rev 38840)
@@ -10,7 +10,9 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
+import com.finalist.newsletter.services.NewsletterSubscriptionServices;
/**
* using for deleting newsletter subscriber from newsletter
@@ -20,6 +22,8 @@
*/
public class NewsletterSubscriberDeleteAction extends MMBaseFormlessAction {
+ private NewsletterSubscriptionServices service;
+
/**
* @param mapping
* @param request
@@ -40,8 +44,8 @@
String subscriberId = subscription.getStringValue("subscriber");
if (subscriberId.equals(authId)) {
- subscription.deleteRelations();
- subscription.delete();
+ service = (NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
+ service.modifyStauts(Integer.parseInt(authId),
Integer.parseInt(newsletterId), "INACTIVE");
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38837 - CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
Author: billyxie
Date: 2009-09-24 05:59:35 +0200 (Thu, 24 Sep 2009)
New Revision: 38837
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
Log:
CMSC-1540 - Removing newsletter subscriptions from staging does not work
properly
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-23 21:12:15 UTC (rev 38836)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterSubscriberDeleteAction.java
2009-09-24 03:59:35 UTC (rev 38837)
@@ -10,7 +10,9 @@
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
+import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
+import com.finalist.newsletter.services.NewsletterSubscriptionServices;
/**
* using for deleting newsletter subscriber from newsletter
@@ -19,6 +21,8 @@
*/
public class NewsletterSubscriberDeleteAction extends MMBaseFormlessAction {
+ private NewsletterSubscriptionServices service;
+
/**
* @param mapping
* @param request
@@ -39,8 +43,8 @@
String subscriberId = subscription.getStringValue("subscriber");
if (subscriberId.equals(authId)) {
- subscription.deleteRelations();
- subscription.delete();
+ service = (NewsletterSubscriptionServices)
ApplicationContextFactory.getBean("subscriptionServices");
+ service.modifyStauts(Integer.parseInt(authId),
Integer.parseInt(newsletterId), "INACTIVE");
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38265 - CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Author: billyxie
Date: 2009-08-31 12:28:08 +0200 (Mon, 31 Aug 2009)
New Revision: 38265
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
Log:
CMSC-1512 - Newsletter: Export subscription data does not work
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
2009-08-31 10:27:42 UTC (rev 38264)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
2009-08-31 10:28:08 UTC (rev 38265)
@@ -75,7 +75,7 @@
if (hasSelection) {
document.forms['operationform'].attributes['action'].value =
'SubscriptionImportExportAction.do';
- document.forms['operationform'].elements('action').value = 'export';
+ document.forms['operationform'].elements['action'].value = 'export';
document.forms['operationform'].submit();
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38264 - CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Author: billyxie
Date: 2009-08-31 12:27:42 +0200 (Mon, 31 Aug 2009)
New Revision: 38264
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
Log:
CMSC-1512 - Newsletter: Export subscription data does not work
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
2009-08-31 10:25:05 UTC (rev 38263)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
2009-08-31 10:27:42 UTC (rev 38264)
@@ -75,7 +75,7 @@
if (hasSelection) {
document.forms['operationform'].attributes['action'].value =
'SubscriptionImportExportAction.do';
- document.forms['operationform'].elements('action').value = 'export';
+ document.forms['operationform'].elements['action'].value = 'export';
document.forms['operationform'].submit();
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38262 - CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Author: billyxie
Date: 2009-08-31 12:24:49 +0200 (Mon, 31 Aug 2009)
New Revision: 38262
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
Log:
CMSC-1512 - Newsletter: Export subscription data does not work
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
2009-08-31 09:53:24 UTC (rev 38261)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_list.jsp
2009-08-31 10:24:49 UTC (rev 38262)
@@ -75,7 +75,7 @@
if (hasSelection) {
document.forms['operationform'].attributes['action'].value =
'SubscriptionImportExportAction.do';
- document.forms['operationform'].elements('action').value = 'export';
+ document.forms['operationform'].elements['action'].value = 'export';
document.forms['operationform'].submit();
}
else {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38244 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select
Author: billyxie Date: 2009-08-31 07:52:56 +0200 (Mon, 31 Aug 2009) New Revision: 38244 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp Log: CMSC-1182 - Possible to relate a content element to itself Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp 2009-08-31 03:47:38 UTC (rev 38243) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/index.jsp 2009-08-31 05:52:56 UTC (rev 38244) @@ -9,6 +9,7 @@ + @@ -46,6 +47,7 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38243 - CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl
Author: billyxie
Date: 2009-08-31 05:47:38 +0200 (Mon, 31 Aug 2009)
New Revision: 38243
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
Log:
CMSC-1182 - Can't allow to relate a content element to itself
Modified:
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
===
---
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
2009-08-31 02:53:53 UTC (rev 38242)
+++
CMSContainer/trunk/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl
2009-08-31 03:47:38 UTC (rev 38243)
@@ -479,7 +479,7 @@
function articlesearch(){
var searchtext =
document.getElementById('searchterm_<xsl:value-of
select="../comma...@name='add-item']/@cmd" />').value;
-
window.open('../../../../editors/repository/select/index.jsp?action=select&position=wizard&initsearchtext='
+ searchtext + '&type=article', 'contentselector',
getPopupPositionProps(1000,550)+',status=yes,toolbar=no,titlebar=no,scrollbars=yes,resizable=yes,menubar=no');
+
window.open('../../../../editors/repository/select/index.jsp?action=select&position=wizard&initsearchtext='
+ searchtext + '&type=article&relationOriginNode=<xsl:value-of
select="../@number" />', 'contentselector',
getPopupPositionProps(1000,550)+',status=yes,toolbar=no,titlebar=no,scrollbars=yes,resizable=yes,menubar=no');
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38242 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select
Author: billyxie Date: 2009-08-31 04:53:53 +0200 (Mon, 31 Aug 2009) New Revision: 38242 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selector.jsp Log: CMSC-1182 - Can't allow to relate a content element to itself Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selector.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selector.jsp 2009-08-30 18:57:36 UTC (rev 38241) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/selector.jsp 2009-08-31 02:53:53 UTC (rev 38242) @@ -56,7 +56,7 @@ - + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r38208 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/editors/repository webapp/editors/repository/select
Author: billyxie
Date: 2009-08-28 05:23:21 +0200 (Fri, 28 Aug 2009)
New Revision: 38208
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/content.jsp
Log:
CMSC-1182 - Possible to relate a content element to itself
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-08-27 20:27:09 UTC (rev 38207)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SearchInitAction.java
2009-08-28 03:23:21 UTC (rev 38208)
@@ -1,6 +1,7 @@
package com.finalist.cmsc.repository.forms;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -10,7 +11,8 @@
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.apache.struts.util.LabelValueBean;
-import org.mmbase.bridge.*;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.NodeManager;
import org.mmbase.storage.search.SortOrder;
import com.finalist.cmsc.repository.ContentElementUtil;
@@ -24,6 +26,7 @@
private static final String PORTLET_ID = "portletId";
private static final String POSITION = "position";
private static final String ONLYTYPE = "onlytype";
+ private static final String RELATIONORIGINNODE = "relationOriginNode";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
@@ -71,6 +74,9 @@
addToRequest(request, TITLE, searchForm.getTitle());
addToRequest(request, ONLYTYPE, onlytype);
+ String originNodeId = request.getParameter(RELATIONORIGINNODE);
+ request.getSession().setAttribute(RELATIONORIGINNODE, originNodeId);
+
return mapping.findForward(SEARCHOPTIONS);
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-08-27 20:27:09 UTC (rev 38207)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/contentsearch.jsp
2009-08-28 03:23:21 UTC (rev 38208)
@@ -491,9 +491,12 @@
'',null,null,null,'${position}')
}
-
- ();">
- " />
+
+
+();">
+ " />
+
+
', '', ''); top.close();">
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/content.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/content.jsp
2009-08-27 20:27:09 UTC (rev 38207)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/select/content.jsp
2009-08-28 03:23:21 UTC (rev 38208)
@@ -94,7 +94,11 @@
')">"/>
javascript:selectElement('', '',
'');
- ">"/>
+
+
+ ">"/>
+
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37808 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/editors/simple
Author: billyxie
Date: 2009-08-14 11:49:34 +0200 (Fri, 14 Aug 2009)
New Revision: 37808
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
Log:
CMSC-1478 - 5 Based on the FD, implement search filter function
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-14 09:14:40 UTC (rev 37807)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-14 09:49:34 UTC (rev 37808)
@@ -43,9 +43,6 @@
log.debug("Starting the simple editor");
SimpleContentActionForm simpleContentForm = (SimpleContentActionForm)
form;
- if("true".equalsIgnoreCase(request.getParameter("cleartitle"))){
- simpleContentForm.setTitle("");
- }
int resultCount = 0;
NodeList results = cloud.createNodeList();
NodeManager nodeManager =
cloud.getNodeManager(SimpleContentUtil.CONTENT_TYPE);
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-14 09:14:40 UTC (rev 37807)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-14 09:49:34 UTC (rev 37808)
@@ -38,7 +38,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37803 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/editors/simple
Author: billyxie
Date: 2009-08-14 05:54:49 +0200 (Fri, 14 Aug 2009)
New Revision: 37803
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
2009-08-14 03:49:52 UTC (rev 37802)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
2009-08-14 03:54:49 UTC (rev 37803)
@@ -42,12 +42,8 @@
} else {
workflowmessage = resources.getMessage(locale,
"simple.editor.finish.failed");
}
-
- String path = mapping.findForward(SUCCESS).getPath();
- path += "?workflowmessage=" + workflowmessage;
- ActionForward actionForward = new ActionForward(path);
- actionForward.setRedirect(false);
- return actionForward;
+ request.setAttribute("workflowmessage", workflowmessage);
+ return mapping.findForward(SUCCESS);
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
2009-08-14 03:49:52 UTC (rev 37802)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
2009-08-14 03:54:49 UTC (rev 37803)
@@ -3,16 +3,16 @@
*/
package com.finalist.cmsc.repository.forms;
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionForward;
import org.apache.struts.action.ActionMapping;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
-import org.mmbase.bridge.NodeList;
-import org.mmbase.security.implementation.cloudcontext.User;
-import com.finalist.cmsc.security.SecurityUtil;
+import com.finalist.cmsc.repository.SimpleContentUtil;
import com.finalist.cmsc.struts.MMBaseFormlessAction;
@@ -28,19 +28,8 @@
@Override
public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud)
throws Exception {
- NodeList channelList = cloud.createNodeList();
- NodeList groups =
SecurityUtil.getGroups(cloud.getNode(Integer.valueOf(((User)cloud.getUser()).getNode().getNumber(;
- for(Object obj : groups){
- Node group = (Node)obj;
- NodeList channels = group.getRelatedNodes("contentchannel",
"mmbasegrouprel", "DESTINATION");
- if(channels != null && channels.size() > 0){
-for(Object channel : channels){
- if(!channelList.contains(channel)) {
- channelList.add(channel);
- }
-}
- }
- }
+
+ List channelList =
SimpleContentUtil.getRelatedChannelsByUser(cloud);
addToRequest(request, "channelList", channelList);
addToRequest(request, "returnpath", request.getParameter("returnpath"));
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-14 03:49:52 UTC (rev 37802)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-14 03:54:49 UTC (rev 37803)
@@ -11,8 +11,8 @@
addLoadEvent(alert('${param.message}'));
-
- addLoadEvent(alert('${param.workflowmessage}'));
+
+ addLoadEvent(alert('${requestScope.workflowmessage}'));
function selectChannel(channel, returnpath){
var newDirection=document.forms[0].direction.value;
@@ -38,7 +38,7 @@
-
+
@@ -46,7 +46,7 @@
-
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37802 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
Author: billyxie
Date: 2009-08-14 05:49:52 +0200 (Fri, 14 Aug 2009)
New Revision: 37802
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
Log:
CMSC-1478 - 5 Based on the FD, implement search filter function
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-14 03:46:36 UTC (rev 37801)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-14 03:49:52 UTC (rev 37802)
@@ -7,8 +7,6 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import net.sf.mmapps.commons.util.StringUtil;
-
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -45,12 +43,9 @@
log.debug("Starting the simple editor");
SimpleContentActionForm simpleContentForm = (SimpleContentActionForm)
form;
- if (StringUtil.isEmptyOrWhitespace(request.getParameter("title"))) {
+ if("true".equalsIgnoreCase(request.getParameter("cleartitle"))){
simpleContentForm.setTitle("");
}
- else {
- simpleContentForm.setTitle(request.getParameter("title"));
- }
int resultCount = 0;
NodeList results = cloud.createNodeList();
NodeManager nodeManager =
cloud.getNodeManager(SimpleContentUtil.CONTENT_TYPE);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37801 - CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms
Author: billyxie
Date: 2009-08-14 05:46:36 +0200 (Fri, 14 Aug 2009)
New Revision: 37801
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupAction.java
Log:
CMSC-1474 - 1Based on the FD, implement adding simpled channel in the group
management page
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupAction.java
2009-08-14 02:34:57 UTC (rev 37800)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupAction.java
2009-08-14 03:46:36 UTC (rev 37801)
@@ -21,8 +21,8 @@
import org.mmbase.bridge.NodeManager;
import org.mmbase.bridge.Relation;
import org.mmbase.bridge.RelationList;
-import org.mmbase.bridge.RelationManager;
+import com.finalist.cmsc.mmbase.RelationUtil;
import com.finalist.cmsc.security.SecurityUtil;
import com.finalist.cmsc.struts.MMBaseAction;
@@ -97,11 +97,7 @@
}
if(!StringUtil.isEmpty(groupForm.getContentchannel())){
Node contentChannelNode =
cloud.getNode(groupForm.getContentchannel());
-RelationManager relationManager =
cloud.getRelationManager("mmbasegroups", "contentchannel", "mmbasegrouprel");
-if (relationManager != null) {
-Relation relation =
groupNode.createRelation(contentChannelNode, relationManager);
-relation.commit();
-}
+RelationUtil.createRelation(groupNode, contentChannelNode,
"mmbasegrouprel");
}
SecurityUtil.setGroupMembers(cloud, groupNode,
groupForm.getMembers());
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37637 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: billyxie
Date: 2009-08-10 12:03:34 +0200 (Mon, 10 Aug 2009)
New Revision: 37637
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-10 09:47:22 UTC (rev 37636)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-10 10:03:34 UTC (rev 37637)
@@ -11,6 +11,9 @@
addLoadEvent(alert('${param.message}'));
+
+ addLoadEvent(alert('${param.workflowmessage}'));
+
function selectChannel(channel, returnpath){
var newDirection=document.forms[0].direction.value;
var type=document.forms[0].order.value;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37631 - in CMSContainer/trunk: CMSContainer/cmsc/basicmodel/config/applications CMSContainer/cmsc/contentrepository/config/applications CMSContainer/cmsc/portlets/config/applications CMS
Author: billyxie Date: 2009-08-10 10:12:11 +0200 (Mon, 10 Aug 2009) New Revision: 37631 Modified: CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer/cmsc/contentrepository/config/applications/contentrepository.xml CMSContainer/trunk/CMSContainer/cmsc/portlets/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer/cmsc/sitemanagement/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/contentrepository.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Demo/demo.cmscontainer.org/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/i18n-demo/war/src/webapp/WEB-INF/config/applications/cmscimpl.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/basecontentelements.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/cmscportlets.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/contentrepository.xml CMSContainer/trunk/CMSContainer_Demo/www.cmscontainer.org/war-live/src/webapp/WEB-INF/config/applications/sitemanagement.xml CMSContainer/trunk/CMSContainer_Modules/alias/config/applications/alias.xml CMSContainer/trunk/CMSContainer_Modules/directreaction/config/applications/reaction.xml CMSContainer/trunk/CMSContainer_Modules/fileupload/config/applications/fileupload.xml CMSContainer/trunk/CMSContainer_Modules/glossary/config/applications/glossary.xml CMSContainer/trunk/CMSContainer_Modules/linkvalidator/config/applications/linkvalidator.xml CMSContainer/trunk/CMSContainer_Modules/pagewizard/config/applications/pagewizard.xml CMSContainer/trunk/CMSContainer_Modules/rating/config/applications/rating.xml CMSContainer/trunk/CMSContainer_Modules/rssfeed/config/applications/rssfeed.xml CMSContainer/trunk/CMSContainer_Modules/subsite/config/applications/subsite.xml CMSContainer/trunk/CMSContainer_Modules/tasks/config/applications/tasks.xml CMSContainer/trunk/CMSContainer_Modules/versioning/config/applications/versioning.xml CMSContainer/trunk/CMSContainer_Modules/workflow/config/applications/workflow.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-banner/config/applications/banner.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-calendar/config/applications/calendar.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-dynamicforms/config/applications/responseform.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-ecard/config/applications/ecard.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-emailalert/config/applications/emailalert.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-gallery/config/applications/gallery.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-gallery2/config/applications/gallery2.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-googlemap/config/googlemap.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-guestbook/config/applications/guestbook.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-maileditors/config/applications/reactform.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-mailfriend/config/applications/mailfriend.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-playlist/config/applications/playlist.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-poll/config/applications/poll.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-tagcloud/config/applications/tagcloud.xml CMSContainer/trunk/CMSContainer_Portlets/portlets-teaser/config/applications/teasers.xml Log: CMSC-1474 - 1Based on the FD, implement adding simpled channel in the group management page Modified: CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml === --- CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml 2009-08-10 08:04:59 UTC (rev 37630) +++ CMSContainer/trunk/CMSContainer/cmsc/basicmodel/config/applications/basecontentelements.xml 2009-08-10 08:12:11 UTC (rev 37631) @@ -3,7 +3,7
[MMBASE SCM] r37628 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: billyxie Date: 2009-08-10 08:51:33 +0200 (Mon, 10 Aug 2009) New Revision: 37628 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp Log: CMSC-1477 - 4 Based on the FD, implement the main function in simple editor overview page: edit, preview, workfolw, sorting, pageing Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp 2009-08-10 06:08:16 UTC (rev 37627) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp 2009-08-10 06:51:33 UTC (rev 37628) @@ -1,7 +1,7 @@ -<%...@page language="java" contentType="text/html;charset=utf-8"%> -<%...@include file="globals.jsp" %> -<%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" %> - +<%...@page language="java" contentType="text/html;charset=utf-8" +%><%...@include file="globals.jsp" +%><%@ taglib prefix="edit" tagdir="/WEB-INF/tags/edit" +%> http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37627 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository: resources src/java/com/finalist/cmsc/repository/forms
Author: billyxie Date: 2009-08-10 08:08:16 +0200 (Mon, 10 Aug 2009) New Revision: 37627 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java Log: CMSC-1477 - 4 Based on the FD, implement the main function in simple editor overview page: edit, preview, workfolw, sorting, pageing Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-08-10 04:19:12 UTC (rev 37626) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-08-10 06:08:16 UTC (rev 37627) @@ -520,4 +520,6 @@ simple.editor.list.date.field = date simple.editor.list.channel.field = placed in simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about complicated tasks such as publishing. In short they should be able to make content for a page without knowing anything more about the CMSc.For these types of users we would like to make a very simple editor with only the most basic functions for creating content. Its important that these users never have to come in contact with the inner workings of the CMSc. Thus we need locate this new functions outside the normal /editors environment. -simple.editor.send = Send this article to the webmaster for publication \ No newline at end of file +simple.editor.send = Send this article to the webmaster for publication +simple.editor.finish.success=It is successful to send this article to the webmaster for publication. +simple.editor.finish.failed=It is failed to send this article to the webmaster for publication. \ No newline at end of file Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-08-10 04:19:12 UTC (rev 37626) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-08-10 06:08:16 UTC (rev 37627) @@ -516,4 +516,6 @@ simple.editor.list.date.field = date simple.editor.list.channel.field = placed in simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about complicated tasks such as publishing. In short they should be able to make content for a page without knowing anything more about the CMSc.For these types of users we would like to make a very simple editor with only the most basic functions for creating content. Its important that these users never have to come in contact with the inner workings of the CMSc. Thus we need locate this new functions outside the normal /editors environment. -simple.editor.send = Stuur dit artikel naar de webmaster om gepubliceerd te worden \ No newline at end of file +simple.editor.send = Stuur dit artikel naar de webmaster om gepubliceerd te worden +simple.editor.finish.success=It is successful to send this article to the webmaster for publication. +simple.editor.finish.failed=It is failed to send this article to the webmaster for publication. \ No newline at end of file Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-08-10 04:19:12 UTC (rev 37626) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-08-10 06:08:16 UTC (rev 37627) @@ -521,4 +521,6 @@ simple.editor.list.date.field = 创建时间 simple.editor.list.channel.field = 频道 simple.editor.introduction.text = The editors environment of the CMSc is to complex for some users. Users that only need to make content for a set of predefined pages and does not want to know anything about complicated tasks such as publishing. In short they should be able to make content for a page without knowing anything more about the CMSc.For these types of users we would like to make a very simple editor with only the most basic functions for creating content. Its important that these users never
[MMBASE SCM] r37625 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: billyxie
Date: 2009-08-10 05:09:01 +0200 (Mon, 10 Aug 2009)
New Revision: 37625
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-10 02:43:40 UTC (rev 37624)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-10 03:09:01 UTC (rev 37625)
@@ -6,18 +6,21 @@
-
-
- function selectChannel(channel, returnpath){
- var newDirection=document.forms[0].direction.value;
- var type=document.forms[0].order.value;
- var offset = document.forms[0].offset.value;
- var pagerDOToffset = '';
- var pagepath = document.location.toString().substr(0,
document.location.toString().indexOf("editors"));
- pagepath +=
"editors/repository/MoveContentFromSearch.do?returnpath=" + returnpath +
"&newparentchannel=" + channel + "&objectnumber=" +
moveContentNumber+"&orderby="+type+"&direction="+newDirection+'&offset='+offset+'&pager.offset='+pagerDOToffset;
- document.location = pagepath;
- }
-
+
+
+ <c:if test="${not empty param.message}">
+ addLoadEvent(alert('${param.message}'));
+ </c:if>
+ function selectChannel(channel, returnpath){
+ var newDirection=document.forms[0].direction.value;
+ var type=document.forms[0].order.value;
+ var offset = document.forms[0].offset.value;
+ var pagerDOToffset = '';
+ var pagepath = document.location.toString().substr(0,
document.location.toString().indexOf("editors"));
+ pagepath += "editors/repository/MoveContentFromSearch.do?returnpath="
+ returnpath + "&newparentchannel=" + channel + "&objectnumber=" +
moveContentNumber+"&orderby="+type+"&direction="+newDirection+'&offset='+offset+'&pager.offset='+pagerDOToffset;
+ document.location = pagepath;
+ }
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37597 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: billyxie
Date: 2009-08-07 10:56:24 +0200 (Fri, 07 Aug 2009)
New Revision: 37597
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp
2009-08-07 08:52:05 UTC (rev 37596)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp
2009-08-07 08:56:24 UTC (rev 37597)
@@ -5,21 +5,38 @@
http://www.w3.org/TR/xhtml1/DTD/xhtml1-frameset.dtd";>
-
-
- function selectItem(channel, path) {
-opener.selectChannel(channel, path, '${param.fieldName}',
'${param.fieldPathName}');
-close();
- }
-
+
+
+
+ body
+ {
+ font-family: Tahoma, Verdana, Arial, Helvetica, sans-serif;
+ font-size: 12px;
+ font-weight: normal;
+ margin: 0px;
+ overflow: hidden;
+ }
+ table.listcontent {
+ padding: 2px;
+ vertical-align: top;
+ width: 100%;
+ }
+
+
+
+ function selectItem(channel, path) {
+ opener.selectChannel(channel, path, '${param.fieldName}',
'${param.fieldPathName}');
+ close();
+ }
+
-
+
- class="swap"
onmousedown="javascript:selectItem(,'${returnpath}')">
+ class="itemrow odd" class="itemrow even"
onmousedown="javascript:selectItem(,'${returnpath}')">
${swap+1}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37593 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/editors/simple
Author: billyxie
Date: 2009-08-07 10:09:49 +0200 (Fri, 07 Aug 2009)
New Revision: 37593
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentDraftAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentReadyAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-07 07:48:44 UTC (rev 37592)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-07 08:09:49 UTC (rev 37593)
@@ -1,6 +1,5 @@
package com.finalist.cmsc.repository.forms;
-
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -36,78 +35,109 @@
public abstract class SimpleContentAction extends PagerAction {
- private static final Logger log = Logging
- .getLoggerInstance(SimpleContentAction.class.getName());
-
+ private static final Logger log =
Logging.getLoggerInstance(SimpleContentAction.class.getName());
+ protected static final String SYSTEM_SIMPLEEDITOR_CONTENTTYPES =
"system.simpleeditor.contenttypes";
+
@Override
- public ActionForward execute(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response, Cloud cloud)
- throws Exception {
+ public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
+ HttpServletResponse response, Cloud cloud) throws Exception {
log.debug("Starting the simple editor");
SimpleContentActionForm simpleContentForm = (SimpleContentActionForm)
form;
- if(StringUtil.isEmptyOrWhitespace(request.getParameter("title"))){
+ if (StringUtil.isEmptyOrWhitespace(request.getParameter("title"))) {
simpleContentForm.setTitle("");
- } else {
+ }
+ else {
simpleContentForm.setTitle(request.getParameter("title"));
}
int resultCount = 0;
NodeList results = cloud.createNodeList();
NodeManager nodeManager =
cloud.getNodeManager(SimpleContentUtil.CONTENT_TYPE);
- NodeQuery query = SimpleContentUtil.createQuery(cloud,nodeManager);
-
- doAction(query,form,request,cloud);
-
+ NodeQuery query = SimpleContentUtil.createQuery(cloud, nodeManager);
+
+ doAction(query, form, request, cloud);
+
if (StringUtils.isNotEmpty(simpleContentForm.getTitle())) {
Field field = nodeManager.getField(ContentElementUtil.TITLE_FIELD);
- Constraint titleConstraint = SearchUtil.createLikeConstraint(query,
- field, simpleContentForm.getTitle());
+ Constraint titleConstraint = SearchUtil.createLikeConstraint(query,
field,
+ simpleContentForm.getTitle());
SearchUtil.addConstraint(query, titleConstraint);
}
-
+
int offset = 0;
if (StringUtils.isNotEmpty(simpleContentForm.getOffset())) {
offset = Integer.valueOf(simpleContentForm.getOffset());
}
-
- String resultsPerPage =
PropertiesUtil.getProperty(SimpleContentUtil.REPOSITORY_SEARCH_RESULTS_PER_PAGE);
+
+ String resultsPerPage = PropertiesUtil
+.getProperty(SimpleContentUtil.REPOSITORY_SEARCH_RESULTS_PER_PAGE);
if (resultsPerPage == null || !resultsPerPage.matches("\\d+")) {
resultsPerPage = SimpleContentUtil.DEFAULT_SIZE_PER_PAGE;
}
int maxNumber = Integer.parseInt(resultsPerPage);
-
+
String order = simpleContentForm.getOrder();
-
+
if (StringUtils.isNotEmpty(order) && "otype".equalsIgnoreCase(order)) {
- SearchUtil.addLimitConstraint(query, SearchQuery.DEFAULT_OFFSET,
SearchQuery.DEFAULT_MAX_NUMBER);
+ SearchUtil.addLimitConstraint(query, SearchQuery.DEFAULT_OFFSET,
+ SearchQuery.DEFAULT_MAX_NUMBER);
results = query.getNodeManager().getList(query);
boolean reverse = false;
if (simpleContentForm.getDirection() == 1) {
reverse = true;
}
resultCount = results.size();
-
[MMBASE SCM] r37590 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/WEB-INF webapp/editors/simple
Author: billyxie
Date: 2009-08-07 09:16:09 +0200 (Fri, 07 Aug 2009)
New Revision: 37590
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentFromSearchAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentFromSearchAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentFromSearchAction.java
2009-08-07 06:47:12 UTC (rev 37589)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentFromSearchAction.java
2009-08-07 07:16:09 UTC (rev 37590)
@@ -17,6 +17,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.mmapps.commons.util.StringUtil;
+
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -36,13 +38,12 @@
public class MoveContentFromSearchAction extends MMBaseAction {
- private static final String FROM = "from";
+ private static final String RETURNPATH = "returnpath";
private static final String PARAMETER_NEW_CHANNEL = "newparentchannel";
private static final String PARAMETER_NUMBER = "objectnumber";
private static final String PARAMETER_PAGING_ODERBY = "orderby";
private static final String PARAMETER_PAGING_OFFSET = "offset";
private static final String PARAMETER_PAGING_DIRECTION = "direction";
- private static final String SIMPLEEDITOR = "simpleeditor";
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
@@ -131,8 +132,8 @@
}
}
String path = null;
- if(SIMPLEEDITOR.equalsIgnoreCase(request.getParameter(FROM))){
- path = mapping.findForward(SIMPLEEDITOR).getPath() + "?index=yes";
+ if(!StringUtil.isEmptyOrWhitespace((request.getParameter(RETURNPATH{
+ path =
mapping.findForward(request.getParameter(RETURNPATH)).getPath() + "?index=yes";
} else {
path = mapping.findForward(SUCCESS).getPath() + "?index=yes";
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
2009-08-07 06:47:12 UTC (rev 37589)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
2009-08-07 07:16:09 UTC (rev 37590)
@@ -42,6 +42,7 @@
}
}
addToRequest(request, "channelList", channelList);
+ addToRequest(request, "returnpath", request.getParameter("returnpath"));
return mapping.findForward(SUCCESS);
}
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-08-07 06:47:12 UTC (rev 37589)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-08-07 07:16:09 UTC (rev 37590)
@@ -284,7 +284,8 @@
-
+
+
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp
2009-08-07 06:47:12 UTC (rev 37589)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.
[MMBASE SCM] r37585 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/editors/simple
Author: billyxie
Date: 2009-08-07 05:36:37 +0200 (Fri, 07 Aug 2009)
New Revision: 37585
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
Log:
CMSC-1478 - 5 Based on the FD, implement search filter function
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-07 02:50:55 UTC (rev 37584)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentAction.java
2009-08-07 03:36:37 UTC (rev 37585)
@@ -8,6 +8,8 @@
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+import net.sf.mmapps.commons.util.StringUtil;
+
import org.apache.commons.lang.StringUtils;
import org.apache.struts.action.ActionForm;
import org.apache.struts.action.ActionForward;
@@ -45,6 +47,11 @@
log.debug("Starting the simple editor");
SimpleContentActionForm simpleContentForm = (SimpleContentActionForm)
form;
+ if(StringUtil.isEmptyOrWhitespace(request.getParameter("title"))){
+ simpleContentForm.setTitle("");
+ } else {
+ simpleContentForm.setTitle(request.getParameter("title"));
+ }
int resultCount = 0;
NodeList results = cloud.createNodeList();
NodeManager nodeManager =
cloud.getNodeManager(SimpleContentUtil.CONTENT_TYPE);
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-07 02:50:55 UTC (rev 37584)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-07 03:36:37 UTC (rev 37585)
@@ -67,6 +67,8 @@
+
+">
@@ -84,8 +86,6 @@
-
- ">
@@ -180,8 +180,8 @@
-
+
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-07 02:50:55 UTC (rev 37584)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-07 03:36:37 UTC (rev 37585)
@@ -18,6 +18,8 @@
+
+">
@@ -35,8 +37,6 @@
-
- ">
@@ -124,9 +124,9 @@
-
+
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37584 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple
Author: billyxie Date: 2009-08-07 04:50:55 +0200 (Fri, 07 Aug 2009) New Revision: 37584 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp Log: CMSC-1478 - 5 Based on the FD, implement search filter function Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp 2009-08-06 21:56:23 UTC (rev 37583) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp 2009-08-07 02:50:55 UTC (rev 37584) @@ -81,12 +81,11 @@ <%-- Now print the results --%> - "> - - + + "> Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp 2009-08-06 21:56:23 UTC (rev 37583) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp 2009-08-07 02:50:55 UTC (rev 37584) @@ -32,13 +32,11 @@ <%-- Now print the results --%> - "> - - - + + "> ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37557 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/WEB-INF webapp/editors/simple
Author: billyxie
Date: 2009-08-06 13:17:24 +0200 (Thu, 06 Aug 2009)
New Revision: 37557
Added:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Added:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
2009-08-06 11:17:24 UTC (rev 37557)
@@ -0,0 +1,38 @@
+/**
+ *
+ */
+package com.finalist.cmsc.repository.forms;
+
+import javax.servlet.http.HttpServletRequest;
+
+import net.sf.mmapps.commons.util.StringUtil;
+
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.mmbase.bridge.Cloud;
+
+import com.finalist.cmsc.services.workflow.Workflow;
+import com.finalist.cmsc.struts.MMBaseFormlessAction;
+
+
+/**
+ * @author Billy
+ *
+ */
+public class SimpleContentWorkflowAction extends MMBaseFormlessAction {
+
+ /* (non-Javadoc)
+* @see
com.finalist.cmsc.struts.MMBaseFormlessAction#execute(org.apache.struts.action.ActionMapping,
javax.servlet.http.HttpServletRequest, org.mmbase.bridge.Cloud)
+*/
+ @Override
+ public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud)
+ throws Exception {
+ String content = request.getParameter("content");
+ if(!StringUtil.isEmptyOrWhitespace(content)){
+ Workflow.finish(cloud.getNode(content), "");
+ }
+
+ return mapping.findForward(SUCCESS);
+ }
+
+}
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleContentWorkflowAction.java
___
Name: svn:mime-type
+ text/plain
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-08-06 10:08:15 UTC (rev 37556)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-08-06 11:17:24 UTC (rev 37557)
@@ -310,6 +310,10 @@
unknown="false" validate="false">
+
+
+
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-06 10:08:15 UTC (rev 37556)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
2009-08-06 11:17:24 UTC (rev 37557)
@@ -133,7 +133,9 @@
"
target="_blank">" title="" />
- );">" title="" />
+
+
+ " >" title="" />
, ${channelNumber} )" target="selectchannel" href="
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-06 10:08:15 UTC (rev 37556)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
2009-08-06 11:17:24 UTC (rev 37557)
@@ -84,9 +84,6 @@
"
target="_blank">" title="" />
-
- );">" title="" />
-
, ${channelNumber} )" target="selectchannel" href="
" >
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37554 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository: . src/java/com/finalist/cmsc/repository/forms src/webapp/WEB-INF src/webapp/editors/simple
Author: billyxie
Date: 2009-08-06 11:37:36 +0200 (Thu, 06 Aug 2009)
New Revision: 37554
Added:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/channellist.jsp
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/project.xml
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/draftlist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/readylist.jsp
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/project.xml
===
--- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/project.xml
2009-08-06 09:35:10 UTC (rev 37553)
+++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/project.xml
2009-08-06 09:37:36 UTC (rev 37554)
@@ -12,13 +12,13 @@
CMS Container contentrepository
CMS Container contentrepository
-
+
finalist
cmsc-servicemanagement
${cmsc.version}
jar
-
+
finalist
cmsc-security
${cmsc.version}
@@ -37,24 +37,30 @@
jar
-
+
mmbase
mmbase
${mmbase.version}
jar
-
+
mmbase
mmbase-editwizard
${mmbase.version}
jar
-
+
mmbase
mmbase-crontab
${mmbase.version}
jar
+
+ mmbase
+ mmbase-cloudcontext
+ ${mmbase.version}
+ jar
+
Added:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
(rev 0)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/SimpleEditorChannelAction.java
2009-08-06 09:37:36 UTC (rev 37554)
@@ -0,0 +1,49 @@
+/**
+ *
+ */
+package com.finalist.cmsc.repository.forms;
+
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.Node;
+import org.mmbase.bridge.NodeList;
+import org.mmbase.security.implementation.cloudcontext.User;
+
+import com.finalist.cmsc.security.SecurityUtil;
+import com.finalist.cmsc.struts.MMBaseFormlessAction;
+
+
+/**
+ * @author Billy
+ *
+ */
+public class SimpleEditorChannelAction extends MMBaseFormlessAction {
+
+ /* (non-Javadoc)
+* @see
com.finalist.cmsc.struts.MMBaseFormlessAction#execute(org.apache.struts.action.ActionMapping,
javax.servlet.http.HttpServletRequest, org.mmbase.bridge.Cloud)
+*/
+ @Override
+ public ActionForward execute(ActionMapping mapping, HttpServletRequest
request, Cloud cloud)
+ throws Exception {
+ NodeList channelList = cloud.createNodeList();
+ NodeList groups =
SecurityUtil.getGroups(cloud.getNode(Integer.valueOf(((User)cloud.getUser()).getNode().getNumber(;
+ for(Object obj : groups){
+ Node group = (Node)obj;
+ NodeList channels = group.getRelatedNodes("contentchannel",
"mmbasegrouprel", "DESTINATION");
+ if(channels != null && channels.size() > 0){
+for(Object channel : channels){
+ if(!channelList.contains(channel)) {
+ channelList.add(channel);
+ }
+}
+ }
+ }
+ addToRequest(request, "channelList", channelList);
+
+ return mapping.findForward(SUCCESS);
+ }
+
+}
Property changes on:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/c
[MMBASE SCM] r37520 - in CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src: java/com/finalist/cmsc/repository/forms webapp/WEB-INF webapp/editors/simple
Author: billyxie
Date: 2009-08-05 12:29:25 +0200 (Wed, 05 Aug 2009)
New Revision: 37520
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentFromSearchAction.java
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
Log:
CMSC-1477 - 4 Based on the FD, implement the main function in simple editor
overview page: edit, preview, workfolw, sorting, pageing
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentFromSearchAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentFromSearchAction.java
2009-08-05 10:01:41 UTC (rev 37519)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/MoveContentFromSearchAction.java
2009-08-05 10:29:25 UTC (rev 37520)
@@ -36,13 +36,14 @@
public class MoveContentFromSearchAction extends MMBaseAction {
+ private static final String FROM = "from";
private static final String PARAMETER_NEW_CHANNEL = "newparentchannel";
private static final String PARAMETER_NUMBER = "objectnumber";
private static final String PARAMETER_PAGING_ODERBY = "orderby";
private static final String PARAMETER_PAGING_OFFSET = "offset";
private static final String PARAMETER_PAGING_DIRECTION = "direction";
+ private static final String SIMPLEEDITOR = "simpleeditor";
-
@Override
public ActionForward execute(ActionMapping mapping, ActionForm form,
HttpServletRequest request,
HttpServletResponse response, Cloud cloud) throws Exception {
@@ -129,7 +130,12 @@
message += resources.getMessage(locale,
"content.massmovetochannel.failed", failureCount,
newChannelNode.getStringValue("name"));
}
}
- String path = mapping.findForward(SUCCESS).getPath() + "?index=yes";
+ String path = null;
+ if(SIMPLEEDITOR.equalsIgnoreCase(request.getParameter(FROM))){
+ path = mapping.findForward(SIMPLEEDITOR).getPath() + "?index=yes";
+ } else {
+ path = mapping.findForward(SUCCESS).getPath() + "?index=yes";
+ }
if(StringUtils.isNotEmpty(offset)) {
path += "&offset="+offset;
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-08-05 10:01:41 UTC (rev 37519)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
2009-08-05 10:29:25 UTC (rev 37520)
@@ -284,6 +284,7 @@
+
Modified:
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
===
---
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-05 10:01:41 UTC (rev 37519)
+++
CMSContainer/trunk/CMSContainer/cmsc/contentrepository/src/webapp/editors/simple/simplecontent.jsp
2009-08-05 10:29:25 UTC (rev 37520)
@@ -6,12 +6,23 @@
+
+
+ function selectChannel(channel, path){
+ var newDirection=document.forms[0].direction.value;
+ var type=document.forms[0].order.value;
+ var offset = document.forms[0].offset.value;
+ var pagerDOToffset = '';
+ var path = document.location.toString().substr(0,
document.location.toString().indexOf("editors"));
+ path +=
"editors/repository/MoveContentFromSearch.do?from=simpleeditor&newparentchannel="
+ channel + "&objectnumber=" +
moveContentNumber+"&orderby="+type+"&direction="+newDirection+'&offset='+offset+'&pager.offset='+pagerDOToffset;
+ document.location = path;
+ }
+
<%=request.getParameter("draftPager.offset")%>
<%=request.getParameter("finishedPager.offset")%>
-
@@ -54,11 +65,11 @@
-
<%-- Now print the results --%>
+
@@ -83,7 +94,6 @@
-
@@ -98,8 +10
[MMBASE SCM] r37514 - CMSContainer/trunk/CMSContainer/cmsc/contentrepository/config/applications
Author: billyxie Date: 2009-08-05 10:41:49 +0200 (Wed, 05 Aug 2009) New Revision: 37514 Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/config/applications/contentrepository.xml Log: CMSC-1474 - 1Based on the FD, implement adding simpled channel in the group management page Modified: CMSContainer/trunk/CMSContainer/cmsc/contentrepository/config/applications/contentrepository.xml === --- CMSContainer/trunk/CMSContainer/cmsc/contentrepository/config/applications/contentrepository.xml 2009-08-05 08:02:26 UTC (rev 37513) +++ CMSContainer/trunk/CMSContainer/cmsc/contentrepository/config/applications/contentrepository.xml 2009-08-05 08:41:49 UTC (rev 37514) @@ -29,6 +29,7 @@ + @@ -39,6 +40,7 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37513 - in CMSContainer/trunk/CMSContainer/cmsc/security: resources src/java/com/finalist/cmsc/security/forms src/webapp/editors/usermanagement
Author: billyxie
Date: 2009-08-05 10:02:26 +0200 (Wed, 05 Aug 2009)
New Revision: 37513
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupAction.java
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupForm.java
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupInitAction.java
CMSContainer/trunk/CMSContainer/cmsc/security/src/webapp/editors/usermanagement/group.jsp
Log:
CMSC-1474 - 1Based on the FD, implement adding simpled channel in the group
management page
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties
2009-08-05 07:51:28 UTC (rev 37512)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security.properties
2009-08-05 08:02:26 UTC (rev 37513)
@@ -28,6 +28,7 @@
group.title=Group
group.name=Name
group.description=Description
+group.simpleeditorchannel=Simple ed. channel:
group.members=Members
group.nonmembers=Users
group.submit=Save
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties
2009-08-05 07:51:28 UTC (rev 37512)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_nl.properties
2009-08-05 08:02:26 UTC (rev 37513)
@@ -28,6 +28,7 @@
group.title=Groep
group.name=Naam
group.description=Omschrijving
+group.simpleeditorchannel=Simple ed. channel:
group.members=Leden
group.nonmembers=Gebruikers
group.submit=Opslaan
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties
===
---
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties
2009-08-05 07:51:28 UTC (rev 37512)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/resources/cmsc-security_zh.properties
2009-08-05 08:02:26 UTC (rev 37513)
@@ -28,6 +28,7 @@
group.title=组
group.name=姓名
group.description=描述
+group.simpleeditorchannel=简单编辑频道:
group.members=组员
group.nonmembers=用户
group.submit=保存
Modified:
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupAction.java
===
---
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupAction.java
2009-08-05 07:51:28 UTC (rev 37512)
+++
CMSContainer/trunk/CMSContainer/cmsc/security/src/java/com/finalist/cmsc/security/forms/GroupAction.java
2009-08-05 08:02:26 UTC (rev 37513)
@@ -1,18 +1,30 @@
package com.finalist.cmsc.security.forms;
-import com.finalist.cmsc.security.SecurityUtil;
-import com.finalist.cmsc.struts.MMBaseAction;
-import org.apache.struts.action.*;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.mmapps.commons.util.StringUtil;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
import org.apache.struts.util.LabelValueBean;
import org.mmbase.bridge.Cloud;
import org.mmbase.bridge.Node;
import org.mmbase.bridge.NodeList;
+import org.mmbase.bridge.NodeManager;
+import org.mmbase.bridge.Relation;
+import org.mmbase.bridge.RelationList;
+import org.mmbase.bridge.RelationManager;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
+import com.finalist.cmsc.security.SecurityUtil;
+import com.finalist.cmsc.struts.MMBaseAction;
/**
* GroupAction
@@ -76,6 +88,22 @@
groupNode.setStringValue("description", groupForm.getDescription());
groupNode.commit();
+
+ NodeManager nodeManager = cloud.getNodeManager("contentchannel");
+ RelationList relationList = groupNode.getRelations("mmbasegrouprel",
nodeManager, "destination");
+ if(relationList != null && relationList.size() > 0){
+Relation relation = (Relation) relationList.getRelation(0);
+relation.del
[MMBASE SCM] r37429 - CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources
Author: billyxie Date: 2009-08-03 08:59:57 +0200 (Mon, 03 Aug 2009) New Revision: 37429 Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties Log: CMSC-1486 - A key of fmt don't get its message Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties === --- CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-08-03 05:33:08 UTC (rev 37428) +++ CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties 2009-08-03 06:59:57 UTC (rev 37429) @@ -278,6 +278,7 @@ attachmentform.submit=Search attachmentsearch.titlecolumn=Title attachmentsearch.filenamecolumn=Filename +attachmentsearch.filesizecolumn=File size attachmentsearch.mimetypecolumn=Mime type attachmentsearch.icon.delete=Delete attachment attachmentsearch.icon.edit=Edit attachment Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties === --- CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-08-03 05:33:08 UTC (rev 37428) +++ CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties 2009-08-03 06:59:57 UTC (rev 37429) @@ -278,6 +278,7 @@ attachmentform.submit=Zoek attachmentsearch.titlecolumn=Titel attachmentsearch.filenamecolumn=Bestandsnaam +attachmentsearch.filesizecolumn=Bestandsgrootte attachmentsearch.mimetypecolumn=Mime type attachmentsearch.icon.delete=Verwijder bijlage attachmentsearch.icon.edit=Bewerk bijlage Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties === --- CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-08-03 05:33:08 UTC (rev 37428) +++ CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties 2009-08-03 06:59:57 UTC (rev 37429) @@ -277,6 +277,7 @@ attachmentform.submit=查询 attachmentsearch.titlecolumn=标题 attachmentsearch.filenamecolumn=文件名 +attachmentsearch.filesizecolumn=文件大小 attachmentsearch.mimetypecolumn=Mime 类型 attachmentsearch.icon.delete=删除附件 attachmentsearch.icon.edit=编辑附件 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37392 - in CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src: java/com/finalist/cmsc/portlets webapp/WEB-INF/templates/view/login
Author: billyxie
Date: 2009-07-31 11:13:24 +0200 (Fri, 31 Jul 2009)
New Revision: 37392
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
Log:
CMSC-1354 - LoginPortlet: Make it possible to link to registration page
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
2009-07-31 09:12:54 UTC (rev 37391)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
2009-07-31 09:13:24 UTC (rev 37392)
@@ -12,7 +12,6 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -26,7 +25,6 @@
import org.mmbase.bridge.util.SearchUtil;
import com.finalist.cmsc.mmbase.RelationUtil;
-import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.security.Authentication;
@@ -42,7 +40,6 @@
protected static final String EMAIL_FROMEMAIL = "emailFromEmail";
protected static final String EMAIL_FROMNAME = "emailFromName";
protected static final String REGISTRATIONPAGE = "registrationpage";
- protected static final String REGISTRATIONPAGEPATH = "registrationpagepath";
protected static final String PAGE = "page";
private static final Log log =
LogFactory.getLog(AbstractLoginPortlet.class);
@@ -76,15 +73,6 @@
setPortletNodeParameter(portletId, PAGE, request.getParameter(PAGE));
String registrationpage = request.getParameter(REGISTRATIONPAGE);
setPortletNodeParameter(portletId, REGISTRATIONPAGE,
registrationpage);
- if(StringUtils.isNotEmpty(registrationpage)){
-Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
-String registrationpagepath =
NavigationUtil.getNavigationItemUrl((HttpServletRequest)request,
(HttpServletResponse)response,
cloud.getNode(Integer.valueOf(registrationpage)));
-if(registrationpagepath != null){
- setPortletParameter(portletId, REGISTRATIONPAGEPATH,
registrationpagepath);
-}
- } else {
-setPortletParameter(portletId, REGISTRATIONPAGEPATH, "");
- }
setPortletParameter(portletId, EMAIL_SUBJECT,
request.getParameter(EMAIL_SUBJECT));
setPortletParameter(portletId, EMAIL_TEXT,
request.getParameter(EMAIL_TEXT));
setPortletParameter(portletId, EMAIL_FROMEMAIL,
request.getParameter(EMAIL_FROMEMAIL));
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
===
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
2009-07-31 09:12:54 UTC (rev 37391)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
2009-07-31 09:13:24 UTC (rev 37392)
@@ -22,10 +22,14 @@
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
+
+import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
+import org.mmbase.bridge.Cloud;
+
import com.finalist.cmsc.login.PasswordGenerator;
import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
@@ -36,7 +40,6 @@
import com.finalist.cmsc.services.community.security.Authentication;
import com.finalist.cmsc.services.community.security.AuthenticationService;
import com.finalist.cmsc.util.EmailSender;
-import org.mmbase.bridge.Cloud;
/**
* Login portlet
@@ -183,11 +186,6 @@
String template;
String error = request.getParameter(ERRORMESSAGE);
String send_password = request.getParameter(SEND_PASSWORD);
- PortletPreferences preferences = request.getPreferences(
[MMBASE SCM] r37391 - in CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src: java/com/finalist/cmsc/portlets webapp/WEB-INF/templates/view/login
Author: billyxie
Date: 2009-07-31 11:12:54 +0200 (Fri, 31 Jul 2009)
New Revision: 37391
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
Log:
CMSC-1354 - LoginPortlet: Make it possible to link to registration page
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
2009-07-31 09:12:09 UTC (rev 37390)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
2009-07-31 09:12:54 UTC (rev 37391)
@@ -12,7 +12,6 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -26,7 +25,6 @@
import org.mmbase.bridge.util.SearchUtil;
import com.finalist.cmsc.mmbase.RelationUtil;
-import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.security.Authentication;
@@ -42,7 +40,6 @@
protected static final String EMAIL_FROMEMAIL = "emailFromEmail";
protected static final String EMAIL_FROMNAME = "emailFromName";
protected static final String REGISTRATIONPAGE = "registrationpage";
- protected static final String REGISTRATIONPAGEPATH = "registrationpagepath";
protected static final String PAGE = "page";
private static final Log log =
LogFactory.getLog(AbstractLoginPortlet.class);
@@ -76,15 +73,6 @@
setPortletNodeParameter(portletId, PAGE, request.getParameter(PAGE));
String registrationpage = request.getParameter(REGISTRATIONPAGE);
setPortletNodeParameter(portletId, REGISTRATIONPAGE,
registrationpage);
- if(StringUtils.isNotEmpty(registrationpage)){
-Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
-String registrationpagepath =
NavigationUtil.getNavigationItemUrl((HttpServletRequest)request,
(HttpServletResponse)response,
cloud.getNode(Integer.valueOf(registrationpage)));
-if(registrationpagepath != null){
- setPortletParameter(portletId, REGISTRATIONPAGEPATH,
registrationpagepath);
-}
- } else {
-setPortletParameter(portletId, REGISTRATIONPAGEPATH, "");
- }
setPortletParameter(portletId, EMAIL_SUBJECT,
request.getParameter(EMAIL_SUBJECT));
setPortletParameter(portletId, EMAIL_TEXT,
request.getParameter(EMAIL_TEXT));
setPortletParameter(portletId, EMAIL_FROMEMAIL,
request.getParameter(EMAIL_FROMEMAIL));
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
2009-07-31 09:12:09 UTC (rev 37390)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
2009-07-31 09:12:54 UTC (rev 37391)
@@ -185,11 +185,7 @@
String template;
String error = request.getParameter(ERRORMESSAGE);
String send_password = request.getParameter(SEND_PASSWORD);
- PortletPreferences preferences = request.getPreferences();
- String registrationpagepath = preferences.getValue(REGISTRATIONPAGEPATH,
null);
- if(StringUtils.isNotEmpty(registrationpagepath)){
- request.setAttribute(REGISTRATIONPAGEPATH, registrationpagepath);
- }
+
if (StringUtils.isNotBlank(error)) {
request.setAttribute(ERRORMESSAGE, error);
}
Modified:
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
===
---
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
2009-07-31 09:12:09 UTC (rev 37390)
+++
CMSContainer/trunk/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
2009-07-31 09:12:54 UTC (rev 37391)
@@ -28,8 +28,8 @@
" />
[MMBASE SCM] r37390 - in CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src: java/com/finalist/cmsc/portlets webapp/WEB-INF/templates/view/login
Author: billyxie
Date: 2009-07-31 11:12:09 +0200 (Fri, 31 Jul 2009)
New Revision: 37390
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
Log:
CMSC-1354 - LoginPortlet: Make it possible to link to registration page
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
2009-07-31 09:00:11 UTC (rev 37389)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/AbstractLoginPortlet.java
2009-07-31 09:12:09 UTC (rev 37390)
@@ -12,7 +12,6 @@
import javax.portlet.RenderRequest;
import javax.portlet.RenderResponse;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import net.sf.mmapps.modules.cloudprovider.CloudProviderFactory;
@@ -26,7 +25,6 @@
import org.mmbase.bridge.util.SearchUtil;
import com.finalist.cmsc.mmbase.RelationUtil;
-import com.finalist.cmsc.navigation.NavigationUtil;
import com.finalist.cmsc.portalImpl.PortalConstants;
import com.finalist.cmsc.services.community.person.Person;
import com.finalist.cmsc.services.community.security.Authentication;
@@ -42,7 +40,6 @@
protected static final String EMAIL_FROMEMAIL = "emailFromEmail";
protected static final String EMAIL_FROMNAME = "emailFromName";
protected static final String REGISTRATIONPAGE = "registrationpage";
- protected static final String REGISTRATIONPAGEPATH = "registrationpagepath";
protected static final String PAGE = "page";
private static final Log log =
LogFactory.getLog(AbstractLoginPortlet.class);
@@ -76,15 +73,6 @@
setPortletNodeParameter(portletId, PAGE, request.getParameter(PAGE));
String registrationpage = request.getParameter(REGISTRATIONPAGE);
setPortletNodeParameter(portletId, REGISTRATIONPAGE,
registrationpage);
- if(StringUtils.isNotEmpty(registrationpage)){
-Cloud cloud = CloudProviderFactory.getCloudProvider().getCloud();
-String registrationpagepath =
NavigationUtil.getNavigationItemUrl((HttpServletRequest)request,
(HttpServletResponse)response,
cloud.getNode(Integer.valueOf(registrationpage)));
-if(registrationpagepath != null){
- setPortletParameter(portletId, REGISTRATIONPAGEPATH,
registrationpagepath);
-}
- } else {
-setPortletParameter(portletId, REGISTRATIONPAGEPATH, "");
- }
setPortletParameter(portletId, EMAIL_SUBJECT,
request.getParameter(EMAIL_SUBJECT));
setPortletParameter(portletId, EMAIL_TEXT,
request.getParameter(EMAIL_TEXT));
setPortletParameter(portletId, EMAIL_FROMEMAIL,
request.getParameter(EMAIL_FROMEMAIL));
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
2009-07-31 09:00:11 UTC (rev 37389)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/java/com/finalist/cmsc/portlets/LoginPortlet.java
2009-07-31 09:12:09 UTC (rev 37390)
@@ -186,11 +186,6 @@
String template;
String error = request.getParameter(ERRORMESSAGE);
String send_password = request.getParameter(SEND_PASSWORD);
- PortletPreferences preferences = request.getPreferences();
- String registrationpagepath = preferences.getValue(REGISTRATIONPAGEPATH,
null);
- if(StringUtils.isNotEmpty(registrationpagepath)){
- request.setAttribute(REGISTRATIONPAGEPATH, registrationpagepath);
- }
if (StringUtils.isNotBlank(error)) {
request.setAttribute(ERRORMESSAGE, error);
}
Modified:
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
===
---
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
2009-07-31 09:00:11 UTC (rev 37389)
+++
CMSContainer/branches/b1_5/CMSContainer_Portlets/portlets-login/src/webapp/WEB-INF/templates/view/login/login.jsp
2009-07-31 09:12:09 UTC (rev 37390)
@@ -28,8 +28,8 @@
"
[MMBASE SCM] r37387 - in CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository: resources src/java/com/finalist/cmsc/resources/forms src/webapp/editors/resources
Author: billyxie
Date: 2009-07-31 05:29:43 +0200 (Fri, 31 Jul 2009)
New Revision: 37387
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AbstractUploadAction.java
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
Log:
CMSC-1467 - Improve bulk image and attachment upload to show failed files for
version 1.5
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-07-31 03:20:10 UTC (rev 37386)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-07-31 03:29:43 UTC (rev 37387)
@@ -341,9 +341,7 @@
images.upload.results=Uploaded images
images.upload.explanation=Select a local image file or a ZIP-file containing
multiple images
images.upload.result=Uploaded {0} image(s)
-images.upload.filetypeinvalid=Please upload a local image or a ZIP-file
containing multiple images.
-images.upload.emptyfile=Please upload a local image or a ZIP-file containing
multiple images.
-images.upload.bigfile=The file is too big.
+images.upload.error=Upload failed. Possible reasons:the image(s) are
too big (max 16MB), even though it is zipped in a ZIP-file that is smaller then
the limit.the ZIP-file does not contain filesthe ZIP-file is
secured with a passwordthe ZIP-file is damagedsome files
already exist in the system.
images.upload.failedtip=Failed image(s):
images.upload.uploadedtip=Uploaded image(s):
images.upload.info=Info
@@ -354,8 +352,7 @@
attachments.upload.results=Uploaded attachments
attachments.upload.explanation=Select a local attachment file or a ZIP-file
containing multiple attachments
attachments.upload.result=Uploaded {0} attachment(s)
-attachments.upload.emptyfile=Please select a attachment file or Zip file to
upload.
-attachments.upload.bigfile=The attachment is too big.
+attachments.upload.error=Upload failed. Possible reasons:the
attachment(s) are too big (max 16MB), even though it is zipped in a ZIP-file
that is smaller then the limit.the ZIP-file does not contain
filesthe ZIP-file is secured with a passwordthe ZIP-file is
damagedsome files already exist in the system.
attachments.upload.failedtip=Failed attachment(s):
attachments.upload.uploadedtip=Uploaded attachment(s):
attachments.upload.info=Info
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-07-31 03:20:10 UTC (rev 37386)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-07-31 03:29:43 UTC (rev 37387)
@@ -342,9 +342,7 @@
images.upload.results=Geuploaden afbeeldingen
images.upload.explanation=Kies een lokale afbeelding of een ZIP-bestand met
meerdere afbeeldingen
images.upload.result=Aantal afbeeldingen geupload: {0}
-images.upload.filetypeinvalid=Please upload a local image or a ZIP-file
containing multiple images.
-images.upload.emptyfile=Please upload a local image or a ZIP-file containing
multiple images.
-images.upload.bigfile=The file is too big.
+images.upload.error=Upload failed. Possible reasons:the image(s) are
too big (max 16MB), even though it is zipped in a ZIP-file that is smaller then
the limit.the ZIP-file does not contain filesthe ZIP-file is
secured with a passwordthe ZIP-file is damagedsome files
already exist in the system.
images.upload.failedtip=Failed image(s):
images.upload.uploadedtip=Uploaded image(s):
images.upload.info=Info
@@ -355,8 +353,7 @@
attachments.upload.results=Bijlagen geupload:
attachments.upload.explanation=Kies een lokale bijlage of een ZIP-bestand met
meerdere bijlagen
attachments.upload.result=Aantal bijlagen geupload: {0}
-attachments.upload.emptyfile=Please select a attachment file or Zip file to
upload.
-attachments.upload.bigfile=The attachment is too big.
+attachments.upload.error=Upload failed. Possible reasons:the
attachment(s) are too big (max 16MB), even though it is zipped in a ZIP-file
that is smaller then the limit.the ZIP-file does not contain
filesthe ZIP-file is secured with a passwordthe ZIP
[MMBASE SCM] r37345 - CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources
Author: billyxie
Date: 2009-07-30 09:10:26 +0200 (Thu, 30 Jul 2009)
New Revision: 37345
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
Log:
CMSC-1467 - Improve bulk image and attachment upload to show failed files for
version 1.5
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
2009-07-30 06:39:08 UTC (rev 37344)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
2009-07-30 07:10:26 UTC (rev 37345)
@@ -66,10 +66,10 @@
-
+
-
+
${param.numberOfFailedFiles}
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
2009-07-30 06:39:08 UTC (rev 37344)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
2009-07-30 07:10:26 UTC (rev 37345)
@@ -69,13 +69,13 @@
-
+
-
+
-
+
${param.numberOfFailedFiles}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r37344 - in CMSContainer/branches/b1_5/CMSContainer/cmsc: contentrepository/resources contentrepository/src/java/com/finalist/cmsc/resources/forms utilities/src/java/com/finalist/util/htt
Author: billyxie
Date: 2009-07-30 08:39:08 +0200 (Thu, 30 Jul 2009)
New Revision: 37344
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AbstractUploadAction.java
CMSContainer/branches/b1_5/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
Log:
CMSC-1467 - Improve bulk image and attachment upload to show failed files for
version 1.5
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-07-29 19:54:04 UTC (rev 37343)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-07-30 06:39:08 UTC (rev 37344)
@@ -343,7 +343,7 @@
images.upload.result=Uploaded {0} image(s)
images.upload.filetypeinvalid=Please upload a local image or a ZIP-file
containing multiple images.
images.upload.emptyfile=Please upload a local image or a ZIP-file containing
multiple images.
-images.upload.bigfile=The file is too big(max 8MB).
+images.upload.bigfile=The file is too big.
images.upload.failedtip=Failed image(s):
images.upload.uploadedtip=Uploaded image(s):
images.upload.info=Info
@@ -355,7 +355,7 @@
attachments.upload.explanation=Select a local attachment file or a ZIP-file
containing multiple attachments
attachments.upload.result=Uploaded {0} attachment(s)
attachments.upload.emptyfile=Please select a attachment file or Zip file to
upload.
-attachments.upload.bigfile=The attachment(s) is too big(max 8MB).
+attachments.upload.bigfile=The attachment is too big.
attachments.upload.failedtip=Failed attachment(s):
attachments.upload.uploadedtip=Uploaded attachment(s):
attachments.upload.info=Info
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-07-29 19:54:04 UTC (rev 37343)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-07-30 06:39:08 UTC (rev 37344)
@@ -344,7 +344,7 @@
images.upload.result=Aantal afbeeldingen geupload: {0}
images.upload.filetypeinvalid=Please upload a local image or a ZIP-file
containing multiple images.
images.upload.emptyfile=Please upload a local image or a ZIP-file containing
multiple images.
-images.upload.bigfile=The file is too big(max 8MB).
+images.upload.bigfile=The file is too big.
images.upload.failedtip=Failed image(s):
images.upload.uploadedtip=Uploaded image(s):
images.upload.info=Info
@@ -356,7 +356,7 @@
attachments.upload.explanation=Kies een lokale bijlage of een ZIP-bestand met
meerdere bijlagen
attachments.upload.result=Aantal bijlagen geupload: {0}
attachments.upload.emptyfile=Please select a attachment file or Zip file to
upload.
-attachments.upload.bigfile=The attachment(s) is too big(max 8MB).
+attachments.upload.bigfile=The attachment is too big.
attachments.upload.failedtip=Failed attachment(s):
attachments.upload.uploadedtip=Uploaded attachment(s):
attachments.upload.info=Info
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
2009-07-29 19:54:04 UTC (rev 37343)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
2009-07-30 06:39:08 UTC (rev 37344)
@@ -342,7 +342,7 @@
images.upload.result=更新 {0} 个图片(s)
images.upload.filetypeinvalid=请上传图片或zip文件格式的图片压缩包.
images.upload.emptyfile=请上传图片或zip文件格式的图片压缩包.
-images.upload.bigfile=文件太大(最大 8MB).
+images.upload.bigfile=文件太大.
images.upload.failedtip=上传失败的图片:
images.upload.uploadedtip=上传成功的图片:
images.upload.info=信息
@@ -354,7 +354,7 @@
attachments.upload.explanation=选择一个本地的附件或者包含若干附件的zip文件
attachments.upload.result=更新 {0} 个附件(s)
attachments.upload.emptyfile=选择一个本地的附件或者包含若干附件的zip文件
-attachments.upload.bigfile=附件太大(最大 8MB).
+attachments.upload.bigfile=附件太大.
attachments.upload.failedtip=上传失败的附件:
attachments.upload.uploadedtip=上传成功的附件:
attachments.upload.info=信息
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms
[MMBASE SCM] r37193 - in CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository: resources src/webapp/editors/resources
Author: billyxie
Date: 2009-07-23 05:18:51 +0200 (Thu, 23 Jul 2009)
New Revision: 37193
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_zh.properties
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
Log:
CMSC-1467 - Improve bulk image and attachment upload to show failed files
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-07-22 20:33:50 UTC (rev 37192)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository.properties
2009-07-23 03:18:51 UTC (rev 37193)
@@ -341,7 +341,11 @@
images.upload.results=Uploaded images
images.upload.explanation=Select a local image file or a ZIP-file containing
multiple images
images.upload.result=Uploaded {0} image(s)
-images.upload.error=No images uploaded. The image(s) might be to large. Check
ZIP-file, it might be corrupt or password protected or it might not contain any
supported images.
+images.upload.filetypeinvalid=Please upload a local image or a ZIP-file
containing multiple images.
+images.upload.emptyfile=Please upload a local image or a ZIP-file containing
multiple images.
+images.upload.bigfile=The file is too big(max 8MB).
+images.upload.failedtip=Failed image(s):
+images.upload.uploadedtip=Uploaded image(s):
images.upload.info=Info
images.upload.edit=Edit image
@@ -350,7 +354,10 @@
attachments.upload.results=Uploaded attachments
attachments.upload.explanation=Select a local attachment file or a ZIP-file
containing multiple attachments
attachments.upload.result=Uploaded {0} attachment(s)
-attachments.upload.error=No attachments uploaded. Possible reasons:the
attachment(s) are too big (max 16MB), even though it is zipped in a ZIP-file
that is smaller then the limit.the ZIP-file does not contain
filesthe ZIP-file is secured with a passwordthe ZIP-file is
damaged.
+attachments.upload.emptyfile=Please select a attachment file or Zip file to
upload.
+attachments.upload.bigfile=The attachment(s) is too big(max 8MB).
+attachments.upload.failedtip=Failed attachment(s):
+attachments.upload.uploadedtip=Uploaded attachment(s):
attachments.upload.info=Info
attachments.upload.edit=Edit attachment
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-07-22 20:33:50 UTC (rev 37192)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/resources/cmsc-repository_nl.properties
2009-07-23 03:18:51 UTC (rev 37193)
@@ -342,7 +342,11 @@
images.upload.results=Geuploaden afbeeldingen
images.upload.explanation=Kies een lokale afbeelding of een ZIP-bestand met
meerdere afbeeldingen
images.upload.result=Aantal afbeeldingen geupload: {0}
-images.upload.error=Geen afbeeldingen geupload. De afbeelding(en) kunnen te
groot zijn. Controleer bij gebruik van een ZIP-bestand of het afbeeldingen
bevat, niet beveiligd is met een wachtwoord en niet corrupt is.
+images.upload.filetypeinvalid=Please upload a local image or a ZIP-file
containing multiple images.
+images.upload.emptyfile=Please upload a local image or a ZIP-file containing
multiple images.
+images.upload.bigfile=The file is too big(max 8MB).
+images.upload.failedtip=Failed image(s):
+images.upload.uploadedtip=Uploaded image(s):
images.upload.info=Info
images.upload.edit=Bewerk afbeelding
@@ -351,7 +355,10 @@
attachments.upload.results=Bijlagen geupload:
attachments.upload.explanation=Kies een lokale bijlage of een ZIP-bestand met
meerdere bijlagen
attachments.upload.result=Aantal bijlagen geupload: {0}
-attachments.upload.error=Geen bijlagen geupload. Mogelijke oorzaken:de
bijlage(s) kunnen te groot zijn (max 16MB), ook al is deze ingepakt in een
ZIP-bestand dat kleiner is.het ZIP-bestand bevat geen
bijlagenhet ZIP-bestand is beveiligd met een wachtwoordhet
ZIP-bestand is beschadigd.
+attachments.upload.emptyfile=Please select a attachment file or Zip file to
upload.
+attachments.upload.bigfile=The attachment(s) is too big(max 8MB).
+attachments.upload.failedtip=Failed attachment(s):
+attachments.upload.uploadedtip=Uploaded attachment(s):
attachments.upload.info=Info
attachments.upload.edit=Bewerk bijlage
[MMBASE SCM] r37094 - in CMSContainer/branches/b1_5/CMSContainer/cmsc: contentrepository/src/java/com/finalist/cmsc/resources/forms contentrepository/src/webapp/WEB-INF contentrepository/src/webapp/ed
Author: billyxie
Date: 2009-07-22 11:39:56 +0200 (Wed, 22 Jul 2009)
New Revision: 37094
Added:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AbstractUploadAction.java
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AttachmentUploadAction.java
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/ImageUploadAction.java
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/UploadForm.java
Modified:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/WEB-INF/struts-repository.xml
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/attachmentupload.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/webapp/editors/resources/imageupload.jsp
CMSContainer/branches/b1_5/CMSContainer/cmsc/utilities/src/java/com/finalist/util/http/BulkUploadUtil.java
Log:
CMSC-1467 - Improve bulk image and attachment upload to show failed files
Added:
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AbstractUploadAction.java
===
---
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AbstractUploadAction.java
(rev 0)
+++
CMSContainer/branches/b1_5/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/resources/forms/AbstractUploadAction.java
2009-07-22 09:39:56 UTC (rev 37094)
@@ -0,0 +1,151 @@
+package com.finalist.cmsc.resources.forms;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Properties;
+import java.util.Set;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import net.sf.mmapps.commons.util.StringUtil;
+
+import org.apache.commons.lang.StringUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.upload.FormFile;
+import org.mmbase.bridge.Cloud;
+import org.mmbase.bridge.NodeManager;
+
+import com.finalist.cmsc.mmbase.PropertiesUtil;
+import com.finalist.cmsc.struts.MMBaseAction;
+import com.finalist.util.http.BulkUploadUtil;
+
+/**
+ * @author Billy
+ *
+ */
+public abstract class AbstractUploadAction extends MMBaseAction {
+
+ public static final String UPLOADED_FILE_MAX_SIZE =
"uploaded.file.max.size";
+
+ public static final String CONFIGURATION_RESOURCE_NAME =
"/com/finalist/util/http/util.properties";
+
+ protected static Set supportedImages;
+
+ protected static final Log log =
LogFactory.getLog(AbstractUploadAction.class);
+
+ @Override
+ public ActionForward execute(ActionMapping mapping, ActionForm form,
+ HttpServletRequest request, HttpServletResponse response, Cloud
cloud) throws Exception{
+
+ boolean fileIsEmpty = false;
+ boolean fileTooBig = false;
+ boolean fileTypeInvalid = false;
+ String uploadedNodes = "";
+ int numberOfUploadedNodes = -1;
+ int numberOfFailedFiles = -1;
+
+ UploadForm uploadForm = (UploadForm) form;
+ FormFile file = uploadForm.getFile();
+
+ int fileSize = file.getFileSize();
+ if(StringUtil.isEmpty(file.getFileName()) || fileSize == 0 ){
+ fileIsEmpty = true;
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?fileIsEmpty=" + fileIsEmpty, true);
+ }
+ if(!maxFileSizeBiggerThan(fileSize)){
+ fileTooBig = true;
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?fileTooBig=" + fileTooBig, true);
+ }
+
+ NodeManager manager = cloud.getNodeManager(getNodeManagerName());
+ if(validFileType(file)){
+ List nodes = new ArrayList();
+ List uploadedFileList = new ArrayList();
+ List failedFileList = new ArrayList();
+ BulkUploadUtil.store(cloud, manager, file, nodes, uploadedFileList,
failedFileList);
+ uploadedNodes = BulkUploadUtil.convertToCommaSeparated(nodes);
+ numberOfUploadedNodes = nodes.size();
+ numberOfFailedFiles = failedFileList.size();
+
+ request.getSession().setAttribute("uploadedFiles", uploadedFileList);
+ request.getSession().setAttribute("failedFiles", failedFileList);
+ } else {
+ fileTypeInvalid = true;
+ return new ActionForward(mapping.findForward(SUCCESS).getPath() +
"?fileTypeInvalid=" + fileTypeInvalid, true);
+ }
+
+ re
[MMBASE SCM] r36911 - CMSContainer/branches/b1_6/CMSContainer/migration
Author: billyxie Date: 2009-07-14 10:46:24 +0200 (Tue, 14 Jul 2009) New Revision: 36911 Modified: CMSContainer/branches/b1_6/CMSContainer/migration/migration_1.6.1_to_1.6.2.txt Log: CMSC-1272 - Dynamic form uses description field, but should have its own intro field Modified: CMSContainer/branches/b1_6/CMSContainer/migration/migration_1.6.1_to_1.6.2.txt === --- CMSContainer/branches/b1_6/CMSContainer/migration/migration_1.6.1_to_1.6.2.txt 2009-07-14 08:33:35 UTC (rev 36910) +++ CMSContainer/branches/b1_6/CMSContainer/migration/migration_1.6.1_to_1.6.2.txt 2009-07-14 08:46:24 UTC (rev 36911) @@ -50,3 +50,56 @@ * * * + + +Name: Add a intro column and a body column in _responseform table +Goal: add intro field and body field in dynamic form & copy description field to intro field & after copying, clean the description field, CMSC-1272 +Type: sql-script +--- Start script --- +ALTER TABLE mm_responseform ADD intro text; +ALTER TABLE mm_responseform ADD body mediumtext; +UPDATE mm_responseform SET intro = description; +UPDATE mm_responseform SET description = NULL; + +ALTER TABLE live_responseform ADD intro text; +ALTER TABLE live_responseform ADD body mediumtext; +UPDATE live_responseform SET intro = description; +UPDATE live_responseform SET description = NULL; +--- End script --- +Exceptions/errors/other problems and what to do: +* +* +* + +Name: update the templete jsp +Goal: change templates jsp to use intro & body field + fixed the styling, CMSC-1272 +Type: manual action +Steps: +1. update the following + +to + + +2. update the following + + + +to + + + + + + + + +3. update the following + +to + + +Exceptions/errors/other problems and what to do: +* +* +* ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE SCM] r36909 - CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css
Author: billyxie Date: 2009-07-14 08:11:49 +0200 (Tue, 14 Jul 2009) New Revision: 36909 Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css Log: CMSC-1454 - Spacing of field names and input boxes in Advanced Search is ugly formatted Modified: CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css === --- CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css 2009-07-14 04:10:41 UTC (rev 36908) +++ CMSContainer/branches/b1_5/CMSContainer/cmsc/edit-webapp/src/webapp/editors/css/main.css 2009-07-14 06:11:49 UTC (rev 36909) @@ -826,7 +826,7 @@ background-position: top right; background-color: #ff; - + display: table; float: left; clear: both; width: 100%; ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
