Merge pull request #886 from takeit/AENV-286

change AES plugin name
sourcefabric · Nov 18, 2014 · 2a70289 · 2a70289
2 parents c567c5d + df68aed
commit 2a70289
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git 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' => $articleObj->getArticleNumber()));
  } else {
  $articleLink = camp_html_article_url($articleObj, $f_language_id, "edit.php");
  }

diff --git 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()));