commit 42876932b428db6eba8cf52ad5ce749ab722d559
parent 0f22696457f695b5194a1d9a7229001ddad9ae93
Author: Jan Dankert <devnull@localhost>
Date: Sat, 9 Dec 2017 23:38:42 +0100
Fix für den Projektverlauf.
Diffstat:
2 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/model/Project.class.php b/model/Project.class.php
@@ -825,7 +825,7 @@ SQL
/**
* Ermittelt projektübergreifend die letzten Änderungen.
*
- * @return Ambigous <string, unknown>
+ * @return array
*/
public static function getAllLastChanges()
{
@@ -858,7 +858,7 @@ SQL
/**
* Ermittelt die letzten Änderung im Projekt.
- * @return Array[Objektid]=Array())
+ * @return array
*/
public function getLastChanges()
{
diff --git a/themes/default/templates/project/history.tpl.src.xml b/themes/default/templates/project/history.tpl.src.xml
@@ -19,17 +19,20 @@
<list list="timeline" extract="true">
<!-- Den Typ des Objektes ermitteln -->
- <if value="var:is_folder" equals="1">
+ <if value="var:typeid" equals="1">
<set var="type" value="folder" />
</if>
- <if value="var:is_file" equals="1">
+ <if value="var:typeid" equals="2">
<set var="type" value="file" />
</if>
- <if value="var:is_link" equals="1">
+ <if value="var:typeid" equals="3">
+ <set var="type" value="page" />
+ </if>
+ <if value="var:typeid" equals="4">
<set var="type" value="link" />
</if>
- <if value="var:is_page" equals="1">
- <set var="type" value="page" />
+ <if value="var:typeid" equals="5">
+ <set var="type" value="url" />
</if>
<row class="data">