From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 12 Aug 2011 20:24:33 +0000 (+0200)
Subject: Missing pieces from cronjob commit
X-Git-Tag: 2.0.0_Beta_1~1877^2
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=c4c3440e0dcd1f6869984b85f566a0bf8c6ad6bb;p=GitHub%2FWoltLab%2FWCF.git

Missing pieces from cronjob commit

I have no idea what went wrong with that specific commit, but here are
again missing pieces of my cronjob commit. This time I replaced the
classPath property of a cronjob with className in cronjob log lists.
---

diff --git a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
index 665b7ff502..3c21b6a6a8 100644
--- a/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
+++ b/wcfsetup/install/files/acp/templates/cronjobLogList.tpl
@@ -25,7 +25,7 @@
 				<thead>
 					<tr>
 						<th class="columnCronjobID{if $sortField == 'cronjobID'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=cronjobID&amp;sortOrder={if $sortField == 'cronjobID' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.cronjobID{/lang}{if $sortField == 'cronjobID'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
-						<th class="columnClassPath{if $sortField == 'classPath'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=classPath&amp;sortOrder={if $sortField == 'classPath' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.classPath{/lang}{if $sortField == 'classPath'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
+						<th class="columnClassName{if $sortField == 'className'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=className&amp;sortOrder={if $sortField == 'className' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.className{/lang}{if $sortField == 'className'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
 						<th class="columnDescription{if $sortField == 'description'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=description&amp;sortOrder={if $sortField == 'description' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.description{/lang}{if $sortField == 'description'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
 						<th class="columnExecTime{if $sortField == 'execTime'} active{/if}"><p><a href="index.php?page=CronjobLogList&amp;pageNo={@$pageNo}&amp;sortField=execTime&amp;sortOrder={if $sortField == 'execTime' && $sortOrder == 'ASC'}DESC{else}ASC{/if}{@SID_ARG_2ND}">{lang}wcf.acp.cronjob.log.execTime{/lang}{if $sortField == 'execTime'} <img src="{@RELATIVE_WCF_DIR}icon/sort{@$sortOrder}S.png" alt="" />{/if}</a></p></th>
 						
@@ -38,7 +38,7 @@
 					{foreach from=$cronjobLogs item=cronjobLog}
 						<tr>
 							<td class="columnCronjobID columnID"><p>{@$cronjobLog->cronjobID}</p></td>
-							<td class="columnClassPath columnText"><p>{$cronjobLog->classPath}</p></td>
+							<td class="columnClassName columnText"><p>{$cronjobLog->className}</p></td>
 							<td class="columnDescription columnText"><p>{$cronjobLog->description}</p></td>
 							{if $cronjobLog->success}
 								<td class="columnExecTime columnDate"><p>{@$cronjobLog->execTime|time} {lang}wcf.acp.cronjob.log.success{/lang}</p></td>
diff --git a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
index 47edfcadcf..b42aa0d95b 100755
--- a/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
+++ b/wcfsetup/install/files/lib/acp/page/CronjobLogListPage.class.php
@@ -44,7 +44,7 @@ class CronjobLogListPage extends SortablePage {
 	/**
 	 * @see wcf\page\SortablePage::$validSortFields
 	 */
-	public $validSortFields = array('cronjobID', 'classPath', 'description', 'execTime', 'success');
+	public $validSortFields = array('cronjobID', 'className', 'description', 'execTime', 'success');
 	
 	/**
 	 * @see	wcf\page\MultipleLinkPage::$objectListClassName
@@ -66,7 +66,7 @@ class CronjobLogListPage extends SortablePage {
 	 * @see	wcf\page\MultipleLinkPage::readObjects()
 	 */
 	protected function readObjects() {
-		$this->sqlOrderBy = (($this->sortField == 'classPath' || $this->sortField == 'description') ? 'cronjob.' : 'cronjob_log.').$this->sortField." ".$this->sortOrder;
+		$this->sqlOrderBy = (($this->sortField == 'className' || $this->sortField == 'description') ? 'cronjob.' : 'cronjob_log.').$this->sortField." ".$this->sortOrder;
 		
 		parent::readObjects();
 	}