Author: kevinshen
Date: 2009-05-13 04:37:29 +0200 (Wed, 13 May 2009)
New Revision: 35128
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
Log:
CMSC-1398 Newsletter + community - error while canceling edit user
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java
2009-05-13 02:36:31 UTC (rev 35127)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/java/com/finalist/newsletter/forms/SubscriptioManagementAction.java
2009-05-13 02:37:29 UTC (rev 35128)
@@ -176,9 +176,9 @@
tmpFullName += " " + result[1].toString();
}
tmpFullName += " " + result[2].toString(); //Add Lastname
- String tmpEmail = result[2].toString();
- int tmpAuthenticationId = Integer.parseInt(result[3].toString());
- String tmpUserName = result[4].toString();
+ String tmpEmail = result[3].toString();
+ int tmpAuthenticationId = Integer.parseInt(result[4].toString());
+ String tmpUserName = result[5].toString();
addToSubscriptionMap(results, tmpFullName, tmpUserName, tmpEmail,
tmpAuthenticationId);
}
return results;
Modified:
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
===================================================================
---
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2009-05-13 02:36:31 UTC (rev 35127)
+++
CMSContainer/branches/b1_6/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_publication_subscribers.jsp
2009-05-13 02:37:29 UTC (rev 35128)
@@ -86,7 +86,7 @@
<edit:ui-table items="${results}" var="result" size="${resultCount}"
requestURI="/editors/newsletter/NewsletterPublicationSubscriberSearch.do">
<edit:ui-tcolumn title="" width="5%">
<a
href="NewsletterSubscriberDelete.do?newsletterId=${requestScope.newsletterId}&authid=${result.id}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/delete.png'/>" width="16"
height="16" title="<fmt:message
key='newsletter.icons.title.user.unsubscribe'/>"/></a>
- <a
href="../community/userAddInitAction.do?authid=${result.id}&newsletterId=${requestScope.newsletterId}&forward=newslettersubscribers"><img
src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.edituser'/>"/></a>
+ <a
href="../community/userAddInitAction.do?authid=${result.id}&newsletterId=${requestScope.newsletterId}&forward=newslettersubscribers&path=/editors/newsletter/NewsletterPublicationSubscriberSearch.do?newsletterId=${requestScope.newsletterId}"><img
src="<cmsc:staticurl page='/editors/gfx/icons/edit_defaults.png'/>" width="16"
height="16" title="<fmt:message key='newsletter.icons.title.edituser'/>"/></a>
</edit:ui-tcolumn>
<edit:ui-tcolumn titlekey="newsletter.publication.result.fullname"
sort="fullname" width="20%">
${result.fullname}
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
