From a791883c237dc0212bcbc69ac5e9a0c0b579d51f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= <rmuszynski1@gmail.com>
Date: Tue, 18 Nov 2014 18:07:06 +0100
Subject: [PATCH 1/3] change AES plugin name

---
 newscoop/admin-files/libs/ArticleList/ArticleList.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newscoop/admin-files/libs/ArticleList/ArticleList.php b/newscoop/admin-files/libs/ArticleList/ArticleList.php
index 4c7bd29a1d..34345299e4 100644
--- a/newscoop/admin-files/libs/ArticleList/ArticleList.php
+++ b/newscoop/admin-files/libs/ArticleList/ArticleList.php
@@ -264,7 +264,7 @@ public function processItem($article)
 
         $pluginService = \Zend_Registry::get('container')->getService('newscoop.plugins.service');
 
-        if ($pluginService->isEnabled('terwey/plugin-newscoop-articleeditscreen')) {
+        if ($pluginService->isEnabled('newscoop/article-edit-screen')) {
             $router = \Zend_Registry::get('container')->getService('router');
             $language = new Language($article->getLanguageId());
             $articleLink = $router->generate('newscoop_admin_aes', array('language' => $language->getCode(), 'articleNumber' => $article->getArticleNumber()));

From 6fbb89704c7b0c8faafcc37afd33f229ebf5fba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= <rmuszynski1@gmail.com>
Date: Tue, 18 Nov 2014 18:11:21 +0100
Subject: [PATCH 2/3] rename AES plugin name in do_add.php

---
 newscoop/admin-files/articles/do_add.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/newscoop/admin-files/articles/do_add.php b/newscoop/admin-files/articles/do_add.php
index 796987bbd7..d49184a038 100644
--- a/newscoop/admin-files/articles/do_add.php
+++ b/newscoop/admin-files/articles/do_add.php
@@ -144,10 +144,10 @@
     camp_html_add_msg($translator->trans("Article created.", array(), 'articles'), "ok");
 
     $pluginService = \Zend_Registry::get('container')->getService('newscoop.plugins.service');
-    if ($pluginService->isEnabled('terwey/plugin-newscoop-articleeditscreen')) {
+    if ($pluginService->isEnabled('newscoop/article-edit-screen')) {
         $router = \Zend_Registry::get('container')->getService('router');
         $language = new Language($articleObj->getLanguageId());
-        $articleLink = $router->generate('newscoop_admin_aes').'#/'.$language->getCode().'/'.$articleObj->getArticleNumber();
+        $articleLink = $router->generate('newscoop_admin_aes', array('language' => $language->getCode(), 'articleNumber' => $article->getArticleNumber()));
     } else {
         $articleLink = camp_html_article_url($articleObj, $f_language_id, "edit.php");
     }

From df68aedac3a15b45a0d1edfc42a163b5802eb79e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Rafa=C5=82=20Muszy=C5=84ski?= <rmuszynski1@gmail.com>
Date: Tue, 18 Nov 2014 18:15:27 +0100
Subject: [PATCH 3/3] correct article object name

---
 newscoop/admin-files/articles/do_add.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/newscoop/admin-files/articles/do_add.php b/newscoop/admin-files/articles/do_add.php
index d49184a038..6117e9dadf 100644
--- a/newscoop/admin-files/articles/do_add.php
+++ b/newscoop/admin-files/articles/do_add.php
@@ -147,7 +147,7 @@
     if ($pluginService->isEnabled('newscoop/article-edit-screen')) {
         $router = \Zend_Registry::get('container')->getService('router');
         $language = new Language($articleObj->getLanguageId());
-        $articleLink = $router->generate('newscoop_admin_aes', array('language' => $language->getCode(), 'articleNumber' => $article->getArticleNumber()));
+        $articleLink = $router->generate('newscoop_admin_aes', array('language' => $language->getCode(), 'articleNumber' => $articleObj->getArticleNumber()));
     } else {
         $articleLink = camp_html_article_url($articleObj, $f_language_id, "edit.php");
     }