Merge branch 'hotline_#26650_newsletter_progressbar' into 'stable'

Hotline #26650 newsletter progressbar

See merge request !996

application/modules/admin/controllers/NewsletterController.php

@@ -150,13 +150,10 @@ class Admin_NewsletterController extends ZendAfi_Controller_Action {
 
 	public function sendAction() {
 		$this->_helper->viewRenderer->setNoRender();
-		if (!$newsletter = Class_Newsletter::find((int)$this->_request->getParam('id'))){
-			$this->_redirect('admin/newsletter');
-			return;
-		}
-		$newsletter->send();
+		if ($newsletter = Class_Newsletter::find((int)$this->_request->getParam('id')))
+			$newsletter->send();
+
 		$this->_redirect('admin/newsletter');
-		return;
 	}
 
 

library/ZendAfi/View/Helper/TagProgressBarForNewsletter.php

@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
  * along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 
 class ZendAfi_View_Helper_TagProgressBarForNewsletter extends ZendAfi_View_Helper_BaseHelper {
@@ -28,16 +28,15 @@ class ZendAfi_View_Helper_TagProgressBarForNewsletter extends ZendAfi_View_Helpe
 																	'id' => $newsletter->getId()],null,true);
 		$progress_data = 'function getNewsletterProgress'.$newsletter->getId().'(){$.getJSON("'.$data_url.'", function (data) {'.
 			'if(!data.done || !data.total) {'.
-			'$("#progress_bar_newsletter_'.$newsletter->getId().'").text(data.status);'.
-			'}else{'.
-			'$("#progress_bar_newsletter_'.$newsletter->getId().'").progressbar({value: data.done, max: data.total});'.
-			'setTimeout(function() {getNewsletterProgress'.$newsletter->getId().'()},500);'.
+			'$("#progress_bar_newsletter_'.$newsletter->getId().'").text(data.status); return true;'.
 			'}'.
+			'$("#progress_bar_newsletter_'.$newsletter->getId().'").progressbar({value: data.done, max: data.total});'.
+			'setTimeout(function() {getNewsletterProgress'.$newsletter->getId().'()}, 100);'.
 			'})};';
 
 		Class_ScriptLoader::getInstance()
 			->addInlineScript($progress_data)
-			->addJQueryReady('getNewsletterProgress'.$newsletter->getId().'()');;
+			->addJQueryReady('getNewsletterProgress'.$newsletter->getId().'()');
 		return $this->view->tag('div','',['id' => 'progress_bar_newsletter_'.$newsletter->getId()]);
 	}
 }
\ No newline at end of file