From 0f78f482e7baa6be0dbcec501db13a31cd38d31e Mon Sep 17 00:00:00 2001
From: Neil Blakey-Milner <nbm@knowledgetree.com>
Date: Mon, 4 Dec 2006 09:41:06 +0000
Subject: [PATCH] KTS-1329: Show the owner value in document details

---
 lib/widgets/fieldsetDisplay.inc.php              | 15 +++++++++++++++
 templates/kt3/fieldsets/generic.smarty           | 11 ++++++++---
 templates/kt3/fieldsets/generic_versioned.smarty | 12 ++++++++----
 3 files changed, 31 insertions(+), 7 deletions(-)

diff --git a/lib/widgets/fieldsetDisplay.inc.php b/lib/widgets/fieldsetDisplay.inc.php
index 5af5087..126fac7 100644
--- a/lib/widgets/fieldsetDisplay.inc.php
+++ b/lib/widgets/fieldsetDisplay.inc.php
@@ -192,6 +192,12 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay {
         } else {
            $creator_name = $creator->getName();
         }
+        $owner =& User::get($document->getOwnerId());
+        if (PEAR::isError($owner)) {
+           $owner_name = "<span class='ktError'>" . _kt("Unable to find the document's owner") . "</span>";
+        } else {
+           $owner_name = $owner->getName();
+        }
         $modified_user =& User::get($document->getModifiedUserId());
         if (PEAR::isError($modified_user)) {
            $modified_user_name = "<span class='ktError'>" . _kt("Unable to find the document's creator") . "</span>";
@@ -220,6 +226,7 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay {
 			"filename" => $document->getFileName(),
 			
             "creator" => $creator_name,
+            "owner" => $owner_name,
             "creation_date" => $creation_date,
             
             "last_modified_by" => $modified_user_name,
@@ -262,6 +269,13 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay {
         } else {
            $modified_user = $modified_user->getName();
         }
+
+        $owner_user =& User::get($document->getOwnerId());
+        if (PEAR::isError($owner_user)) {
+           $owner_user = "<span class='ktError'>" . _kt("Unable to find the document's owner") . "</span>";
+        } else {
+           $owner_user = $owner_user->getName();
+        }
 		
 
 
@@ -293,6 +307,7 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay {
 			
             "creator" => $creator,
             "creation_date" => $creation_date,
+            "owner" => $owner_user,
             
             "last_modified_by" => $modified_user,
             "last_modified_date" => $last_modified_date,
diff --git a/templates/kt3/fieldsets/generic.smarty b/templates/kt3/fieldsets/generic.smarty
index e6d0817..2e48623 100644
--- a/templates/kt3/fieldsets/generic.smarty
+++ b/templates/kt3/fieldsets/generic.smarty
@@ -27,16 +27,21 @@
     </tr>
 
     <tr class="even">
+        <th>{i18n}Owned by{/i18n}</th>
+        <td>{$owner}</td>
+    </tr>
+
+    <tr class="odd">
         <th>{i18n}Last update by{/i18n}</th>
         <td>{$last_modified_by} ({$last_modified_date})</td>
     </tr>
 
-    <tr class="odd">
+    <tr class="even">
         <th>{i18n}Document Type{/i18n}</th>
         <td>{$document_type}</td>
     </tr>
 
-    <tr class="even">
+    <tr class="odd">
         <th>{i18n}Workflow status{/i18n}</th>
         <td>
 {if $workflow_state}
@@ -46,7 +51,7 @@
 {/if}</td>
     </tr>
 
-    <tr class="odd">
+    <tr class="even">
         <th>{i18n}Document ID{/i18n}</th>
         <td>{$document->getId()}</td>
     </tr>
diff --git a/templates/kt3/fieldsets/generic_versioned.smarty b/templates/kt3/fieldsets/generic_versioned.smarty
index dee5105..e5668cd 100644
--- a/templates/kt3/fieldsets/generic_versioned.smarty
+++ b/templates/kt3/fieldsets/generic_versioned.smarty
@@ -44,10 +44,14 @@
         <td colspan="2">{$creator} ({$creation_date}) <span class="descriptiveText">({i18n}this cannot not change between versions{/i18n})</td>
     </tr>
 
+    <tr class="even">
+        <th>{i18n}Owned by{/i18n}</th>
+        <td colspan="2">{$owner} <span class="descriptiveText">({i18n}this cannot not change between versions{/i18n})</td>
+    </tr>
 
 {capture assign="oldval"}{$comparison_last_modified_by} ({$comparison_last_modified_date}){/capture}
 {capture assign="newval"}{$last_modified_by} ({$last_modified_date}){/capture}
-    <tr class="even">
+    <tr class="odd">
         <th>{i18n}Last update by{/i18n}</th>
         <td class="current {if ($oldval != $newval)}different{/if}">{$newval}</td>
         <td class="previous {if ($oldval != $newval)}different{/if}">{$oldval}</td>        
@@ -55,7 +59,7 @@
 
 {capture assign="oldval"}{$comparison_document_type}{/capture}
 {capture assign="newval"}{$document_type}{/capture}    
-    <tr class="odd">
+    <tr class="even">
         <th>{i18n}Document Type{/i18n}</th>
         <td class="current {if ($oldval != $newval)}different{/if}">{$newval}</td>
         <td class="previous {if ($oldval != $newval)}different{/if}">{$oldval}</td>        
@@ -71,13 +75,13 @@
 {else}
 {i18n}No workflow{/i18n}
 {/if}{/capture}
-    <tr class="even">
+    <tr class="odd">
         <th>{i18n}Workflow status{/i18n}</th>
         <td class="current {if ($oldval != $newval)}different{/if}">{$newval}</td>
         <td class="previous {if ($oldval != $newval)}different{/if}">{$oldval}</td>        
     </tr>
 
-    <tr class="odd">
+    <tr class="even">
         <th>{i18n}Document ID{/i18n}</th>
         <td colspan="2">{$document->getId()} <span class="descriptiveText">({i18n}this cannot not change between versions{/i18n})</span></td>
     </tr>
--
libgit2 0.21.4