From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 31 Dec 2012 22:42:26 +0000 (+0100)
Subject: Adds ICategoryType::getApplication() to fix links
X-Git-Tag: 2.0.0_Beta_1~620^2~6
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=e9f0a33c7e4a9a428b967e1f10dc9e2669efad03;p=GitHub%2FWoltLab%2FWCF.git

Adds ICategoryType::getApplication() to fix links
---

diff --git a/wcfsetup/install/files/acp/templates/categoryAdd.tpl b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
index 0f499bef80..123b332f8e 100644
--- a/wcfsetup/install/files/acp/templates/categoryAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryAdd.tpl
@@ -35,7 +35,7 @@
 			<ul>
 				{content}
 					{if $objectType->getProcessor()->canDeleteCategory() || $objectType->getProcessor()->canEditCategory()}
-						<li><a href="{link controller=$listController}{/link}" title="{$objectType->getProcessor()->getLanguageVariable('button.list')}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{@$objectType->getProcessor()->getLanguageVariable('button.list')}</span></a></li>
+						<li><a href="{link controller=$listController application=$objectType->getProcessor()->getApplication()}{/link}" title="{$objectType->getProcessor()->getLanguageVariable('button.list')}" class="button"><img src="{@$__wcf->getPath()}icon/list.svg" alt="" class="icon24" /> <span>{@$objectType->getProcessor()->getLanguageVariable('button.list')}</span></a></li>
 					{/if}
 					
 					{event name='contentNavigationButtons'}
@@ -45,7 +45,7 @@
 	</div>
 {/hascontent}
 
-<form method="post" action="{if $action == 'add'}{link controller=$addController}{/link}{else}{link controller=$editController object=$category}{/link}{/if}">
+<form method="post" action="{if $action == 'add'}{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}{else}{link controller=$editController application=$objectType->getProcessor()->getApplication() object=$category}{/link}{/if}">
 	<div class="container containerPadding marginTop">
 		<fieldset>
 			<legend>{lang}wcf.global.form.data{/lang}</legend>
@@ -135,7 +135,7 @@
 		{if $aclObjectTypeID}
 			<fieldset>
 				<legend>{lang}wcf.acp.acl.permissions{/lang}</legend>
-
+				
 				<dl id="groupPermissions" class="wide">
 					<dt>{lang}wcf.acp.acl.permissions{/lang}</dt>
 					<dd></dd>
diff --git a/wcfsetup/install/files/acp/templates/categoryList.tpl b/wcfsetup/install/files/acp/templates/categoryList.tpl
index 42d68764d6..31266922c6 100644
--- a/wcfsetup/install/files/acp/templates/categoryList.tpl
+++ b/wcfsetup/install/files/acp/templates/categoryList.tpl
@@ -79,7 +79,7 @@
 			<ul>
 				{content}
 					{if $objectType->getProcessor()->canAddCategory()}
-						<li><a href="{link controller=$addController}{/link}" title="{$objectType->getProcessor()->getLanguageVariable('add')}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
+						<li><a href="{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}" title="{$objectType->getProcessor()->getLanguageVariable('add')}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
 					{/if}
 					
 					{event name='contentNavigationButtons'}
@@ -100,27 +100,27 @@
 					<span class="sortableNodeLabel">
 						<span class="buttons">
 							{if $objectType->getProcessor()->canEditCategory()}
-								<a href="{link controller=$editController id=$category->categoryID title=$category->getTitle()}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
+								<a href="{link controller=$editController application=$objectType->getProcessor()->getApplication() id=$category->categoryID title=$category->getTitle()}{/link}"><img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 jsTooltip" /></a>
 							{else}
 								<img src="{@$__wcf->getPath()}icon/edit.svg" alt="" title="{lang}wcf.global.button.edit{/lang}" class="icon16 disabled" />
 							{/if}
-
+							
 							{if $objectType->getProcessor()->canDeleteCategory()}
 								<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 jsDeleteButton jsTooltip" data-object-id="{@$category->categoryID}" data-confirm-message="{@$objectType->getProcessor()->getLanguageVariable('delete.sure')}" />
 							{else}
 								<img src="{@$__wcf->getPath()}icon/delete.svg" alt="" title="{lang}wcf.global.button.delete{/lang}" class="icon16 disabled" />
 							{/if}
-
+							
 							{if $objectType->getProcessor()->canEditCategory()}
 								{* todo: toggle icons aren't clickable *}
 								<img src="{@$__wcf->getPath()}icon/{if !$category->isDisabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$category->isDisabled}disable{else}enable{/if}{/lang}" class="icon16 jsToggleButton jsTooltip" data-object-id="{@$category->categoryID}" />
 							{else}
 								<img src="{@$__wcf->getPath()}icon/{if !$category->isDisabled}enabled{else}disabled{/if}.svg" alt="" title="{lang}wcf.global.button.{if !$category->isDisabled}enable{else}disable{/if}{/lang}" class="icon16 disabled" />
 							{/if}
-
+							
 							{event name='buttons'}
 						</span>
-
+						
 						<span class="title">
 							{$category->getTitle()}
 						</span>
@@ -141,16 +141,16 @@
 			</div>
 		{/if}
 	</section>
-		
+	
 	{hascontent}
 		<div class="contentNavigation">
 			<nav>
 				<ul>
 					{content}
 						{if $objectType->getProcessor()->canAddCategory()}
-							<li><a href="{link controller=$addController}{/link}" title="{$objectType->getProcessor()->getLanguageVariable('add')}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
+							<li><a href="{link controller=$addController application=$objectType->getProcessor()->getApplication()}{/link}" title="{$objectType->getProcessor()->getLanguageVariable('add')}" class="button"><img src="{@$__wcf->getPath()}icon/add.svg" alt="" class="icon24" /> <span>{@$objectType->getProcessor()->getLanguageVariable('add')}</span></a></li>
 						{/if}
-
+						
 						{event name='contentNavigationButtons'}
 					{/content}
 				</ul>
diff --git a/wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php b/wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php
index 6373239d0e..4889d09a96 100644
--- a/wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php
+++ b/wcfsetup/install/files/lib/system/category/AbstractCategoryType.class.php
@@ -105,6 +105,13 @@ abstract class AbstractCategoryType extends SingletonFactory implements ICategor
 		return $this->hasDescription() && $this->forceDescription;
 	}
 	
+	/**
+	 * @see	wcf\system\category\ICategoryType::getApplication()
+	 */
+	public function getApplication() {
+		return 'wcf';
+	}
+	
 	/**
 	 * @see	wcf\system\category\ICategoryType::getObjectTypeName()
 	 */
diff --git a/wcfsetup/install/files/lib/system/category/ICategoryType.class.php b/wcfsetup/install/files/lib/system/category/ICategoryType.class.php
index 155b656504..1c593cb92a 100644
--- a/wcfsetup/install/files/lib/system/category/ICategoryType.class.php
+++ b/wcfsetup/install/files/lib/system/category/ICategoryType.class.php
@@ -48,6 +48,13 @@ interface ICategoryType {
 	 */
 	public function forceDescription();
 	
+	/**
+	 * Returns abbreviation of the application this category type belongs to.
+	 * 
+	 * @return	string
+	 */
+	public function getApplication();
+	
 	/**
 	 * Returns the name of the object type of the definition with the given
 	 * name for categories of this type. If categories of this type are no