You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@labs.apache.org by si...@apache.org on 2009/11/09 18:46:48 UTC

svn commit: r834161 - in /labs/magma/trunk/fragment-newsletter-web/src/main: java/org/apache/magma/web/newsletter/SendNewsletter.java resources/org/apache/magma/web/newsletter/progress.vm resources/org/apache/magma/web/newsletter/sending.vm

Author: simoneg
Date: Mon Nov  9 17:46:47 2009
New Revision: 834161

URL: http://svn.apache.org/viewvc?rev=834161&view=rev
Log:
Obsolescence in newsletter

Modified:
    labs/magma/trunk/fragment-newsletter-web/src/main/java/org/apache/magma/web/newsletter/SendNewsletter.java
    labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/progress.vm
    labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/sending.vm

Modified: labs/magma/trunk/fragment-newsletter-web/src/main/java/org/apache/magma/web/newsletter/SendNewsletter.java
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-newsletter-web/src/main/java/org/apache/magma/web/newsletter/SendNewsletter.java?rev=834161&r1=834160&r2=834161&view=diff
==============================================================================
--- labs/magma/trunk/fragment-newsletter-web/src/main/java/org/apache/magma/web/newsletter/SendNewsletter.java (original)
+++ labs/magma/trunk/fragment-newsletter-web/src/main/java/org/apache/magma/web/newsletter/SendNewsletter.java Mon Nov  9 17:46:47 2009
@@ -21,7 +21,7 @@
 		Database db = new Database();
 		newsletter = db.load(Newsletter.class, newsletter.getId());
 		report.setState("Searching for users...");
-		List<User> list = db.query(User.class, "where x.activate=?1 and x.newsletter=?2", true, true);
+		List<User> list = db.query(User.class, "where x.active=?1 and x.newsletter=?2", true, true);
 		report.setTotal(list.size());
 		for(User user : list){
 			report.setState("Sending to " + user.getEmail());

Modified: labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/progress.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/progress.vm?rev=834161&r1=834160&r2=834161&view=diff
==============================================================================
--- labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/progress.vm (original)
+++ labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/progress.vm Mon Nov  9 17:46:47 2009
@@ -1,6 +1,6 @@
 <h1>$i18n.tr("Sending...")</h1>
 <div class="magmaNLStatus">
 <p>
-<a href="magma:/administration/jobs/details-$job">$i18n.tr("The newsletter sending process")</a>$i18n.tr(" is in progress").
+<a href="magma:/administration/jobs/details!$job">$i18n.tr("The newsletter sending process")</a>$i18n.tr(" is in progress").
 </p>
 </div>	
\ No newline at end of file

Modified: labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/sending.vm
URL: http://svn.apache.org/viewvc/labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/sending.vm?rev=834161&r1=834160&r2=834161&view=diff
==============================================================================
--- labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/sending.vm (original)
+++ labs/magma/trunk/fragment-newsletter-web/src/main/resources/org/apache/magma/web/newsletter/sending.vm Mon Nov  9 17:46:47 2009
@@ -1,6 +1,6 @@
 <h1>$i18n.tr("Sending...")</h1>
 <div class="magmaNLStatus">
 <p>
-	<a href="magma:/aministration/jobs/list">$i18n.tr("The newsletter sending process")</a>$i18n.tr(" is in progress").
+	<a href="magma:/administration/jobs/list">$i18n.tr("The newsletter sending process")</a>$i18n.tr(" is in progress").
 </p>
 </div>	
\ No newline at end of file



---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@labs.apache.org
For additional commands, e-mail: commits-help@labs.apache.org