[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv21582
Modified Files:
Tag: b1_5
NewsletterPublicationUtil.java
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,remove
old-unused code
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: NewsletterPublicationUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.26.2.13
retrieving revision 1.26.2.14
diff -u -b -r1.26.2.13 -r1.26.2.14
--- NewsletterPublicationUtil.java 13 Feb 2009 21:26:45 -
1.26.2.13
+++ NewsletterPublicationUtil.java 23 Feb 2009 02:38:06 -
1.26.2.14
@@ -179,7 +179,7 @@
* @throws MessagingException
*/
public static void freezeEdition(Node edition) throws MessagingException {
- publish(edition);
+ //publish(edition);
String static_html = getStaticHtml(edition.getNumber());
edition.setStringValue("process_status", EditionStatus.FROZEN.value());
// edition.setValue("static_html",
StringEscapeUtils.escapeHtml(static_html));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv21248
Modified Files:
NewsletterPublicationUtil.java
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,remove
old-unused code
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: NewsletterPublicationUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -b -r1.41 -r1.42
--- NewsletterPublicationUtil.java 13 Feb 2009 21:25:34 - 1.41
+++ NewsletterPublicationUtil.java 23 Feb 2009 02:31:08 - 1.42
@@ -179,7 +179,7 @@
* @throws MessagingException
*/
public static void freezeEdition(Node edition) throws MessagingException {
- publish(edition);
+ //publish(edition);
String static_html = getStaticHtml(edition.getNumber());
edition.setStringValue("process_status", EditionStatus.FROZEN.value());
// edition.setValue("static_html",
StringEscapeUtils.escapeHtml(static_html));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module report_publication_edit.jsp
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory james.mmbase.org:/tmp/cvs-serv25509
Modified Files:
Tag: b1_5
report_publication_edit.jsp
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax
loading prompt
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: report_publication_edit.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp,v
retrieving revision 1.7.2.14
retrieving revision 1.7.2.15
diff -u -b -r1.7.2.14 -r1.7.2.15
--- report_publication_edit.jsp 19 Feb 2009 10:23:40 - 1.7.2.14
+++ report_publication_edit.jsp 20 Feb 2009 09:41:31 - 1.7.2.15
@@ -53,6 +53,12 @@
+
+ workfor("
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF struts-newsletter.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv25021 Modified Files: Tag: b1_5 struts-newsletter.xml Log Message: CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax loading prompt See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-1187 Index: struts-newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v retrieving revision 1.23.2.3 retrieving revision 1.23.2.4 diff -u -b -r1.23.2.3 -r1.23.2.4 --- struts-newsletter.xml 14 Nov 2008 06:59:39 - 1.23.2.3 +++ struts-newsletter.xml 20 Feb 2009 09:22:36 - 1.23.2.4 @@ -192,6 +192,9 @@ + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionFreezeAjax.java NewsletterEditionFreeze.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv24972
Modified Files:
Tag: b1_5
NewsletterEditionFreeze.java
Added Files:
Tag: b1_5
NewsletterEditionFreezeAjax.java
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax
loading
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1187
NewsletterEditionFreezeAjax.java is new
Index: NewsletterEditionFreeze.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionFreeze.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- NewsletterEditionFreeze.java19 Feb 2009 10:23:40 - 1.2.2.3
+++ NewsletterEditionFreeze.java20 Feb 2009 09:21:15 - 1.2.2.4
@@ -1,21 +1,49 @@
package com.finalist.newsletter.forms;
+
+
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import org.mmbase.bridge.Node;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.cmsc.services.workflow.Workflow;
+import com.finalist.cmsc.services.workflow.WorkflowException;
import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
public class NewsletterEditionFreeze extends NewsletterEditionAction{
private static final String ERRORS = "errors";
+ private static final String NEEDAJAX = "needajax";
+ private static final Logger log =
Logging.getLoggerInstance(NewsletterEditionFreeze.class.getName());
@Override
protected void doSave(HttpServletRequest request, Node edition) throws
Exception {
- if
(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status")) &&
Publish.isPublished(edition)) {
+ if
(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status"))) {
+ if (Publish.isPublished(edition)) {
NewsletterPublicationUtil.freezeEdition(edition);
} else {
+try {
+ Workflow.publish(edition);
+}
+catch (WorkflowException wfe) {
+ List errors = wfe.getErrors();
request.getSession().setAttribute(ERRORS, edition.getValue("title"));
+ for (Node errorNode : errors) {
+ log.error(errorNode.getNodeManager().getName() + " " +
errorNode.getNumber() + " ");
+ }
+ if (Workflow.isAcceptedStepEnabled()) {
+ Workflow.accept(edition, "");
+ }
+ else {
+ Workflow.finish(edition, "");
+ }
+}
+request.getSession().setAttribute(NEEDAJAX, edition.getNumber());
+ }
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-jforum/src/webapp/images loading.gif
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/webapp/images In directory james.mmbase.org:/tmp/cvs-serv24849 Added Files: Tag: b1_5 loading.gif Log Message: CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax loading prompt See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-jforum/src/webapp/images See also: http://www.mmbase.org/jira/browse/CMSC-1187 loading.gif is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties newsletter_zh.properties
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv24734
Modified Files:
Tag: b1_5
newsletter.properties newsletter_zh.properties
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax
loading prompt
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: newsletter.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.37.2.14
retrieving revision 1.37.2.15
diff -u -b -r1.37.2.14 -r1.37.2.15
--- newsletter.properties 19 Feb 2009 10:23:40 - 1.37.2.14
+++ newsletter.properties 20 Feb 2009 09:15:42 - 1.37.2.15
@@ -291,3 +291,5 @@
newsletter.edition.confirmation.freeze = freeze
newsletter.edition.confirmation.defrost = defrost
newsletter.edition.errors =the {0} have not been published if you want to
Freeze it ,you should publish that first !
\ No newline at end of file
+newsletter.edition.auto = the edition have been published by system , it will
be freezed latter!
+newsletter.edition.fail = freeze failed ,please check the edition in work-flow!
\ No newline at end of file
Index: newsletter_zh.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.20.2.11
retrieving revision 1.20.2.12
diff -u -b -r1.20.2.11 -r1.20.2.12
--- newsletter_zh.properties19 Feb 2009 10:23:40 - 1.20.2.11
+++ newsletter_zh.properties20 Feb 2009 09:15:42 - 1.20.2.12
@@ -293,3 +293,5 @@
newsletter.edition.confirmation.freeze = å»ç»
newsletter.edition.confirmation.defrost = 解å»
newsletter.edition.errors ={0}
è¿æ²¡æåå¸ï¼è¯·å¨å»ç»å®ä¹ååå¸å® !
\ No newline at end of file
+newsletter.edition.auto =
ç³»ç»å·²ç»ä¸ºä½ åå¸ï¼ç¨åä¼ä¸ºæ¨èªå¨å»ç»ï¼
+newsletter.edition.fail = å»ç»å¤±è´¥ï¼è¯·æ£æ¥å·¥ä½æµï¼
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/webapp/js transparent_png.js
Update of /var/cvs/contributions/CMSContainer/cmsc/utilities/src/webapp/js
In directory james.mmbase.org:/tmp/cvs-serv24565
Modified Files:
Tag: b1_5
transparent_png.js
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax
loading prompt
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/webapp/js
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: transparent_png.js
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/webapp/js/transparent_png.js,v
retrieving revision 1.1
retrieving revision 1.1.6.1
diff -u -b -r1.1 -r1.1.6.1
--- transparent_png.js 21 May 2007 18:06:16 - 1.1
+++ transparent_png.js 20 Feb 2009 09:10:36 - 1.1.6.1
@@ -34,3 +34,69 @@
window.onload = alphaImages;
\ No newline at end of file
+
+ajaxUrl = null;
+load=null;
+time=null;
+function workfor(url, a){
+ ajaxUrl = url + "number=" + a;
+ getFreezeInfo();
+ time=setTimeout("clear()",6*5);
+}
+function clear(){
+ clearInterval(load);
+ document.getElementById("needajax").style.display="none";
+ document.getElementById("working").style.display="";
+}
+
+function getFreezeInfo(){
+ load=setInterval("loadInfo()", 1);
+
+}
+
+function loadInfo(){
+ var req = loadXMLDoc(ajaxUrl, false);
+ var result = req.status;
+ if (result == 200) {
+ var areaInfo = req.responseText;
+ if (areaInfo == "0") {
+ location.reload();
+ }
+ }
+ req = null;
+}
+
+
+function loadXMLDoc(url, async) {
+ var req = false;
+ // branch for native XMLHttpRequest object
+ if(window.XMLHttpRequest && !(window.ActiveXObject)) {
+ try {
+ req = new XMLHttpRequest();
+ } catch(e) {
+ req = false;
+ }
+ // branch for IE/Windows ActiveX version
+ } else if(window.ActiveXObject) {
+ try {
+ req = new ActiveXObject("Msxml2.XMLHTTP");
+ } catch(e) {
+ try {
+ req = new ActiveXObject("Microsoft.XMLHTTP");
+ } catch(e) {
+ req = false;
+ }
+ }
+ }
+ if(req) {
+ var as;
+ if (async == undefined) {
+ as = true;
+ } else {
+ as = async;
+ }
+ req.open("GET", url, as);
+ req.send("");
+ }
+ return req;
+}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionFreezeAjax.java
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms In directory james.mmbase.org:/tmp/cvs-serv24451 Added Files: NewsletterEditionFreezeAjax.java Log Message: CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax loading See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms See also: http://www.mmbase.org/jira/browse/CMSC-1187 NewsletterEditionFreezeAjax.java is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module report_publication_edit.jsp
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv24363/src/webapp/editors/newsletter/module
Modified Files:
report_publication_edit.jsp
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax
loading
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: report_publication_edit.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- report_publication_edit.jsp 19 Feb 2009 09:53:23 - 1.22
+++ report_publication_edit.jsp 20 Feb 2009 09:06:15 - 1.23
@@ -53,6 +53,12 @@
+
+ workfor("
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF struts-newsletter.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF In directory james.mmbase.org:/tmp/cvs-serv24363/src/webapp/WEB-INF Modified Files: struts-newsletter.xml Log Message: CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax loading See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF See also: http://www.mmbase.org/jira/browse/CMSC-1187 Index: struts-newsletter.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/WEB-INF/struts-newsletter.xml,v retrieving revision 1.28 retrieving revision 1.29 diff -u -b -r1.28 -r1.29 --- struts-newsletter.xml 14 Nov 2008 04:04:41 - 1.28 +++ struts-newsletter.xml 20 Feb 2009 09:06:15 - 1.29 @@ -192,6 +192,9 @@ + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionFreeze.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv24363/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterEditionFreeze.java
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax
loading
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: NewsletterEditionFreeze.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionFreeze.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- NewsletterEditionFreeze.java19 Feb 2009 09:53:23 - 1.4
+++ NewsletterEditionFreeze.java20 Feb 2009 09:06:15 - 1.5
@@ -1,21 +1,49 @@
package com.finalist.newsletter.forms;
+
+
+import java.util.List;
+
import javax.servlet.http.HttpServletRequest;
import org.mmbase.bridge.Node;
import com.finalist.cmsc.services.publish.Publish;
+import com.finalist.cmsc.services.workflow.Workflow;
+import com.finalist.cmsc.services.workflow.WorkflowException;
import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
+import org.mmbase.util.logging.Logger;
+import org.mmbase.util.logging.Logging;
public class NewsletterEditionFreeze extends NewsletterEditionAction{
private static final String ERRORS = "errors";
+ private static final String NEEDAJAX = "needajax";
+ private static final Logger log =
Logging.getLoggerInstance(NewsletterEditionFreeze.class.getName());
@Override
protected void doSave(HttpServletRequest request, Node edition) throws
Exception {
- if
(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status")) &&
Publish.isPublished(edition)) {
+ if
(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status"))) {
+ if (Publish.isPublished(edition)) {
NewsletterPublicationUtil.freezeEdition(edition);
} else {
+try {
+ Workflow.publish(edition);
+}
+catch (WorkflowException wfe) {
+ List errors = wfe.getErrors();
request.getSession().setAttribute(ERRORS, edition.getValue("title"));
+ for (Node errorNode : errors) {
+ log.error(errorNode.getNodeManager().getName() + " " +
errorNode.getNumber() + " ");
+ }
+ if (Workflow.isAcceptedStepEnabled()) {
+ Workflow.accept(edition, "");
+ }
+ else {
+ Workflow.finish(edition, "");
+ }
+}
+request.getSession().setAttribute(NEEDAJAX, edition.getNumber());
+ }
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties newsletter_zh.properties
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv24363/resources
Modified Files:
newsletter.properties newsletter_zh.properties
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax
loading
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: newsletter.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.52
retrieving revision 1.53
diff -u -b -r1.52 -r1.53
--- newsletter.properties 19 Feb 2009 09:53:23 - 1.52
+++ newsletter.properties 20 Feb 2009 09:06:15 - 1.53
@@ -291,3 +291,5 @@
newsletter.edition.confirmation.freeze = freeze
newsletter.edition.confirmation.defrost =defrost
newsletter.edition.errors =the {0} have not been published if you want to
Freeze it ,you should publish that first !
\ No newline at end of file
+newsletter.edition.auto = the edition have been published by system , it will
be freezed latter!
+newsletter.edition.fail = freeze failed ,please check the edition in work-flow!
\ No newline at end of file
Index: newsletter_zh.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- newsletter_zh.properties19 Feb 2009 09:53:23 - 1.31
+++ newsletter_zh.properties20 Feb 2009 09:06:15 - 1.32
@@ -293,3 +293,5 @@
newsletter.edition.confirmation.freeze = å»ç»
newsletter.edition.confirmation.defrost = 解å»
newsletter.edition.errors ={0}
è¿æ²¡æåå¸ï¼è¯·å¨å»ç»å®ä¹ååå¸å® !
\ No newline at end of file
+newsletter.edition.auto =
ç³»ç»å·²ç»ä¸ºä½ åå¸ï¼ç¨åä¼ä¸ºæ¨èªå¨å»ç»ï¼
+newsletter.edition.fail = å»ç»å¤±è´¥ï¼è¯·æ£æ¥å·¥ä½æµï¼
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/utilities/src/webapp/js transparent_png.js
Update of /var/cvs/contributions/CMSContainer/cmsc/utilities/src/webapp/js
In directory james.mmbase.org:/tmp/cvs-serv24078
Modified Files:
transparent_png.js
Log Message:
CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax
loading
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/utilities/src/webapp/js
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: transparent_png.js
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/utilities/src/webapp/js/transparent_png.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- transparent_png.js 21 May 2007 18:06:16 - 1.1
+++ transparent_png.js 20 Feb 2009 08:59:58 - 1.2
@@ -34,3 +34,69 @@
window.onload = alphaImages;
\ No newline at end of file
+
+ajaxUrl = null;
+load=null;
+time=null;
+function workfor(url, a){
+ ajaxUrl = url + "number=" + a;
+ getFreezeInfo();
+ time=setTimeout("clear()",6*5);
+}
+function clear(){
+ clearInterval(load);
+ document.getElementById("needajax").style.display="none";
+ document.getElementById("working").style.display="";
+}
+
+function getFreezeInfo(){
+ load=setInterval("loadInfo()", 1);
+
+}
+
+function loadInfo(){
+ var req = loadXMLDoc(ajaxUrl, false);
+ var result = req.status;
+ if (result == 200) {
+ var areaInfo = req.responseText;
+ if (areaInfo == "0") {
+ location.reload();
+ }
+ }
+ req = null;
+}
+
+
+function loadXMLDoc(url, async) {
+ var req = false;
+ // branch for native XMLHttpRequest object
+ if(window.XMLHttpRequest && !(window.ActiveXObject)) {
+ try {
+ req = new XMLHttpRequest();
+ } catch(e) {
+ req = false;
+ }
+ // branch for IE/Windows ActiveX version
+ } else if(window.ActiveXObject) {
+ try {
+ req = new ActiveXObject("Msxml2.XMLHTTP");
+ } catch(e) {
+ try {
+ req = new ActiveXObject("Microsoft.XMLHTTP");
+ } catch(e) {
+ req = false;
+ }
+ }
+ }
+ if(req) {
+ var as;
+ if (async == undefined) {
+ as = true;
+ } else {
+ as = async;
+ }
+ req.open("GET", url, as);
+ req.send("");
+ }
+ return req;
+}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-jforum/src/webapp/images loading.gif
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-jforum/src/webapp/images In directory james.mmbase.org:/tmp/cvs-serv24020 Added Files: loading.gif Log Message: CMSC-1187, Newsletter: improve publication and sending mechanism,for ajax loading prompt See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-jforum/src/webapp/images See also: http://www.mmbase.org/jira/browse/CMSC-1187 loading.gif is new ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionFreeze.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv22723/src/java/com/finalist/newsletter/forms
Modified Files:
Tag: b1_5
NewsletterEditionFreeze.java
Log Message:
CMSC-1153, Another Newsletter stacktrace:add prompt info when user freezeing
fail
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1153
Index: NewsletterEditionFreeze.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionFreeze.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- NewsletterEditionFreeze.java14 Nov 2008 07:09:21 - 1.2.2.2
+++ NewsletterEditionFreeze.java19 Feb 2009 10:23:40 - 1.2.2.3
@@ -1,16 +1,21 @@
package com.finalist.newsletter.forms;
import javax.servlet.http.HttpServletRequest;
+
import org.mmbase.bridge.Node;
+
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
public class NewsletterEditionFreeze extends NewsletterEditionAction{
-
+ private static final String ERRORS = "errors";
@Override
protected void doSave(HttpServletRequest request, Node edition) throws
Exception {
-
if(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status"))) {
+ if
(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status")) &&
Publish.isPublished(edition)) {
NewsletterPublicationUtil.freezeEdition(edition);
+ } else {
+ request.getSession().setAttribute(ERRORS, edition.getValue("title"));
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module report_publication_edit.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module In directory james.mmbase.org:/tmp/cvs-serv22723/src/webapp/editors/newsletter/module Modified Files: Tag: b1_5 report_publication_edit.jsp Log Message: CMSC-1153, Another Newsletter stacktrace:add prompt info when user freezeing fail See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module See also: http://www.mmbase.org/jira/browse/CMSC-1153 Index: report_publication_edit.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp,v retrieving revision 1.7.2.13 retrieving revision 1.7.2.14 diff -u -b -r1.7.2.13 -r1.7.2.14 --- report_publication_edit.jsp 11 Dec 2008 07:22:07 - 1.7.2.13 +++ report_publication_edit.jsp 19 Feb 2009 10:23:40 - 1.7.2.14 @@ -49,6 +49,10 @@ + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties newsletter_nl.properties newsletter_zh.properties
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv22723/resources
Modified Files:
Tag: b1_5
newsletter.properties newsletter_nl.properties
newsletter_zh.properties
Log Message:
CMSC-1153, Another Newsletter stacktrace:add prompt info when user freezeing
fail
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1153
Index: newsletter.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.37.2.13
retrieving revision 1.37.2.14
diff -u -b -r1.37.2.13 -r1.37.2.14
--- newsletter.properties 15 Dec 2008 09:44:58 - 1.37.2.13
+++ newsletter.properties 19 Feb 2009 10:23:40 - 1.37.2.14
@@ -290,3 +290,4 @@
newsletter.edition.confirmation.revoke = revoke approving
newsletter.edition.confirmation.freeze = freeze
newsletter.edition.confirmation.defrost = defrost
\ No newline at end of file
+newsletter.edition.errors =the {0} have not been published if you want to
Freeze it ,you should publish that first !
\ No newline at end of file
Index: newsletter_nl.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties,v
retrieving revision 1.21.2.15
retrieving revision 1.21.2.16
diff -u -b -r1.21.2.15 -r1.21.2.16
--- newsletter_nl.properties15 Dec 2008 11:16:40 - 1.21.2.15
+++ newsletter_nl.properties19 Feb 2009 10:23:40 - 1.21.2.16
@@ -290,3 +290,4 @@
newsletter.edition.confirmation.revoke = Afkeuren
newsletter.edition.confirmation.freeze = Bevriezen
newsletter.edition.confirmation.defrost = Ontdooien
\ No newline at end of file
+newsletter.edition.errors =the {0} have not been published if you want to
Freeze it ,you should publish that first !
\ No newline at end of file
Index: newsletter_zh.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.20.2.10
retrieving revision 1.20.2.11
diff -u -b -r1.20.2.10 -r1.20.2.11
--- newsletter_zh.properties10 Dec 2008 09:48:41 - 1.20.2.10
+++ newsletter_zh.properties19 Feb 2009 10:23:40 - 1.20.2.11
@@ -292,3 +292,4 @@
newsletter.edition.confirmation.revoke = æ¤éæ¹å
newsletter.edition.confirmation.freeze = å»ç»
newsletter.edition.confirmation.defrost = 解å»
\ No newline at end of file
+newsletter.edition.errors ={0}
è¿æ²¡æåå¸ï¼è¯·å¨å»ç»å®ä¹ååå¸å® !
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter project.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter
In directory james.mmbase.org:/tmp/cvs-serv22723
Modified Files:
Tag: b1_5
project.xml
Log Message:
CMSC-1153, Another Newsletter stacktrace:add prompt info when user freezeing
fail
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-1153
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/project.xml,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -b -r1.12 -r1.12.2.1
--- project.xml 27 Jul 2008 06:13:58 - 1.12
+++ project.xml 19 Feb 2009 10:23:40 - 1.12.2.1
@@ -172,6 +172,13 @@
${war.bundle}
+
+
+ finalist
+ cmsc-servicemanagement
+ ${cmsc.version}
+ jar
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module report_publication_edit.jsp
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module In directory james.mmbase.org:/tmp/cvs-serv21998/src/webapp/editors/newsletter/module Modified Files: report_publication_edit.jsp Log Message: CMSC-1153, Another Newsletter stacktrace:add prompt info when user freezeing fail See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module See also: http://www.mmbase.org/jira/browse/CMSC-1153 Index: report_publication_edit.jsp === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_edit.jsp,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- report_publication_edit.jsp 11 Dec 2008 07:21:45 - 1.21 +++ report_publication_edit.jsp 19 Feb 2009 09:53:23 - 1.22 @@ -49,6 +49,10 @@ + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionFreeze.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory
james.mmbase.org:/tmp/cvs-serv21998/src/java/com/finalist/newsletter/forms
Modified Files:
NewsletterEditionFreeze.java
Log Message:
CMSC-1153, Another Newsletter stacktrace:add prompt info when user freezeing
fail
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1153
Index: NewsletterEditionFreeze.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionFreeze.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterEditionFreeze.java14 Nov 2008 06:38:52 - 1.3
+++ NewsletterEditionFreeze.java19 Feb 2009 09:53:23 - 1.4
@@ -1,16 +1,21 @@
package com.finalist.newsletter.forms;
import javax.servlet.http.HttpServletRequest;
+
import org.mmbase.bridge.Node;
+
+import com.finalist.cmsc.services.publish.Publish;
import com.finalist.newsletter.domain.EditionStatus;
import com.finalist.newsletter.util.NewsletterPublicationUtil;
public class NewsletterEditionFreeze extends NewsletterEditionAction{
-
+ private static final String ERRORS = "errors";
@Override
protected void doSave(HttpServletRequest request, Node edition) throws
Exception {
-
if(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status"))) {
+ if
(!EditionStatus.FROZEN.value().equals(edition.getValue("process_status")) &&
Publish.isPublished(edition)) {
NewsletterPublicationUtil.freezeEdition(edition);
+ } else {
+ request.getSession().setAttribute(ERRORS, edition.getValue("title"));
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter project.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter
In directory james.mmbase.org:/tmp/cvs-serv21998
Modified Files:
project.xml
Log Message:
CMSC-1153, Another Newsletter stacktrace:add prompt info when user freezeing
fail
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-1153
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/project.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- project.xml 27 Jul 2008 06:13:58 - 1.12
+++ project.xml 19 Feb 2009 09:53:23 - 1.13
@@ -172,6 +172,13 @@
${war.bundle}
+
+
+ finalist
+ cmsc-servicemanagement
+ ${cmsc.version}
+ jar
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/resources newsletter.properties newsletter_nl.properties newsletter_zh.properties
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
In directory james.mmbase.org:/tmp/cvs-serv21998/resources
Modified Files:
newsletter.properties newsletter_nl.properties
newsletter_zh.properties
Log Message:
CMSC-1153, Another Newsletter stacktrace:add prompt info when user freezeing
fail
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources
See also: http://www.mmbase.org/jira/browse/CMSC-1153
Index: newsletter.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter.properties,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- newsletter.properties 15 Dec 2008 09:45:04 - 1.51
+++ newsletter.properties 19 Feb 2009 09:53:23 - 1.52
@@ -262,8 +262,8 @@
newsletter.term.action.save = Save
newsletter.term.action.cancel = Cancel
newsletter.term.action.delete = Delete
-newsletter.term.noresult = No newsletter terms information!
-newsletter.term.add.success = Add new newsletter terms successfully!
+newsletter.term.noresult = No newsletter terms information\!
+newsletter.term.add.success = Add new newsletter terms successfully\!
newsletter.term.delete.confirm = Delete this term?
newsletter.term.update.success = Update success!
newsletter.term.exist = Term name has already exist!
@@ -277,7 +277,7 @@
newsletter.bounce.bouncedate = Bounce Date
newsletter.bounce.bouncecontent = Bounce Content
newsletter.bounce.window.close = Close Window
-newsletter.bounce.noresult = No newsletter bounces information!
+newsletter.bounce.noresult = No newsletter bounces information\!
newsletterlog.noResults = No Results
@@ -289,4 +289,5 @@
newsletter.edition.confirmation.approve = approve
newsletter.edition.confirmation.revoke = revoke approving
newsletter.edition.confirmation.freeze = freeze
-newsletter.edition.confirmation.defrost = defrost
\ No newline at end of file
+newsletter.edition.confirmation.defrost =defrost
+newsletter.edition.errors =the {0} have not been published if you want to
Freeze it ,you should publish that first !
\ No newline at end of file
Index: newsletter_nl.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_nl.properties,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- newsletter_nl.properties15 Dec 2008 11:16:48 - 1.36
+++ newsletter_nl.properties19 Feb 2009 09:53:23 - 1.37
@@ -262,8 +262,8 @@
newsletter.term.action.save = Opslaan
newsletter.term.action.cancel = Annuleren
newsletter.term.action.delete = Verwijder
-newsletter.term.noresult = Geen nieuwsbriefterm informatie!
-newsletter.term.add.success = Term succesvol toegevoegd!
+newsletter.term.noresult = Geen nieuwsbriefterm informatie\!
+newsletter.term.add.success = Term succesvol toegevoegd\!
newsletter.term.delete.confirm = Verwijder deze term?
newsletter.term.update.success = Update gelukt!
newsletter.term.exist = Term bestaat al!
@@ -289,4 +289,5 @@
newsletter.edition.confirmation.approve = Goedkeuren
newsletter.edition.confirmation.revoke = Afkeuren
newsletter.edition.confirmation.freeze = Bevriezen
-newsletter.edition.confirmation.defrost = Ontdooien
\ No newline at end of file
+newsletter.edition.confirmation.defrost =Ontdooien
+newsletter.edition.errors =the {0} have not been published if you want to
Freeze it ,you should publish that first !
\ No newline at end of file
Index: newsletter_zh.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/resources/newsletter_zh.properties,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- newsletter_zh.properties10 Dec 2008 09:47:07 - 1.30
+++ newsletter_zh.properties19 Feb 2009 09:53:23 - 1.31
@@ -292,3 +292,4 @@
newsletter.edition.confirmation.revoke = æ¤éæ¹å
newsletter.edition.confirmation.freeze = å»ç»
newsletter.edition.confirmation.defrost = 解å»
\ No newline at end of file
+newsletter.edition.errors ={0}
è¿æ²¡æåå¸ï¼è¯·å¨å»ç»å®ä¹ååå¸å® !
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript override.js
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
In directory james.mmbase.org:/tmp/cvs-serv29603
Modified Files:
override.js
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows, make window opened at center
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: override.js
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript/override.js,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- override.js 26 Dec 2008 09:05:04 - 1.7
+++ override.js 7 Jan 2009 10:39:31 - 1.8
@@ -367,7 +367,15 @@
function getAssets(type){
//alert(Data[type]);
+ var iWidth=800;
+var iHeight=200;
+ var xposition = 0;
+var yposition = 0;
+if ((parseInt(navigator.appVersion) >= 4)) {
+xposition = (screen.width-iWidth ) / 2;
+yposition = (screen.height-iHeight - 25) / 2;
+}
var
url='../../../../editors/repository/AssetSearchAction.do?assettypes='+type+'&title='+Data[type]+'&strict='+type;
window.open(url,
- 'contentselector',
'width=730,height=550,status=yes,toolbar=no,titlebar=no,scrollbars=yes,resizable=yes,menubar=no');
+ 'contentselector',
'width=730,height=550,status=yes,toolbar=no,titlebar=no,scrollbars=yes,resizable=yes,left='+xposition+',top='+yposition+',menubar=no');
}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-teaser/src/webapp/editors/config/images search_banners_imagerel_images.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-teaser/src/webapp/editors/config/images In directory james.mmbase.org:/tmp/cvs-serv29319/portlets-teaser/src/webapp/editors/config/images Modified Files: search_banners_imagerel_images.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows, add command name="assetsselector" to banners and gallery See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-teaser/src/webapp/editors/config/images See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_banners_imagerel_images.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-teaser/src/webapp/editors/config/images/search_banners_imagerel_images.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- search_banners_imagerel_images.xml 15 Dec 2008 12:29:42 - 1.7 +++ search_banners_imagerel_images.xml 6 Jan 2009 03:19:12 - 1.8 @@ -23,7 +23,7 @@ - + Search image Zoek afbeelding æ¥æ¾å¾ç ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-gallery/src/webapp/editors/config/images search_gallery_imagerel_images.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-gallery/src/webapp/editors/config/images In directory james.mmbase.org:/tmp/cvs-serv29319/portlets-gallery/src/webapp/editors/config/images Modified Files: search_gallery_imagerel_images.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows, add command name="assetsselector" to banners and gallery See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-gallery/src/webapp/editors/config/images See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_gallery_imagerel_images.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-gallery/src/webapp/editors/config/images/search_gallery_imagerel_images.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- search_gallery_imagerel_images.xml 15 Dec 2008 12:29:41 - 1.7 +++ search_gallery_imagerel_images.xml 6 Jan 2009 03:19:12 - 1.8 @@ -23,7 +23,7 @@ - + Search image Zoek afbeelding æ¥æ¾å¾ç ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/alias/src/webapp/editors/config/urls search_pagealias_related_urls.xml
Update of /var/cvs/contributions/CMSContainer_Modules/alias/src/webapp/editors/config/urls In directory james.mmbase.org:/tmp/cvs-serv28121 Modified Files: search_pagealias_related_urls.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows, add command name="assetsselector" to page See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/alias/src/webapp/editors/config/urls See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_pagealias_related_urls.xml === RCS file: /var/cvs/contributions/CMSContainer_Modules/alias/src/webapp/editors/config/urls/search_pagealias_related_urls.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- search_pagealias_related_urls.xml 15 Dec 2008 12:18:54 - 1.2 +++ search_pagealias_related_urls.xml 6 Jan 2009 03:17:29 - 1.3 @@ -23,7 +23,7 @@ - + Search url Zoek url æ¥æ¾ url ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments search_contentelement_posrel_attachments.xml search_faqitem_posrel_attachments.xml search_link_posrel_att
Update of /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments In directory james.mmbase.org:/tmp/cvs-serv25728/basicmodel/src/webapp/editors/config/attachments Modified Files: search_contentelement_posrel_attachments.xml search_faqitem_posrel_attachments.xml search_link_posrel_attachments.xml search_newsletter_posrel_attachments.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows, add command name="assetsselector" to all See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_contentelement_posrel_attachments.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments/search_contentelement_posrel_attachments.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- search_contentelement_posrel_attachments.xml7 Jan 2008 15:40:34 - 1.5 +++ search_contentelement_posrel_attachments.xml6 Jan 2009 03:01:07 - 1.6 @@ -42,7 +42,7 @@ - + Search attachment Zoek bijlage æ¥æ¾é件 Index: search_faqitem_posrel_attachments.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments/search_faqitem_posrel_attachments.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- search_faqitem_posrel_attachments.xml 7 Jan 2008 15:40:34 - 1.7 +++ search_faqitem_posrel_attachments.xml 6 Jan 2009 03:01:07 - 1.8 @@ -42,7 +42,7 @@ - + Search attachment Zoek bijlage æ¥æ¾é件 Index: search_link_posrel_attachments.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments/search_link_posrel_attachments.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- search_link_posrel_attachments.xml 7 Jan 2008 15:40:34 - 1.6 +++ search_link_posrel_attachments.xml 6 Jan 2009 03:01:07 - 1.7 @@ -42,7 +42,7 @@ - + Search attachment Zoek bijlage æ¥æ¾é件 Index: search_newsletter_posrel_attachments.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments/search_newsletter_posrel_attachments.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- search_newsletter_posrel_attachments.xml15 Dec 2008 12:07:23 - 1.2 +++ search_newsletter_posrel_attachments.xml6 Jan 2009 03:01:07 - 1.3 @@ -42,7 +42,7 @@ - + Search attachment Zoek bijlage æ¥æ¾é件 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/images search_page_namedrel_images.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/images In directory james.mmbase.org:/tmp/cvs-serv25728/sitemanagement/src/webapp/editors/config/images Modified Files: search_page_namedrel_images.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows, add command name="assetsselector" to all See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/images See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_page_namedrel_images.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/webapp/editors/config/images/search_page_namedrel_images.xml,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- search_page_namedrel_images.xml 15 Dec 2008 12:07:24 - 1.3 +++ search_page_namedrel_images.xml 6 Jan 2009 03:01:08 - 1.4 @@ -25,7 +25,7 @@ - + Search image Zoek afbeelding æ¥æ¾å¾ç ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls search_contentelement_posrel_urls.xml search_faqitem_posrel_urls.xml search_link_posrel_urls.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls In directory james.mmbase.org:/tmp/cvs-serv25728/basicmodel/src/webapp/editors/config/urls Modified Files: search_contentelement_posrel_urls.xml search_faqitem_posrel_urls.xml search_link_posrel_urls.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows, add command name="assetsselector" to all See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_contentelement_posrel_urls.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/search_contentelement_posrel_urls.xml,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- search_contentelement_posrel_urls.xml 15 Dec 2008 12:07:24 - 1.5 +++ search_contentelement_posrel_urls.xml 6 Jan 2009 03:01:08 - 1.6 @@ -23,7 +23,7 @@ - + Search url Zoek url æ¥æ¾Url Index: search_faqitem_posrel_urls.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/search_faqitem_posrel_urls.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- search_faqitem_posrel_urls.xml 15 Dec 2008 12:07:24 - 1.6 +++ search_faqitem_posrel_urls.xml 6 Jan 2009 03:01:08 - 1.7 @@ -23,7 +23,7 @@ - + Search url Zoek url æ¥æ¾Url Index: search_link_posrel_urls.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/search_link_posrel_urls.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- search_link_posrel_urls.xml 15 Dec 2008 12:07:24 - 1.8 +++ search_link_posrel_urls.xml 6 Jan 2009 03:01:08 - 1.9 @@ -23,7 +23,7 @@ - + Search url Zoek url æ¥æ¾Url ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AssetSearchAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory james.mmbase.org:/tmp/cvs-serv5878
Modified Files:
AssetSearchAction.java
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,keep strict if search commit is
false
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: AssetSearchAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- AssetSearchAction.java 4 Jan 2009 06:33:31 - 1.12
+++ AssetSearchAction.java 5 Jan 2009 01:50:50 - 1.13
@@ -68,6 +68,11 @@
String deleteAssetRequest = request.getParameter("deleteAssetRequest");
String searchShow = request.getParameter("searchShow");
+ String strict = request.getParameter(STRICT);
+ //it is just for keep strict if search commit is false
+ if (StringUtils.isNotEmpty(strict)) {
+ request.setAttribute(STRICT, strict);
+ }
if (StringUtils.isEmpty(searchShow)) {
searchShow = (String)request.getSession().getAttribute("searchShow");
if(StringUtils.isEmpty(searchShow)){
@@ -108,9 +113,8 @@
NodeManager nodeManager =
cloud.getNodeManager(searchForm.getAssettypes());
QueryStringComposer queryStringComposer = new QueryStringComposer();
- if (StringUtils.isNotEmpty(request.getParameter(STRICT))) {
- request.setAttribute(STRICT, request.getParameter(STRICT));
- queryStringComposer.addParameter(STRICT,
request.getParameter(STRICT));
+ if (StringUtils.isNotEmpty(strict)) {
+ queryStringComposer.addParameter(STRICT, strict);
}
if (StringUtils.isNotEmpty(request.getParameter(MODE))) {
queryStringComposer.addParameter(MODE, request.getParameter(MODE));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AssetSearchAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory james.mmbase.org:/tmp/cvs-serv28184
Modified Files:
AssetSearchAction.java
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,add strict to queryStringComposer
for returnurl
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: AssetSearchAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- AssetSearchAction.java 30 Dec 2008 11:13:59 - 1.11
+++ AssetSearchAction.java 4 Jan 2009 06:33:31 - 1.12
@@ -68,9 +68,6 @@
String deleteAssetRequest = request.getParameter("deleteAssetRequest");
String searchShow = request.getParameter("searchShow");
- if (StringUtils.isNotEmpty(request.getParameter(STRICT))) {
- request.setAttribute(STRICT, request.getParameter(STRICT));
- }
if (StringUtils.isEmpty(searchShow)) {
searchShow = (String)request.getSession().getAttribute("searchShow");
if(StringUtils.isEmpty(searchShow)){
@@ -111,6 +108,10 @@
NodeManager nodeManager =
cloud.getNodeManager(searchForm.getAssettypes());
QueryStringComposer queryStringComposer = new QueryStringComposer();
+ if (StringUtils.isNotEmpty(request.getParameter(STRICT))) {
+ request.setAttribute(STRICT, request.getParameter(STRICT));
+ queryStringComposer.addParameter(STRICT,
request.getParameter(STRICT));
+ }
if (StringUtils.isNotEmpty(request.getParameter(MODE))) {
queryStringComposer.addParameter(MODE, request.getParameter(MODE));
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository assetsearch.jsp searchIconsBar.jspf
Update of /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository In directory james.mmbase.org:/tmp/cvs-serv23271 Modified Files: assetsearch.jsp searchIconsBar.jspf Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows,move thumbnail div to Iconbar See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: assetsearch.jsp === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v retrieving revision 1.15 retrieving revision 1.16 diff -u -b -r1.15 -r1.16 --- assetsearch.jsp 4 Jan 2009 03:28:10 - 1.15 +++ assetsearch.jsp 4 Jan 2009 04:45:38 - 1.16 @@ -403,10 +403,6 @@ " name="chk_" onClick="document.forms['linkForm'].elements.selectall.checked=false;"/> - - ', '', ''); top.close();"> - " /> - <%@ include file="searchIconsBar.jspf" %> Index: searchIconsBar.jspf === RCS file: /var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/searchIconsBar.jspf,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- searchIconsBar.jspf 22 Dec 2008 03:51:42 - 1.4 +++ searchIconsBar.jspf 4 Jan 2009 04:45:38 - 1.5 @@ -1,4 +1,8 @@ + + ', '', ''); top.close();"> + " /> + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository assetsearch.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv21049
Modified Files:
assetsearch.jsp
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,correct thumbnail submit
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: assetsearch.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- assetsearch.jsp 31 Dec 2008 09:03:28 - 1.14
+++ assetsearch.jsp 4 Jan 2009 03:28:10 - 1.15
@@ -36,9 +36,13 @@
var assetsMode = document.getElementsByTagName("option");3
for(i = 0; i < assetsMode.length; i++){
if(assetsMode[i].selected & assetsMode[i].id=="a_list"){
- document.location.href =
'AssetSearchAction.do?type=asset&direction=down&searchShow=list&offset='+offset;
+ document.forms[0].searchShow.value = 'list';
+ document.forms[0].submit();
+ //document.location.href =
'AssetSearchAction.do?type=asset&direction=down&searchShow=list&offset='+offset;
}else if(assetsMode[i].selected &
assetsMode[i].id=="a_thumbnail"){
- document.location.href =
'AssetSearchAction.do?type=asset&direction=down&searchShow=thumbnail&offset='+offset;
+ document.forms[0].searchShow.value = 'thumbnail';
+ document.forms[0].submit();
+ //document.location.href =
'AssetSearchAction.do?type=asset&direction=down&searchShow=thumbnail&offset='+offset;
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl wizard.xsl
Update of /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl In directory james.mmbase.org:/tmp/cvs-serv9847/edit-webapp/src/webapp/editors/editwizards_new/xsl Modified Files: wizard.xsl Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows,add assetsselector in editwizard for Searching See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: wizard.xsl === RCS file: /var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/xsl/wizard.xsl,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- wizard.xsl 15 Dec 2008 05:08:37 - 1.18 +++ wizard.xsl 26 Dec 2008 09:05:04 - 1.19 @@ -468,6 +468,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -598,6 +636,10 @@ + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments search_article_posrel_attachments.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments In directory james.mmbase.org:/tmp/cvs-serv9847/basicmodel/src/webapp/editors/config/attachments Modified Files: search_article_posrel_attachments.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows,add assetsselector in editwizard for Searching See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_article_posrel_attachments.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/attachments/search_article_posrel_attachments.xml,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- search_article_posrel_attachments.xml 7 Jan 2008 15:40:34 - 1.7 +++ search_article_posrel_attachments.xml 26 Dec 2008 09:05:04 - 1.8 @@ -42,7 +42,7 @@ - + Search attachment Zoek bijlage æ¥æ¾é件 ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript override.js
Update of
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
In directory
james.mmbase.org:/tmp/cvs-serv9847/edit-webapp/src/webapp/editors/editwizards_new/javascript
Modified Files:
override.js
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,add assetsselector in editwizard
for Searching
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: override.js
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/edit-webapp/src/webapp/editors/editwizards_new/javascript/override.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- override.js 15 Dec 2008 05:40:58 - 1.6
+++ override.js 26 Dec 2008 09:05:04 - 1.7
@@ -354,3 +354,20 @@
document.getElementById(fieldName).value='';
}
}
\ No newline at end of file
+
+function selectAssets(ele,type){
+Data[type] = ele.value;
+}
+
+var Data = {
+attachments: "",
+ images:"",
+ urls:""
+}
+
+function getAssets(type){
+//alert(Data[type]);
+ var
url='../../../../editors/repository/AssetSearchAction.do?assettypes='+type+'&title='+Data[type]+'&strict='+type;
+ window.open(url,
+ 'contentselector',
'width=730,height=550,status=yes,toolbar=no,titlebar=no,scrollbars=yes,resizable=yes,menubar=no');
+}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/images search_contentelement_imagerel_images.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/images In directory james.mmbase.org:/tmp/cvs-serv9847/basicmodel/src/webapp/editors/config/images Modified Files: search_contentelement_imagerel_images.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows,add assetsselector in editwizard for Searching See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/images See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_contentelement_imagerel_images.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/images/search_contentelement_imagerel_images.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- search_contentelement_imagerel_images.xml 7 Oct 2008 09:57:26 - 1.6 +++ search_contentelement_imagerel_images.xml 26 Dec 2008 09:05:04 - 1.7 @@ -48,7 +48,7 @@ - + Search image Zoek afbeelding æ¥æ¾å¾ç ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls search_article_posrel_urls.xml
Update of /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls In directory james.mmbase.org:/tmp/cvs-serv9847/basicmodel/src/webapp/editors/config/urls Modified Files: search_article_posrel_urls.xml Log Message: CMSC-268, ASSET:Searching for primary and secondary content for an article using the more advanced custom search windows,add assetsselector in editwizard for Searching See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls See also: http://www.mmbase.org/jira/browse/CMSC-268 Index: search_article_posrel_urls.xml === RCS file: /var/cvs/contributions/CMSContainer/cmsc/basicmodel/src/webapp/editors/config/urls/search_article_posrel_urls.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- search_article_posrel_urls.xml 15 Dec 2008 12:07:24 - 1.6 +++ search_article_posrel_urls.xml 26 Dec 2008 09:05:04 - 1.7 @@ -23,7 +23,7 @@ - + Search url Zoek url æ¥æ¾Url ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository assetsearch.jsp
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
In directory james.mmbase.org:/tmp/cvs-serv9401/webapp/editors/repository
Modified Files:
assetsearch.jsp
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,improve advanced custom search
windows for special assets
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: assetsearch.jsp
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/webapp/editors/repository/assetsearch.jsp,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- assetsearch.jsp 26 Dec 2008 07:09:44 - 1.11
+++ assetsearch.jsp 26 Dec 2008 08:50:55 - 1.12
@@ -52,7 +52,7 @@
-
+
@@ -69,7 +69,7 @@
-
+
@@ -83,6 +83,10 @@
+
+
+
+
"/>
"/>
@@ -99,10 +103,15 @@
+
+ ${strict}
+
+
<>
+
@@ -389,6 +398,10 @@
" name="chk_"
onClick="document.forms['linkForm'].elements.selectall.checked=false;"/>
+
+ ', '', ''); top.close();">
+ " />
+
<%@ include file="searchIconsBar.jspf" %>
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms AssetSearchAction.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
In directory
james.mmbase.org:/tmp/cvs-serv9401/java/com/finalist/cmsc/repository/forms
Modified Files:
AssetSearchAction.java
Log Message:
CMSC-268, ASSET:Searching for primary and secondary content for an article
using the more advanced custom search windows,improve advanced custom search
windows for special assets
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms
See also: http://www.mmbase.org/jira/browse/CMSC-268
Index: AssetSearchAction.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/contentrepository/src/java/com/finalist/cmsc/repository/forms/AssetSearchAction.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- AssetSearchAction.java 25 Dec 2008 05:40:55 - 1.9
+++ AssetSearchAction.java 26 Dec 2008 08:50:55 - 1.10
@@ -44,6 +44,7 @@
public static final String PERSONAL = "personal";
public static final String MODE = "mode";
+ public static final String STRICT = "strict";
public static final String AUTHOR = "author";
public static final String OBJECTID = "objectid";
public static final String PARENTCHANNEL = "parentchannel";
@@ -67,7 +68,9 @@
String deleteAssetRequest = request.getParameter("deleteAssetRequest");
String searchShow = request.getParameter("searchShow");
-
+ if (StringUtils.isNotEmpty(request.getParameter(STRICT))) {
+ request.setAttribute(STRICT, request.getParameter(STRICT));
+ }
if (StringUtils.isEmpty(searchShow)) {
searchShow = (String)request.getSession().getAttribute("searchShow");
if(StringUtils.isEmpty(searchShow)){
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess DataAccessor.java
Update of
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
In directory james.mmbase.org:/tmp/cvs-serv29182
Modified Files:
DataAccessor.java
Log Message:
CMSC-1166, KNMI migration to the CMS Container,deal with encoding is bank
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
See also: http://www.mmbase.org/jira/browse/CMSC-1166
Index: DataAccessor.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessor.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- DataAccessor.java 18 Dec 2008 07:11:44 - 1.9
+++ DataAccessor.java 19 Dec 2008 00:58:55 - 1.10
@@ -192,7 +192,7 @@
private Object encoding(ResultSet rs, String fieldName) throws SQLException
{
Object obj=rs.getObject(fieldName);
- if (obj instanceof String&&StringUtils.isBlank(encoding)) {
+ if (obj instanceof String&&StringUtils.isNotBlank(encoding)) {
try {
String untrimmedResult = new String(((String)
obj).getBytes(encoding), "utf-8");
return untrimmedResult;
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter PublicationSentCronJob.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
In directory james.mmbase.org:/tmp/cvs-serv7181
Modified Files:
Tag: b1_5
PublicationSentCronJob.java
Log Message:
CMSC-1187,Newsletter: improve publication and sending mechanism,disable
mechanism run at live.,before freezing stage publish that.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: PublicationSentCronJob.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/PublicationSentCronJob.java,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -b -r1.3.2.1 -r1.3.2.2
--- PublicationSentCronJob.java 24 Oct 2008 13:53:54 - 1.3.2.1
+++ PublicationSentCronJob.java 18 Dec 2008 10:09:22 - 1.3.2.2
@@ -4,6 +4,7 @@
import org.apache.commons.logging.LogFactory;
import org.mmbase.applications.crontab.AbstractCronJob;
+import com.finalist.cmsc.navigation.ServerUtil;
import com.finalist.cmsc.services.community.ApplicationContextFactory;
import com.finalist.newsletter.services.NewsletterPublicationService;
@@ -23,8 +24,11 @@
@Override
public void run() {
+ if(ServerUtil.isSingle() || ServerUtil.isStaging()) {
log.debug("Delivering all publications.");
NewsletterPublicationService service = (NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
service.deliverAllPublication();
}
+
+ }
}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv7181/util
Modified Files:
Tag: b1_5
NewsletterPublicationUtil.java
Log Message:
CMSC-1187,Newsletter: improve publication and sending mechanism,disable
mechanism run at live.,before freezing stage publish that.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: NewsletterPublicationUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.26.2.10
retrieving revision 1.26.2.11
diff -u -b -r1.26.2.10 -r1.26.2.11
--- NewsletterPublicationUtil.java 12 Dec 2008 17:26:55 -
1.26.2.10
+++ NewsletterPublicationUtil.java 18 Dec 2008 10:09:22 -
1.26.2.11
@@ -176,6 +176,7 @@
* @throws MessagingException
*/
public static void freezeEdition(Node edition) throws MessagingException {
+ publish(edition);
String static_html = getStaticHtml(edition.getNumber());
edition.setStringValue("process_status", EditionStatus.FROZEN.value());
// edition.setValue("static_html",
StringEscapeUtils.escapeHtml(static_html));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv7104/util
Modified Files:
NewsletterPublicationUtil.java
Log Message:
CMSC-1187,Newsletter: improve publication and sending mechanism,disable
mechanism run at live.,before freezing stage publish that.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: NewsletterPublicationUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- NewsletterPublicationUtil.java 12 Dec 2008 17:27:02 - 1.38
+++ NewsletterPublicationUtil.java 18 Dec 2008 10:06:46 - 1.39
@@ -176,6 +176,7 @@
* @throws MessagingException
*/
public static void freezeEdition(Node edition) throws MessagingException {
+ publish(edition);
String static_html = getStaticHtml(edition.getNumber());
edition.setStringValue("process_status", EditionStatus.FROZEN.value());
// edition.setValue("static_html",
StringEscapeUtils.escapeHtml(static_html));
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter PublicationSentCronJob.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
In directory james.mmbase.org:/tmp/cvs-serv7104
Modified Files:
PublicationSentCronJob.java
Log Message:
CMSC-1187,Newsletter: improve publication and sending mechanism,disable
mechanism run at live.,before freezing stage publish that.
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter
See also: http://www.mmbase.org/jira/browse/CMSC-1187
Index: PublicationSentCronJob.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/PublicationSentCronJob.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- PublicationSentCronJob.java 24 Oct 2008 13:54:12 - 1.5
+++ PublicationSentCronJob.java 18 Dec 2008 10:06:46 - 1.6
@@ -24,7 +24,7 @@
@Override
public void run() {
- if(ServerUtil.isSingle() || ServerUtil.isLive()) {
+ if(ServerUtil.isSingle() || ServerUtil.isStaging()) {
log.debug("Delivering all publications.");
NewsletterPublicationService service = (NewsletterPublicationService)
ApplicationContextFactory.getBean("publicationService");
service.deliverAllPublication();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess DataAccessor.java
Update of
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
In directory james.mmbase.org:/tmp/cvs-serv2526/dataaccess
Modified Files:
DataAccessor.java
Log Message:
CMSC-1166, KNMI migration to the CMS Container,deal with charaterset
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
See also: http://www.mmbase.org/jira/browse/CMSC-1166
Index: DataAccessor.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessor.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- DataAccessor.java 10 Dec 2008 07:17:55 - 1.8
+++ DataAccessor.java 18 Dec 2008 07:11:44 - 1.9
@@ -2,6 +2,7 @@
import java.io.IOException;
import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
import java.sql.Blob;
import java.sql.Connection;
import java.sql.ResultSet;
@@ -27,6 +28,7 @@
private static final Logger log =
Logging.getLoggerInstance(DataAccessor.class.getName());
+ public static String encoding;
private DataSource dataSource;
private ElementMeta elementMeta;
private Query query;
@@ -170,11 +172,11 @@
Elements element = new Elements();
for(String fieldName : elementMeta.getFieldNames()) {
if(StringUtils.isNotEmpty(fieldName)) {
-
if(StringUtils.isEmpty(elementMeta.getStyle(fieldName))&&StringUtils.isEmpty(elementMeta.getPrefix(fieldName))
|| (rs.getObject(fieldName) != null &&
rs.getObject(fieldName).toString().startsWith(URL_PROTOCOL))) {
-
element.setValue(elementMeta.getDesFieldName(fieldName),rs.getObject(fieldName));
+
if(StringUtils.isEmpty(elementMeta.getStyle(fieldName))&&StringUtils.isEmpty(elementMeta.getPrefix(fieldName))
|| (encoding(rs, fieldName) != null && encoding(rs,
fieldName).toString().startsWith(URL_PROTOCOL))) {
+
element.setValue(elementMeta.getDesFieldName(fieldName),encoding(rs,
fieldName));
}
else if(!StringUtils.isEmpty(elementMeta.getPrefix(fieldName))){
-
element.setValue(elementMeta.getDesFieldName(fieldName),elementMeta.getPrefix(fieldName)+rs.getObject(fieldName));
+
element.setValue(elementMeta.getDesFieldName(fieldName),elementMeta.getPrefix(fieldName)+encoding(rs,
fieldName));
}else if(!StringUtils.isEmpty(elementMeta.getStyle(fieldName))){
String changeMethod=elementMeta.getStyle(fieldName);
Object o=changeStyle(changeMethod,rs,fieldName);
@@ -188,6 +190,20 @@
}
}
+ private Object encoding(ResultSet rs, String fieldName) throws SQLException
{
+ Object obj=rs.getObject(fieldName);
+ if (obj instanceof String&&StringUtils.isBlank(encoding)) {
+ try {
+String untrimmedResult = new String(((String)
obj).getBytes(encoding), "utf-8");
+return untrimmedResult;
+ } catch (UnsupportedEncodingException e) {
+// TODO Auto-generated catch block
+e.printStackTrace();
+ }
+ }
+ return obj;
+ }
+
private Object changeStyle(String changeMethod, ResultSet rs, String
fieldName) {
try {
if (INT_TO_DATA.equals(changeMethod)) {
@@ -205,7 +221,7 @@
byte[] b = new byte[4096];
try {
for (int n; (n = inStream.read(b)) != -1;) {
- out.append(new String(b, 0, n));
+ out.append(new String(b, 0, n, "utf-8"));
}
} catch (IOException e) {
log.error("changeMethod failure!"+changeMethod+"can't make
datatype chnge!"+e.getMessage());
@@ -218,7 +234,7 @@
if("1".equals(s.trim())){
return true;
}
-return org.mmbase.util.transformers.Xml.XMLEscape(s);
+return s;
}
} catch (SQLException e) {
log.error("changeMethod failure!"+changeMethod+"can't make datatype
chnge!"+e.getMessage());
@@ -233,11 +249,11 @@
Elements element = new Elements();
for(String fieldName : elementMeta.getRelateFields()) {
if(StringUtils.isNotEmpty(fieldName)) {
- if(StringUtils.isEmpty(elementMeta.getPrefix(fieldName)) ||
(rs.getObject(fieldName) != null &&
rs.getObject(fieldName).toString().startsWith(URL_PROTOCOL))) {
-
element.setValue(elementMeta.getDesFieldName(fieldName),rs.getObject(fieldName));
+ if(StringUtils.isEmpty(elementMeta.getPrefix(fieldName)) ||
(encoding(rs, fieldName) != null && encoding(rs,
fieldName).toString().startsWith(URL_PROTOCOL))) {
+
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service Conversion.java
Update of
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service
In directory james.mmbase.org:/tmp/cvs-serv2526/service
Modified Files:
Conversion.java
Log Message:
CMSC-1166, KNMI migration to the CMS Container,deal with charaterset
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service
See also: http://www.mmbase.org/jira/browse/CMSC-1166
Index: Conversion.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service/Conversion.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- Conversion.java 28 Nov 2008 07:30:44 - 1.5
+++ Conversion.java 18 Dec 2008 07:11:44 - 1.6
@@ -66,6 +66,8 @@
dom =
XMLParser.parseXMLToDOM(context.getResourceAsStream(IMPORT_FILE));
// XMLParser.DTDValidator(dom);
Element element = (Element)
dom.getElementsByTagName("import").item(0);
+ String encoding=element.getAttribute("encoding");
+ DataAccessor.encoding=encoding;
NodeList list = element.getChildNodes();
List sources = new ArrayList();
List clondSources = new ArrayList();
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEdit.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv1617
Modified Files:
Tag: b1_5
NewsletterEdit.java
Log Message:
CMSC-1181, The page tree does not refresh after editing a page title,refresh if
edit newsletter
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1181
Index: NewsletterEdit.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.13.2.1
retrieving revision 1.13.2.2
diff -u -b -r1.13.2.1 -r1.13.2.2
--- NewsletterEdit.java 14 Nov 2008 10:12:48 - 1.13.2.1
+++ NewsletterEdit.java 16 Dec 2008 09:56:28 - 1.13.2.2
@@ -62,7 +62,7 @@
// }
int nodeId = Integer.parseInt(request.getParameter("objectnumber"));
- ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId+
"&fresh=fresh");
if (forwardType.equals("manage")) {
ret = mapping.findForward("newslettermanage");
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms PageEdit.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
In directory james.mmbase.org:/tmp/cvs-serv1547
Modified Files:
Tag: b1_5
PageEdit.java
Log Message:
CMSC-1181, The page tree does not refresh after editing a page title,refresh if
edit page
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1181
Index: PageEdit.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/PageEdit.java,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- PageEdit.java 28 Jul 2008 14:51:42 - 1.6
+++ PageEdit.java 16 Dec 2008 09:54:43 - 1.6.2.1
@@ -38,7 +38,7 @@
} else {
int nodeId =
Integer.parseInt(request.getParameter("objectnumber"));
SecurityUtil.clearUserRoles(cloud);
- ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId+
"&fresh=fresh");
return ret;
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms PageEdit.java
Update of
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
In directory james.mmbase.org:/tmp/cvs-serv1430
Modified Files:
PageEdit.java
Log Message:
CMSC-1181, The page tree does not refresh after editing a page title,refresh if
edit page
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1181
Index: PageEdit.java
===
RCS file:
/var/cvs/contributions/CMSContainer/cmsc/sitemanagement/src/java/com/finalist/cmsc/navigation/forms/PageEdit.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PageEdit.java 28 Jul 2008 14:51:42 - 1.6
+++ PageEdit.java 16 Dec 2008 09:49:15 - 1.7
@@ -38,7 +38,7 @@
} else {
int nodeId =
Integer.parseInt(request.getParameter("objectnumber"));
SecurityUtil.clearUserRoles(cloud);
- ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId+
"&fresh=fresh");
return ret;
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEdit.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv1377
Modified Files:
NewsletterEdit.java
Log Message:
CMSC-1181, The page tree does not refresh after editing a page title,refresh if
edit newsletter
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1181
Index: NewsletterEdit.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEdit.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- NewsletterEdit.java 14 Nov 2008 10:11:23 - 1.18
+++ NewsletterEdit.java 16 Dec 2008 09:48:00 - 1.19
@@ -62,7 +62,7 @@
// }
int nodeId = Integer.parseInt(request.getParameter("objectnumber"));
- ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId);
+ ActionForward ret = new
ActionForward(mapping.findForward(SUCCESS).getPath() + "?nodeId=" + nodeId+
"&fresh=fresh");
if (forwardType.equals("manage")) {
ret = mapping.findForward("newslettermanage");
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging In directory james.mmbase.org:/tmp/cvs-serv7785 Modified Files: Tag: b1_5 project.xml Log Message: CMSC-1104, JForum portlet does not work on test environment,disable the deps on war-staging See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging See also: http://www.mmbase.org/jira/browse/CMSC-1104 Index: project.xml === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v retrieving revision 1.6.2.2 retrieving revision 1.6.2.3 diff -u -b -r1.6.2.2 -r1.6.2.3 --- project.xml 12 Dec 2008 04:43:37 - 1.6.2.2 +++ project.xml 15 Dec 2008 03:08:03 - 1.6.2.3 @@ -53,7 +53,7 @@ - + \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging In directory james.mmbase.org:/tmp/cvs-serv7522 Modified Files: project.xml Log Message: CMSC-1104, JForum portlet does not work on test environment,disable the deps on war-staging See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging See also: http://www.mmbase.org/jira/browse/CMSC-1104 Index: project.xml === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v retrieving revision 1.8 retrieving revision 1.9 diff -u -b -r1.8 -r1.9 --- project.xml 12 Dec 2008 04:40:44 - 1.8 +++ project.xml 15 Dec 2008 03:04:12 - 1.9 @@ -53,7 +53,7 @@ - + \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv32285
Modified Files:
Tag: b1_5
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements,move javascript to jspf
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.6.2.8
retrieving revision 1.6.2.9
diff -u -b -r1.6.2.8 -r1.6.2.9
--- userlist_table.jspf 12 Dec 2008 05:32:00 - 1.6.2.8
+++ userlist_table.jspf 12 Dec 2008 06:22:47 - 1.6.2.9
@@ -58,7 +58,12 @@
}
}
}
-})();
+ })();
+ function selectState(url,ele){
+ surl=url+"&state="+ele.value
+ // alert(surl);
+ window.location.href =surl;
+ }
function selectAll(value, formName, elementPrefix) {
var elements = document.forms[formName].elements;
for (var i = 0; i < elements.length; i++) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv32285/js
Modified Files:
Tag: b1_5
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements,move javascript to jspf
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.2.2.4
retrieving revision 1.2.2.5
diff -u -b -r1.2.2.4 -r1.2.2.5
--- formcheck.js11 Dec 2008 05:24:43 - 1.2.2.4
+++ formcheck.js12 Dec 2008 06:22:47 - 1.2.2.5
@@ -23,25 +23,3 @@
document.forms[0].method.value = "addInit";
document.forms[0].submit();
}
-function selectState(url,ele){
- surl=url+"&state="+ele.value
- // alert(surl);
- window.location.href =surl;
-}
-function onState(){
-var sels = document.getElementsByTagName("select");
-for (i = 0; i < sels.length; i++) {
-var sel = sels[i];
-var options = sel.getElementsByTagName("option");
-var v = options[0];
-if ("" == v.value) {
-options[0].parentNode.removeChild(options[0]);
-}
-for (j = 1; j < options.length; j++) {
-if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
-options[j].selected=true;
-options[0].parentNode.removeChild(options[0]);
-}
-}
-}
-}
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv32165
Modified Files:
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements,move javascript to jspf
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- userlist_table.jspf 12 Dec 2008 05:34:21 - 1.14
+++ userlist_table.jspf 12 Dec 2008 06:19:28 - 1.15
@@ -58,7 +58,12 @@
}
}
}
-})();
+ })();
+ function selectState(url,ele){
+ surl=url+"&state="+ele.value
+ // alert(surl);
+ window.location.href =surl;
+ }
function selectAll(value, formName, elementPrefix) {
var elements = document.forms[formName].elements;
for (var i = 0; i < elements.length; i++) {
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv32165/js
Modified Files:
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements,move javascript to jspf
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- formcheck.js11 Dec 2008 05:32:57 - 1.6
+++ formcheck.js12 Dec 2008 06:19:28 - 1.7
@@ -23,25 +23,4 @@
document.forms[0].method.value = "addInit";
document.forms[0].submit();
}
-function selectState(url,ele){
- surl=url+"&state="+ele.value
- // alert(surl);
- window.location.href =surl;
-}
-function onState(){
-var sels = document.getElementsByTagName("select");
-for (i = 0; i < sels.length; i++) {
-var sel = sels[i];
-var options = sel.getElementsByTagName("option");
-var v = options[0];
-if ("" == v.value) {
-options[0].parentNode.removeChild(options[0]);
-}
-for (j = 1; j < options.length; j++) {
-if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
-options[j].selected=true;
-options[0].parentNode.removeChild(options[0]);
-}
-}
-}
-}
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community In directory james.mmbase.org:/tmp/cvs-serv31448 Modified Files: userlist_table.jspf Log Message: CMSC-949, Blocking users: user status enhancements,add javascript to jspf See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community See also: http://www.mmbase.org/jira/browse/CMSC-949 Index: userlist_table.jspf === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v retrieving revision 1.13 retrieving revision 1.14 diff -u -b -r1.13 -r1.14 --- userlist_table.jspf 11 Dec 2008 05:32:57 - 1.13 +++ userlist_table.jspf 12 Dec 2008 05:34:21 - 1.14 @@ -42,7 +42,23 @@
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community In directory james.mmbase.org:/tmp/cvs-serv31338 Modified Files: Tag: b1_5 userlist_table.jspf Log Message: CMSC-949, Blocking users: user status enhancements,add javascript to jspf See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community See also: http://www.mmbase.org/jira/browse/CMSC-949 Index: userlist_table.jspf === RCS file: /var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v retrieving revision 1.6.2.7 retrieving revision 1.6.2.8 diff -u -b -r1.6.2.7 -r1.6.2.8 --- userlist_table.jspf 11 Dec 2008 05:24:43 - 1.6.2.7 +++ userlist_table.jspf 12 Dec 2008 05:32:00 - 1.6.2.8 @@ -42,7 +42,23 @@
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
In directory james.mmbase.org:/tmp/cvs-serv29346/war-staging
Modified Files:
Tag: b1_5
project.xml
Log Message:
CMSC-1104, JForum portlet does not work on test environment, change freemarker
to 13
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v
retrieving revision 1.6.2.1
retrieving revision 1.6.2.2
diff -u -b -r1.6.2.1 -r1.6.2.2
--- project.xml 11 Dec 2008 02:37:17 - 1.6.2.1
+++ project.xml 12 Dec 2008 04:43:37 - 1.6.2.2
@@ -57,7 +57,7 @@
freemarker
freemarker
-2.3.9
+2.3.13
jar
${war.bundle}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory james.mmbase.org:/tmp/cvs-serv29346/war-community
Modified Files:
Tag: b1_5
project.xml
Log Message:
CMSC-1104, JForum portlet does not work on test environment, change freemarker
to 13
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.22.2.1
retrieving revision 1.22.2.2
diff -u -b -r1.22.2.1 -r1.22.2.2
--- project.xml 11 Dec 2008 02:37:16 - 1.22.2.1
+++ project.xml 12 Dec 2008 04:43:37 - 1.22.2.2
@@ -220,7 +220,7 @@
freemarker
freemarker
-2.3.9
+2.3.13
jar
${war.bundle}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
In directory james.mmbase.org:/tmp/cvs-serv29259/war-staging
Modified Files:
project.xml
Log Message:
CMSC-1104, JForum portlet does not work on test environment, change freemarker
to 13
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- project.xml 12 Dec 2008 04:28:51 - 1.7
+++ project.xml 12 Dec 2008 04:40:44 - 1.8
@@ -57,7 +57,7 @@
freemarker
freemarker
-2.3.9
+2.3.13
jar
${war.bundle}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
In directory james.mmbase.org:/tmp/cvs-serv29259/war-community
Modified Files:
project.xml
Log Message:
CMSC-1104, JForum portlet does not work on test environment, change freemarker
to 13
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- project.xml 12 Dec 2008 04:28:51 - 1.23
+++ project.xml 12 Dec 2008 04:40:44 - 1.24
@@ -220,7 +220,7 @@
freemarker
freemarker
-2.3.9
+2.3.13
jar
${war.bundle}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community In directory james.mmbase.org:/tmp/cvs-serv28697/war-community Modified Files: project.xml Log Message: CMSC-1104, JForum portlet does not work on test environment, added dependencies taht JForum-portlet needed in community and staging See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community See also: http://www.mmbase.org/jira/browse/CMSC-1104 Index: project.xml === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v retrieving revision 1.22 retrieving revision 1.23 diff -u -b -r1.22 -r1.23 --- project.xml 4 Jul 2008 06:30:32 - 1.22 +++ project.xml 12 Dec 2008 04:28:51 - 1.23 @@ -216,7 +216,7 @@ - +
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
In directory james.mmbase.org:/tmp/cvs-serv28697/war-staging
Modified Files:
project.xml
Log Message:
CMSC-1104, JForum portlet does not work on test environment, added dependencies
taht JForum-portlet needed in community and staging
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- project.xml 1 Aug 2008 14:47:06 - 1.6
+++ project.xml 12 Dec 2008 04:28:51 - 1.7
@@ -52,6 +52,98 @@
false
+
+
+freemarker
+freemarker
+2.3.9
+jar
+
+${war.bundle}
+
+
+
+
+quartz
+quartz
+1.5.1
+jar
+
+${war.bundle}
+
+
+
+c3p0
+c3p0
+0.9.1
+jar
+
+${war.bundle}
+
+
+
+com.octo.captcha
+jcaptcha-all
+1.0-RC-2.0.1
+jar
+
+${war.bundle}
+
+
+
+lucene
+lucene-core
+2.3.2
+jar
+
+${war.bundle}
+
+
+
+lucene
+lucene-highlighter
+2.3.2
+jar
+
+${war.bundle}
+
+
+
+lucene
+lucene-analyzers
+2.3.2
+jar
+
+${war.bundle}
+
+
+
+jforum
+jforum
+2.1.8
+jar
+
+${war.bundle}
+
+
+
+javamail
+mail
+1.4
+jar
+
+${war.bundle}
+
+
+
+concurrent
+concurrent
+1.3.2
+jar
+
+${war.bundle}
+
+
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionApprove.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv26901/forms
Modified Files:
Tag: b1_5
NewsletterEditionApprove.java
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved
newsletter edition,get user to fill
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1163
Index: NewsletterEditionApprove.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionApprove.java,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- NewsletterEditionApprove.java 4 Dec 2008 09:24:53 - 1.2.2.3
+++ NewsletterEditionApprove.java 11 Dec 2008 08:44:15 - 1.2.2.4
@@ -11,9 +11,7 @@
protected void doSave(HttpServletRequest request, Node edition)
throws Exception {
if(!EditionStatus.APPROVED.value().equals(edition.getValue("process_status"))) {
- String
appUser=request.getSession().getValue("cloud_mmbase").toString();
- String[] result = appUser.split("\\s");
- NewsletterPublicationUtil.approveEdition(edition,result[3]);
+ NewsletterPublicationUtil.approveEdition(edition);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv26901/util
Modified Files:
Tag: b1_5
NewsletterPublicationUtil.java
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved
newsletter edition,get user to fill
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1163
Index: NewsletterPublicationUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.26.2.8
retrieving revision 1.26.2.9
diff -u -b -r1.26.2.8 -r1.26.2.9
--- NewsletterPublicationUtil.java 4 Dec 2008 09:24:54 - 1.26.2.8
+++ NewsletterPublicationUtil.java 11 Dec 2008 08:44:15 - 1.26.2.9
@@ -195,8 +195,9 @@
/**
* Approve a edition
*/
- public static void approveEdition(Node edition,String user) {
+ public static void approveEdition(Node edition) {
edition.setStringValue("process_status", EditionStatus.APPROVED.value());
+ String user=edition.getCloud().getUser().getIdentifier();
edition.setStringValue("approved_by", user);
edition.commit();
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv26740/util
Modified Files:
NewsletterPublicationUtil.java
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved
newsletter edition,get user to fill
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1163
Index: NewsletterPublicationUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -b -r1.36 -r1.37
--- NewsletterPublicationUtil.java 4 Dec 2008 09:23:09 - 1.36
+++ NewsletterPublicationUtil.java 11 Dec 2008 08:35:19 - 1.37
@@ -195,8 +195,9 @@
/**
* Approve a edition
*/
- public static void approveEdition(Node edition,String user) {
+ public static void approveEdition(Node edition) {
edition.setStringValue("process_status", EditionStatus.APPROVED.value());
+ String user=edition.getCloud().getUser().getIdentifier();
edition.setStringValue("approved_by", user);
edition.commit();
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionApprove.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv26740/forms
Modified Files:
NewsletterEditionApprove.java
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved
newsletter edition,get user to fill
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1163
Index: NewsletterEditionApprove.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionApprove.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- NewsletterEditionApprove.java 4 Dec 2008 09:23:09 - 1.3
+++ NewsletterEditionApprove.java 11 Dec 2008 08:35:19 - 1.4
@@ -11,9 +11,7 @@
protected void doSave(HttpServletRequest request, Node edition)
throws Exception {
if(!EditionStatus.APPROVED.value().equals(edition.getValue("process_status"))) {
- String
appUser=request.getSession().getValue("cloud_mmbase").toString();
- String[] result = appUser.split("\\s");
- NewsletterPublicationUtil.approveEdition(edition,result[3]);
+ NewsletterPublicationUtil.approveEdition(edition);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv23679/src/webapp/editors/community
Modified Files:
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements,add i18n script
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -b -r1.12 -r1.13
--- userlist_table.jspf 9 Dec 2008 05:27:58 - 1.12
+++ userlist_table.jspf 11 Dec 2008 05:32:57 - 1.13
@@ -34,7 +34,7 @@
- ${person.active}
+ ${person.active}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/resources cmsc-community_zh.properties
Update of /var/cvs/contributions/CMSContainer_Modules/community/resources
In directory james.mmbase.org:/tmp/cvs-serv23679/resources
Modified Files:
cmsc-community_zh.properties
Log Message:
CMSC-949, Blocking users: user status enhancements,add i18n script
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: cmsc-community_zh.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community_zh.properties,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- cmsc-community_zh.properties2 Dec 2008 14:28:17 - 1.10
+++ cmsc-community_zh.properties11 Dec 2008 05:32:57 - 1.11
@@ -108,7 +108,7 @@
community.search.addUserToGroup = æ·»å ç¨æ·å°{0}ç»
community.search.addToSubscribe = æ·»å ç¨æ·è®¢é
-community.search.state = State
-community.search.state.active = Active
-community.search.state.unconfirmed = Unconfirmed
-community.search.state.blocked = Blocked
\ No newline at end of file
+community.search.state = ç¶æ
+community.search.state.active = å·²æ¿æ´»
+community.search.state.unconfirmed = æªç¡®è®¤
+community.search.state.blocked = å·²éå®
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv23679/src/webapp/editors/community/js
Modified Files:
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements,add i18n script
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- formcheck.js8 Dec 2008 07:03:09 - 1.5
+++ formcheck.js11 Dec 2008 05:32:57 - 1.6
@@ -39,7 +39,8 @@
}
for (j = 1; j < options.length; j++) {
if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
-options[j].parentNode.removeChild(options[j]);
+options[j].selected=true;
+options[0].parentNode.removeChild(options[0]);
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/resources cmsc-community_zh.properties
Update of /var/cvs/contributions/CMSContainer_Modules/community/resources
In directory james.mmbase.org:/tmp/cvs-serv23481/resources
Modified Files:
Tag: b1_5
cmsc-community_zh.properties
Log Message:
CMSC-949, Blocking users: user status enhancements,add i18n script
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/resources
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: cmsc-community_zh.properties
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/resources/cmsc-community_zh.properties,v
retrieving revision 1.8.2.2
retrieving revision 1.8.2.3
diff -u -b -r1.8.2.2 -r1.8.2.3
--- cmsc-community_zh.properties2 Dec 2008 14:28:23 - 1.8.2.2
+++ cmsc-community_zh.properties11 Dec 2008 05:24:43 - 1.8.2.3
@@ -108,7 +108,7 @@
community.search.addUserToGroup = æ·»å ç¨æ·å°{0}ç»
community.search.addToSubscribe = æ·»å ç¨æ·è®¢é
-community.search.state = State
-community.search.state.active = Active
-community.search.state.unconfirmed = Unconfirmed
-community.search.state.blocked = Blocked
\ No newline at end of file
+community.search.state = ç¶æ
+community.search.state.active = å·²æ¿æ´»
+community.search.state.unconfirmed = æªç¡®è®¤
+community.search.state.blocked = å·²éå®
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv23481/src/webapp/editors/community/js
Modified Files:
Tag: b1_5
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements,add i18n script
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.2.2.3
retrieving revision 1.2.2.4
diff -u -b -r1.2.2.3 -r1.2.2.4
--- formcheck.js8 Dec 2008 07:00:46 - 1.2.2.3
+++ formcheck.js11 Dec 2008 05:24:43 - 1.2.2.4
@@ -39,7 +39,8 @@
}
for (j = 1; j < options.length; j++) {
if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
-options[j].parentNode.removeChild(options[j]);
+options[j].selected=true;
+options[0].parentNode.removeChild(options[0]);
}
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv23481/src/webapp/editors/community
Modified Files:
Tag: b1_5
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements,add i18n script
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.6.2.6
retrieving revision 1.6.2.7
diff -u -b -r1.6.2.6 -r1.6.2.7
--- userlist_table.jspf 9 Dec 2008 05:36:38 - 1.6.2.6
+++ userlist_table.jspf 11 Dec 2008 05:24:43 - 1.6.2.7
@@ -34,7 +34,7 @@
- ${person.active}
+ ${person.active}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community project.xml
Update of /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community In directory james.mmbase.org:/tmp/cvs-serv16035/war-community Modified Files: Tag: b1_5 project.xml Log Message: CMSC-1104, JForum portlet does not work on test environment, added dependencies taht JForum-portlet needed in community and staging See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community See also: http://www.mmbase.org/jira/browse/CMSC-1104 Index: project.xml === RCS file: /var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-community/project.xml,v retrieving revision 1.22 retrieving revision 1.22.2.1 diff -u -b -r1.22 -r1.22.2.1 --- project.xml 4 Jul 2008 06:30:32 - 1.22 +++ project.xml 11 Dec 2008 02:37:16 - 1.22.2.1 @@ -216,7 +216,7 @@ - +
[MMBASE CVS] contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging project.xml
Update of
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
In directory james.mmbase.org:/tmp/cvs-serv16035/war-staging
Modified Files:
Tag: b1_5
project.xml
Log Message:
CMSC-1104, JForum portlet does not work on test environment, added dependencies
taht JForum-portlet needed in community and staging
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging
See also: http://www.mmbase.org/jira/browse/CMSC-1104
Index: project.xml
===
RCS file:
/var/cvs/contributions/CMSContainer_Demo/demo.cmscontainer.org/war-staging/project.xml,v
retrieving revision 1.6
retrieving revision 1.6.2.1
diff -u -b -r1.6 -r1.6.2.1
--- project.xml 1 Aug 2008 14:47:06 - 1.6
+++ project.xml 11 Dec 2008 02:37:17 - 1.6.2.1
@@ -52,6 +52,99 @@
false
+
+
+
+freemarker
+freemarker
+2.3.9
+jar
+
+${war.bundle}
+
+
+
+
+quartz
+quartz
+1.5.1
+jar
+
+${war.bundle}
+
+
+
+c3p0
+c3p0
+0.9.1
+jar
+
+${war.bundle}
+
+
+
+com.octo.captcha
+jcaptcha-all
+1.0-RC-2.0.1
+jar
+
+${war.bundle}
+
+
+
+lucene
+lucene-core
+2.3.2
+jar
+
+${war.bundle}
+
+
+
+lucene
+lucene-highlighter
+2.3.2
+jar
+
+${war.bundle}
+
+
+
+lucene
+lucene-analyzers
+2.3.2
+jar
+
+${war.bundle}
+
+
+
+jforum
+jforum
+2.1.8
+jar
+
+${war.bundle}
+
+
+
+javamail
+mail
+1.4
+jar
+
+${war.bundle}
+
+
+
+concurrent
+concurrent
+1.3.2
+jar
+
+${war.bundle}
+
+
\ No newline at end of file
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.4_to_1.5.txt
Update of /var/cvs/contributions/CMSContainer/migration In directory james.mmbase.org:/tmp/cvs-serv29024 Modified Files: Tag: b1_5 migration_1.4_to_1.5.txt Log Message: CMSC-949, Blocking users: user status enhancements,add sql script See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration See also: http://www.mmbase.org/jira/browse/CMSC-949 Index: migration_1.4_to_1.5.txt === RCS file: /var/cvs/contributions/CMSContainer/migration/migration_1.4_to_1.5.txt,v retrieving revision 1.9.2.6 retrieving revision 1.9.2.7 diff -u -b -r1.9.2.6 -r1.9.2.7 --- migration_1.4_to_1.5.txt9 Dec 2008 02:16:19 - 1.9.2.6 +++ migration_1.4_to_1.5.txt10 Dec 2008 09:05:36 - 1.9.2.7 @@ -141,3 +141,31 @@ * * * \ No newline at end of file + +* +* +* +Name: Add the active filed to the people table. +Goal: . +Type: sql-script +--- Start script --- +ALTER TABLE people ADD COLUMN active varchar(255) ; +--- End script --- +Exceptions/errors/other problems and what to do: +* +* +* + +* +* +* +Name: Moved users without a status to active . +Goal: . +Type: sql-script +--- Start script --- +UPDATE people SET active='Active' WHERE active is null or active='' ; +--- End script --- +Exceptions/errors/other problems and what to do: +* +* +* \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.4_to_1.5.txt
Update of /var/cvs/contributions/CMSContainer/migration In directory james.mmbase.org:/tmp/cvs-serv28907 Modified Files: migration_1.4_to_1.5.txt Log Message: CMSC-949, Blocking users: user status enhancements,add sql script See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration See also: http://www.mmbase.org/jira/browse/CMSC-949 Index: migration_1.4_to_1.5.txt === RCS file: /var/cvs/contributions/CMSContainer/migration/migration_1.4_to_1.5.txt,v retrieving revision 1.15 retrieving revision 1.16 diff -u -b -r1.15 -r1.16 --- migration_1.4_to_1.5.txt9 Dec 2008 02:00:25 - 1.15 +++ migration_1.4_to_1.5.txt10 Dec 2008 09:00:22 - 1.16 @@ -141,3 +141,31 @@ * * * + +* +* +* +Name: Add the active filed to the people table. +Goal: . +Type: sql-script +--- Start script --- +ALTER TABLE people ADD COLUMN active varchar(255) ; +--- End script --- +Exceptions/errors/other problems and what to do: +* +* +* + +* +* +* +Name: Moved users without a status to active . +Goal: . +Type: sql-script +--- Start script --- +UPDATE people SET active='Active' WHERE active is null or active='' ; +--- End script --- +Exceptions/errors/other problems and what to do: +* +* +* ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess DataAccessor.java
Update of
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
In directory james.mmbase.org:/tmp/cvs-serv27312/dataaccess
Modified Files:
DataAccessor.java
Log Message:
CMSC-1166, KNMI migration to the CMS Container,improve reverse
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess
See also: http://www.mmbase.org/jira/browse/CMSC-1166
Index: DataAccessor.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/dataaccess/DataAccessor.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- DataAccessor.java 2 Dec 2008 10:37:03 - 1.7
+++ DataAccessor.java 10 Dec 2008 07:17:55 - 1.8
@@ -276,8 +276,15 @@
try {
connection = dataSource.getConnection();
statement = connection.createStatement();
- sql = "select * from " + " " + relData.getSourceRelationType() + " "
+ "where snumber in (select number from "
- + relData.getRelateTable() + ") and dnumber in (select number
from " + relData.getTableName() + ")";
+ if ("sourcetype".equals(relData.getReverse())) {
+sql = "select * from " + " " + relData.getSourceRelationType() + "
"
+ + "where snumber in (select number from " +
relData.getTableName()
+ + ") and dnumber in (select number from " +
relData.getRelateTable()+ ")";
+ }else{
+sql = "select * from " + " " + relData.getSourceRelationType() + "
"
++ "where snumber in (select number from " +
relData.getRelateTable()
++ ") and dnumber in (select number from " + relData.getTableName()
+ ")";
+ }
rs = statement.executeQuery(sql);
while (rs.next()) {
sv = rs.getInt("snumber");
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service NodeService.java
Update of
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service
In directory james.mmbase.org:/tmp/cvs-serv27312/service
Modified Files:
NodeService.java
Log Message:
CMSC-1166, KNMI migration to the CMS Container,improve reverse
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service
See also: http://www.mmbase.org/jira/browse/CMSC-1166
Index: NodeService.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/dataconversion/src/java/com/finalist/cmsc/dataconversion/service/NodeService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- NodeService.java28 Nov 2008 08:07:42 - 1.6
+++ NodeService.java10 Dec 2008 07:17:55 - 1.7
@@ -64,7 +64,8 @@
while (properties.hasNext()) {
Map.Entry entry= properties.next();
if(!entry.getKey().toString().equals("lastmodifieddate")) {
- node.setObjectValue(entry.getKey().toString(),
entry.getValue()) ;
+ node.setValueWithoutProcess(entry.getKey().toString(),
entry.getValue());
+ //node.setObjectValue(entry.getKey().toString(),
entry.getValue()) ;
}
else {
modifyDate = entry.getValue();
@@ -95,7 +96,7 @@
Node desNode = cloud.getNode(dnumber.intValue());
type = data.getDestinationRelationType();
Relation relate;
-if ("true".equals(data.getReverse())) {
+if ("destinationtype".equals(data.getReverse())) {
relate = RelationUtil.createRelation(desNode, sourceNode,
data.getDestinationRelationType());
}else{
relate = RelationUtil.createRelation(sourceNode, desNode,
data.getDestinationRelationType());
@@ -117,7 +118,8 @@
relate.setObjectValue(name, "intro") ;
}
else {
-relate.setObjectValue(entry.getKey().toString(),
entry.getValue()) ;
+
relate.setValueWithoutProcess(entry.getKey().toString(), entry.getValue());
+ // relate.setObjectValue(entry.getKey().toString(),
entry.getValue()) ;
}
}
relate.commit();
@@ -168,7 +170,7 @@
Node desNode = cloud.getNode(dnumber.intValue());
type = reldata.getDestinationRelationType();
Relation relate;
- if ("true".equals(reldata.getReverse())) {
+ if ("destinationtype".equals(reldata.getReverse())) {
relate = RelationUtil.createRelation(desNode, sourceNode,
type);
} else {
relate = RelationUtil.createRelation(sourceNode, desNode,
type);
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.4_to_1.5.txt
Update of /var/cvs/contributions/CMSContainer/migration In directory james.mmbase.org:/tmp/cvs-serv8011 Modified Files: Tag: b1_5 migration_1.4_to_1.5.txt Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,change the field size in migration See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: migration_1.4_to_1.5.txt === RCS file: /var/cvs/contributions/CMSContainer/migration/migration_1.4_to_1.5.txt,v retrieving revision 1.9.2.5 retrieving revision 1.9.2.6 diff -u -b -r1.9.2.5 -r1.9.2.6 --- migration_1.4_to_1.5.txt5 Dec 2008 09:34:03 - 1.9.2.5 +++ migration_1.4_to_1.5.txt9 Dec 2008 02:16:19 - 1.9.2.6 @@ -135,7 +135,7 @@ Goal: . Type: sql-script --- Start script --- -ALTER TABLE mm_newsletterpublication ADD COLUMN approved_by text; +ALTER TABLE mm_newsletterpublication ADD COLUMN approved_by varchar(255); --- End script --- Exceptions/errors/other problems and what to do: * ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.4_to_1.5.txt
Update of /var/cvs/contributions/CMSContainer/migration In directory james.mmbase.org:/tmp/cvs-serv7048 Modified Files: migration_1.4_to_1.5.txt Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,change the field size in migration See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: migration_1.4_to_1.5.txt === RCS file: /var/cvs/contributions/CMSContainer/migration/migration_1.4_to_1.5.txt,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- migration_1.4_to_1.5.txt5 Dec 2008 09:33:58 - 1.14 +++ migration_1.4_to_1.5.txt9 Dec 2008 02:00:25 - 1.15 @@ -135,7 +135,7 @@ Goal: . Type: sql-script --- Start script --- -ALTER TABLE mm_newsletterpublication ADD COLUMN approved_by text; +ALTER TABLE mm_newsletterpublication ADD COLUMN approved_by varchar(255); --- End script --- Exceptions/errors/other problems and what to do: * ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders newsletterpublication.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders In directory james.mmbase.org:/tmp/cvs-serv22408 Modified Files: Tag: b1_5 newsletterpublication.xml Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,change the field size See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: newsletterpublication.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletterpublication.xml,v retrieving revision 1.11.2.4 retrieving revision 1.11.2.5 diff -u -b -r1.11.2.4 -r1.11.2.5 --- newsletterpublication.xml 4 Dec 2008 09:11:10 - 1.11.2.4 +++ newsletterpublication.xml 8 Dec 2008 10:49:12 - 1.11.2.5 @@ -188,7 +188,7 @@ http://www.mmbase.org/xmlns/datatypes"/> approved_by - STRING ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders newsletterpublication.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders In directory james.mmbase.org:/tmp/cvs-serv22273 Modified Files: newsletterpublication.xml Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,change the field size See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: newsletterpublication.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletterpublication.xml,v retrieving revision 1.15 retrieving revision 1.16 diff -u -b -r1.15 -r1.16 --- newsletterpublication.xml 4 Dec 2008 09:10:14 - 1.15 +++ newsletterpublication.xml 8 Dec 2008 10:44:54 - 1.16 @@ -188,7 +188,7 @@ http://www.mmbase.org/xmlns/datatypes"/> approved_by - STRING ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv16143
Modified Files:
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements, lower case
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- formcheck.js3 Dec 2008 06:11:20 - 1.4
+++ formcheck.js8 Dec 2008 07:03:09 - 1.5
@@ -38,7 +38,7 @@
options[0].parentNode.removeChild(options[0]);
}
for (j = 1; j < options.length; j++) {
-if (v.value == options[j].value) {
+if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
options[j].parentNode.removeChild(options[j]);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community/js formcheck.js
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
In directory james.mmbase.org:/tmp/cvs-serv16074
Modified Files:
Tag: b1_5
formcheck.js
Log Message:
CMSC-949, Blocking users: user status enhancements, lower case
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: formcheck.js
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/js/formcheck.js,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- formcheck.js3 Dec 2008 06:15:53 - 1.2.2.2
+++ formcheck.js8 Dec 2008 07:00:46 - 1.2.2.3
@@ -38,7 +38,7 @@
options[0].parentNode.removeChild(options[0]);
}
for (j = 1; j < options.length; j++) {
-if (v.value == options[j].value) {
+if (v.value.toUpperCase() == options[j].value.toUpperCase()) {
options[j].parentNode.removeChild(options[j]);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv5222
Modified Files:
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements, lower case
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- userlist_table.jspf 4 Dec 2008 05:50:39 - 1.10
+++ userlist_table.jspf 8 Dec 2008 02:58:24 - 1.11
@@ -35,9 +35,9 @@
${person.active}
-
-
-
+
+
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv1974
Modified Files:
Tag: b1_5
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements, lower case
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.6.2.4
retrieving revision 1.6.2.5
diff -u -b -r1.6.2.4 -r1.6.2.5
--- userlist_table.jspf 5 Dec 2008 10:40:47 - 1.6.2.4
+++ userlist_table.jspf 8 Dec 2008 02:51:25 - 1.6.2.5
@@ -35,9 +35,9 @@
${person.active}
-
-
-
+
+
+
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Modules/community/src/webapp/editors/community userlist_table.jspf
Update of
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
In directory james.mmbase.org:/tmp/cvs-serv28605
Modified Files:
Tag: b1_5
userlist_table.jspf
Log Message:
CMSC-949, Blocking users: user status enhancements,delete unuseful selected
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community
See also: http://www.mmbase.org/jira/browse/CMSC-949
Index: userlist_table.jspf
===
RCS file:
/var/cvs/contributions/CMSContainer_Modules/community/src/webapp/editors/community/userlist_table.jspf,v
retrieving revision 1.6.2.3
retrieving revision 1.6.2.4
diff -u -b -r1.6.2.3 -r1.6.2.4
--- userlist_table.jspf 4 Dec 2008 05:53:55 - 1.6.2.3
+++ userlist_table.jspf 5 Dec 2008 10:40:47 - 1.6.2.4
@@ -34,7 +34,6 @@
-
${person.active}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.4_to_1.5.txt
Update of /var/cvs/contributions/CMSContainer/migration In directory james.mmbase.org:/tmp/cvs-serv19877 Modified Files: Tag: b1_5 migration_1.4_to_1.5.txt Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,change the field See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: migration_1.4_to_1.5.txt === RCS file: /var/cvs/contributions/CMSContainer/migration/migration_1.4_to_1.5.txt,v retrieving revision 1.9.2.3 retrieving revision 1.9.2.4 diff -u -b -r1.9.2.3 -r1.9.2.4 --- migration_1.4_to_1.5.txt5 Dec 2008 03:32:22 - 1.9.2.3 +++ migration_1.4_to_1.5.txt5 Dec 2008 03:49:37 - 1.9.2.4 @@ -131,3 +131,13 @@ * * * \ No newline at end of file +Name: Add the approved_by filed to the mm_newsletterpublication table. +Goal: . +Type: sql-script +--- Start script --- +ALTER TABLE mm_newsletterpublication ADD COLUMN approved_by text; +--- End script --- +Exceptions/errors/other problems and what to do: +* +* +* \ No newline at end of file ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer/migration migration_1.4_to_1.5.txt
Update of /var/cvs/contributions/CMSContainer/migration In directory james.mmbase.org:/tmp/cvs-serv19823 Modified Files: migration_1.4_to_1.5.txt Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,change the field See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer/migration See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: migration_1.4_to_1.5.txt === RCS file: /var/cvs/contributions/CMSContainer/migration/migration_1.4_to_1.5.txt,v retrieving revision 1.12 retrieving revision 1.13 diff -u -b -r1.12 -r1.13 --- migration_1.4_to_1.5.txt5 Dec 2008 02:24:24 - 1.12 +++ migration_1.4_to_1.5.txt5 Dec 2008 03:47:37 - 1.13 @@ -131,3 +131,13 @@ * * * +Name: Add the approved_by filed to the mm_newsletterpublication table. +Goal: . +Type: sql-script +--- Start script --- +ALTER TABLE mm_newsletterpublication ADD COLUMN approved_by text; +--- End script --- +Exceptions/errors/other problems and what to do: +* +* +* ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv16107/util
Modified Files:
Tag: b1_5
NewsletterPublicationUtil.java
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved
newsletter edition,approval and revoke actions change the field
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1163
Index: NewsletterPublicationUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.26.2.7
retrieving revision 1.26.2.8
diff -u -b -r1.26.2.7 -r1.26.2.8
--- NewsletterPublicationUtil.java 3 Dec 2008 09:19:23 - 1.26.2.7
+++ NewsletterPublicationUtil.java 4 Dec 2008 09:24:54 - 1.26.2.8
@@ -180,6 +180,7 @@
edition.setStringValue("process_status", EditionStatus.FROZEN.value());
// edition.setValue("static_html",
StringEscapeUtils.escapeHtml(static_html));
edition.setValueWithoutProcess("static_html", static_html);
+ edition.setStringValue("approved_by", null);
edition.commit();
}
@@ -194,8 +195,9 @@
/**
* Approve a edition
*/
- public static void approveEdition(Node edition) {
+ public static void approveEdition(Node edition,String user) {
edition.setStringValue("process_status", EditionStatus.APPROVED.value());
+ edition.setStringValue("approved_by", user);
edition.commit();
}
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionApprove.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv16107/forms
Modified Files:
Tag: b1_5
NewsletterEditionApprove.java
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved
newsletter edition,approval and revoke actions change the field
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1163
Index: NewsletterEditionApprove.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionApprove.java,v
retrieving revision 1.2.2.2
retrieving revision 1.2.2.3
diff -u -b -r1.2.2.2 -r1.2.2.3
--- NewsletterEditionApprove.java 14 Nov 2008 07:09:21 - 1.2.2.2
+++ NewsletterEditionApprove.java 4 Dec 2008 09:24:53 - 1.2.2.3
@@ -11,7 +11,9 @@
protected void doSave(HttpServletRequest request, Node edition)
throws Exception {
if(!EditionStatus.APPROVED.value().equals(edition.getValue("process_status"))) {
- NewsletterPublicationUtil.approveEdition(edition);
+ String
appUser=request.getSession().getValue("cloud_mmbase").toString();
+ String[] result = appUser.split("\\s");
+ NewsletterPublicationUtil.approveEdition(edition,result[3]);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms NewsletterEditionApprove.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
In directory james.mmbase.org:/tmp/cvs-serv15952/forms
Modified Files:
NewsletterEditionApprove.java
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved
newsletter edition,approval and revoke actions change the field
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms
See also: http://www.mmbase.org/jira/browse/CMSC-1163
Index: NewsletterEditionApprove.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/NewsletterEditionApprove.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- NewsletterEditionApprove.java 14 Nov 2008 06:38:52 - 1.2
+++ NewsletterEditionApprove.java 4 Dec 2008 09:23:09 - 1.3
@@ -11,7 +11,9 @@
protected void doSave(HttpServletRequest request, Node edition)
throws Exception {
if(!EditionStatus.APPROVED.value().equals(edition.getValue("process_status"))) {
- NewsletterPublicationUtil.approveEdition(edition);
+ String
appUser=request.getSession().getValue("cloud_mmbase").toString();
+ String[] result = appUser.split("\\s");
+ NewsletterPublicationUtil.approveEdition(edition,result[3]);
}
}
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util NewsletterPublicationUtil.java
Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
In directory james.mmbase.org:/tmp/cvs-serv15952/util
Modified Files:
NewsletterPublicationUtil.java
Log Message:
CMSC-1163, Newsletter: Add extra information on which person approved
newsletter edition,approval and revoke actions change the field
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util
See also: http://www.mmbase.org/jira/browse/CMSC-1163
Index: NewsletterPublicationUtil.java
===
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/util/NewsletterPublicationUtil.java,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -b -r1.35 -r1.36
--- NewsletterPublicationUtil.java 3 Dec 2008 09:00:31 - 1.35
+++ NewsletterPublicationUtil.java 4 Dec 2008 09:23:09 - 1.36
@@ -180,6 +180,7 @@
edition.setStringValue("process_status", EditionStatus.FROZEN.value());
// edition.setValue("static_html",
StringEscapeUtils.escapeHtml(static_html));
edition.setValueWithoutProcess("static_html", static_html);
+ edition.setStringValue("approved_by", null);
edition.commit();
}
@@ -194,8 +195,9 @@
/**
* Approve a edition
*/
- public static void approveEdition(Node edition) {
+ public static void approveEdition(Node edition,String user) {
edition.setStringValue("process_status", EditionStatus.APPROVED.value());
+ edition.setStringValue("approved_by", user);
edition.commit();
}
/**
___
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders newsletterpublication.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders In directory james.mmbase.org:/tmp/cvs-serv15632/config/applications/newsletter/builders Modified Files: Tag: b1_5 newsletterpublication.xml Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,add a field where the user name is written as text See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: newsletterpublication.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletterpublication.xml,v retrieving revision 1.11.2.3 retrieving revision 1.11.2.4 diff -u -b -r1.11.2.3 -r1.11.2.4 --- newsletterpublication.xml 12 Nov 2008 06:55:21 - 1.11.2.3 +++ newsletterpublication.xml 4 Dec 2008 09:11:10 - 1.11.2.4 @@ -172,6 +172,32 @@ + + + Approved By + Approved By + å®¡æ ¸ç¨æ· + + + + 12 + 12 + 12 + + + http://www.mmbase.org/xmlns/datatypes"/> + + approved_by + + STRING + + + + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication edit_newsletterpublication.xml load_newsletterpublication.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication In directory james.mmbase.org:/tmp/cvs-serv15632/src/webapp/editors/config/newsletterpublication Modified Files: Tag: b1_5 edit_newsletterpublication.xml load_newsletterpublication.xml Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,add a field where the user name is written as text See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: edit_newsletterpublication.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication/edit_newsletterpublication.xml,v retrieving revision 1.9.2.3 retrieving revision 1.9.2.4 diff -u -b -r1.9.2.3 -r1.9.2.4 --- edit_newsletterpublication.xml 11 Nov 2008 09:26:46 - 1.9.2.3 +++ edit_newsletterpublication.xml 4 Dec 2008 09:11:10 - 1.9.2.4 @@ -30,6 +30,11 @@ Status Status + + Approved By + Approved By + å®¡æ ¸ç¨æ· + Introduction Inleiding Index: load_newsletterpublication.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/config/newsletterpublication/load_newsletterpublication.xml,v retrieving revision 1.7.2.1 retrieving revision 1.7.2.2 diff -u -b -r1.7.2.1 -r1.7.2.2 --- load_newsletterpublication.xml 11 Nov 2008 09:26:46 - 1.7.2.1 +++ load_newsletterpublication.xml 4 Dec 2008 09:11:10 - 1.7.2.2 @@ -14,6 +14,7 @@ + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
[MMBASE CVS] contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders newsletterpublication.xml
Update of /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders In directory james.mmbase.org:/tmp/cvs-serv15547/config/applications/newsletter/builders Modified Files: newsletterpublication.xml Log Message: CMSC-1163, Newsletter: Add extra information on which person approved newsletter edition,add a field where the user name is written as text See also: http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders See also: http://www.mmbase.org/jira/browse/CMSC-1163 Index: newsletterpublication.xml === RCS file: /var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/config/applications/newsletter/builders/newsletterpublication.xml,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- newsletterpublication.xml 12 Nov 2008 06:54:45 - 1.14 +++ newsletterpublication.xml 4 Dec 2008 09:10:14 - 1.15 @@ -172,6 +172,32 @@ + + + Approved By + Approved By + å®¡æ ¸ç¨æ· + + + + 12 + 12 + 12 + + + http://www.mmbase.org/xmlns/datatypes"/> + + approved_by + + STRING + + + + + + + ___ Cvs mailing list Cvs@lists.mmbase.org http://lists.mmbase.org/mailman/listinfo/cvs
