Update of
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
In directory
james.mmbase.org:/tmp/cvs-serv29584/src/webapp/editors/newsletter/module
Modified Files:
import.jsp report_newsletter_subscriptions.jsp
Log Message:
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module
Index: import.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/import.jsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- import.jsp 20 May 2008 08:48:43 -0000 1.2
+++ import.jsp 10 Jun 2008 03:46:40 -0000 1.3
@@ -8,7 +8,17 @@
<cmscedit:head title="ewsletter.subscription.manage.newsletteroverview">
</cmscedit:head>
-
+<script>
+ function formSubmit(){
+ if(${requestScope.importType eq 'importCSV'}){
+
document.getElementsByName('action')[0].value="importUserSubScription";
+ }
+ else{
+ document.getElementsByName('action')[0].value="importsubscription";
+ }
+ document.forms[0].submit();
+ }
+</script>
<div class="tabs">
<div class="tab_active">
<div class="body">
@@ -23,7 +33,8 @@
<html:form action="/editors/newsletter/SubscriptionImportExportAction"
enctype="multipart/form-data">
<html:file property="datafile"/>
<input type="hidden" name="action" value="importsubscription"/>
- <input type="submit" value="Import"/>
+ <input type="hidden" name="newsletterId"
value="${requestScope.newsleterId}"/>
+ <input type="button" value="Import" onclick="formSubmit()"/>
</html:form>
<div style="margin:4px;color:red;">
<html:messages id="msg" message="true">
Index: report_newsletter_subscriptions.jsp
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Portlets/portlets-newsletter/src/webapp/editors/newsletter/module/report_newsletter_subscriptions.jsp,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- report_newsletter_subscriptions.jsp 20 May 2008 13:56:38 -0000 1.6
+++ report_newsletter_subscriptions.jsp 10 Jun 2008 03:46:40 -0000 1.7
@@ -72,7 +72,7 @@
<tr>
<td><input type="checkbox" name="ids"
value="${result.id}"/></td>
<td>
- ${result.email}
+ ${result.username}
</td>
<td>${result.fullname}</td>
<td>${result.email}</td>
@@ -87,6 +87,9 @@
<input type="button" name="submitButton" class="submit"
onclick="exportsubscription()"
value="<fmt:message
key="subscriptiondetail.link.exportselect"/>"/>
+ <input type="button" name="submitButton" class="submit"
+ onclick="showImportPage()"
+ value="<fmt:message
key="subscriptiondetail.link.importcsv"/>"/>
</form>
</div>
@@ -94,6 +97,11 @@
</div>
<script>
+ function showImportPage(){
+ document.operationform.action
="SubscriptionManagement.do?action=showImportPage&importType=importCSV&newsletterId=${param.newsletterId}";
+ document.operationform.submit();
+ }
+
function exportsubscription() {
var subscriptions = document.getElementsByName('ids');
var hasSelection = false;
@@ -108,11 +116,9 @@
document.forms['operationform'].submit();
}
else {
- alert(<fmt:message key="confirm_noselect"/>);
+ alert("<fmt:message key='confirm_noselect'/>");
}
return false;
}
</script>
-
-
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
