From: Marcel Werk <burntime@woltlab.com>
Date: Thu, 9 Jun 2016 11:03:27 +0000 (+0200)
Subject: Added frontend links to article management
X-Git-Tag: 3.0.0_Beta_1~1473
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=a3a2ee973d076305b384d9c5468dc7e034654df4;p=GitHub%2FWoltLab%2FWCF.git

Added frontend links to article management
---

diff --git a/com.woltlab.wcf/templates/article.tpl b/com.woltlab.wcf/templates/article.tpl
index 87a693b356..3690468e93 100644
--- a/com.woltlab.wcf/templates/article.tpl
+++ b/com.woltlab.wcf/templates/article.tpl
@@ -40,6 +40,7 @@
 			<nav class="contentHeaderNavigation">
 				<ul>
 					{content}
+						{if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}<li><a href="{link controller='ArticleEdit' id=$article->articleID isACP=true}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.article.edit{/lang}</span></a></li>{/if}
 						{event name='contentHeaderNavigation'}
 					{/content}
 				</ul>
diff --git a/com.woltlab.wcf/templates/articleList.tpl b/com.woltlab.wcf/templates/articleList.tpl
index a4313f597a..8f0a4a3ad9 100644
--- a/com.woltlab.wcf/templates/articleList.tpl
+++ b/com.woltlab.wcf/templates/articleList.tpl
@@ -17,6 +17,12 @@
 	<li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed' appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed' appendSession=false}{/link}{/if}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
 {/capture}
 
+{if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}
+	{capture assign='contentHeaderNavigation'}
+		<li><a href="{link controller='ArticleAdd' isACP=true}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+	{/capture}
+{/if}
+
 {include file='header'}
 
 {hascontent}
diff --git a/com.woltlab.wcf/templates/categoryArticleList.tpl b/com.woltlab.wcf/templates/categoryArticleList.tpl
index a70db0d721..822e49faff 100644
--- a/com.woltlab.wcf/templates/categoryArticleList.tpl
+++ b/com.woltlab.wcf/templates/categoryArticleList.tpl
@@ -21,6 +21,12 @@
 	<li><a rel="alternate" href="{if $__wcf->getUser()->userID}{link controller='ArticleFeed' id=$categoryID appendSession=false}at={@$__wcf->getUser()->userID}-{@$__wcf->getUser()->accessToken}{/link}{else}{link controller='ArticleFeed' id=$categoryID appendSession=false}{/link}{/if}" title="{lang}wcf.global.button.rss{/lang}" class="jsTooltip"><span class="icon icon16 fa-rss"></span> <span class="invisible">{lang}wcf.global.button.rss{/lang}</span></a></li>
 {/capture}
 
+{if $__wcf->getSession()->getPermission('admin.content.article.canManageArticle')}
+	{capture assign='contentHeaderNavigation'}
+		<li><a href="{link controller='ArticleAdd' isACP=true}categoryID={@$category->categoryID}{/link}" class="button"><span class="icon icon16 fa-pencil"></span> <span>{lang}wcf.acp.article.add{/lang}</span></a></li>
+	{/capture}
+{/if}
+
 {include file='header'}
 
 {hascontent}
diff --git a/wcfsetup/install/files/acp/templates/articleAddDialog.tpl b/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
index f8f8e61be0..20d7d18183 100644
--- a/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
+++ b/wcfsetup/install/files/acp/templates/articleAddDialog.tpl
@@ -17,7 +17,7 @@
 </div>
 <script data-relocate="true">
 	require(['WoltLab/WCF/Acp/Ui/Article/Add'], function(AcpUiArticleAdd) {
-		AcpUiArticleAdd.init('{link controller='ArticleAdd' encode=false}{literal}isMultilingual={$isMultilingual}{/literal}{/link}');
+		AcpUiArticleAdd.init('{link controller='ArticleAdd' encode=false}{literal}isMultilingual={$isMultilingual}{/literal}{if $categoryID}&categoryID={@$categoryID}{/if}{/link}');
 		
 		{if $showArticleAddDialog}
 			window.setTimeout(function() {
diff --git a/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php b/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
index 604e471b0e..383eea3277 100644
--- a/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
+++ b/wcfsetup/install/files/lib/acp/form/ArticleAddForm.class.php
@@ -152,6 +152,8 @@ class ArticleAddForm extends AbstractForm {
 	public function readParameters() {
 		parent::readParameters();
 		
+		if (isset($_REQUEST['categoryID'])) $this->categoryID = intval($_REQUEST['categoryID']);
+		
 		$this->readMultilingualSetting();
 		
 		// get available languages
@@ -166,7 +168,9 @@ class ArticleAddForm extends AbstractForm {
 		
 		// work-around to force adding article via dialog overlay
 		if (empty($_POST) && !isset($_REQUEST['isMultilingual'])) {
-			HeaderUtil::redirect(LinkHandler::getInstance()->getLink('ArticleList', ['showArticleAddDialog' => 1]));
+			$parameters = ['showArticleAddDialog' => 1];
+			if ($this->categoryID) $parameters['categoryID'] = $this->categoryID;
+			HeaderUtil::redirect(LinkHandler::getInstance()->getLink('ArticleList', $parameters));
 			exit;
 		}
 	}
@@ -178,7 +182,6 @@ class ArticleAddForm extends AbstractForm {
 		parent::readFormParameters();
 		
 		$this->enableComments = 0;
-		if (isset($_POST['categoryID'])) $this->categoryID = intval($_POST['categoryID']);
 		if (isset($_POST['username'])) $this->username = StringUtil::trim($_POST['username']);
 		if (isset($_POST['time'])) {
 			$this->time = $_POST['time'];
diff --git a/wcfsetup/install/files/lib/acp/page/ArticleListPage.class.php b/wcfsetup/install/files/lib/acp/page/ArticleListPage.class.php
index 933be5b845..0508f34250 100644
--- a/wcfsetup/install/files/lib/acp/page/ArticleListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/ArticleListPage.class.php
@@ -93,7 +93,7 @@ class ArticleListPage extends SortablePage {
 	public function readParameters() {
 		parent::readParameters();
 		
-		if (isset($_POST['categoryID'])) $this->categoryID = intval($_POST['categoryID']);
+		if (isset($_REQUEST['categoryID'])) $this->categoryID = intval($_REQUEST['categoryID']);
 		if (!empty($_REQUEST['username'])) $this->username = StringUtil::trim($_REQUEST['username']);
 		if (!empty($_REQUEST['title'])) $this->title = StringUtil::trim($_REQUEST['title']);
 		if (!empty($_REQUEST['content'])) $this->content = StringUtil::trim($_REQUEST['content']);