KTS-1329: Show the owner value in document details

git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6079 c91229c3-7414-0410-bfa2-8a42b809f60b

KTS-1329: Show the owner value in document details
git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@6079 c91229c3-7414-0410-bfa2-8a42b809f60b
Neil Blakey-Milner
1 parent a20092d5
Showing 3 changed files with 31 additions and 7 deletions
lib/widgets/fieldsetDisplay.inc.php
templates/kt3/fieldsets/generic.smarty
templates/kt3/fieldsets/generic_versioned.smarty
@@ -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,
@@ -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>
@@ -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>