fixes for:

+ KTS-187 Read version history: still a "compare with current" version. + KTS-79 Printable document details + KTS-75 Useability of document details when doc is checked out. + KTS-92 inconsistent groups/users pages (?) + KTS-184 Message is invalid and a few small tweaks to the ui. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4678 c91229c3-7414-0410-bfa2-8a42b809f60b

fixes for:
+ KTS-187 Read version history: still a "compare with current" version. + KTS-79 Printable document details + KTS-75 Useability of document details when doc is checked out. + KTS-92 inconsistent groups/users pages (?) + KTS-184 Message is invalid and a few small tweaks to the ui. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4678 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent 9a4b0df6
Showing 12 changed files with 90 additions and 31 deletions
lib/widgets/fieldsetDisplay.inc.php
plugins/ktcore/admin/groupManagement.php
plugins/ktcore/admin/userManagement.php
templates/kt3/document/metadata_history.smarty
templates/kt3/document/view.smarty
templates/kt3/fieldsets/generic.smarty
templates/kt3/fieldsets/generic_versioned.smarty
templates/kt3/standard_page.smarty
templates/kt3/view_document.smarty
templates/ktcore/principals/groupadmin.smarty
templates/ktcore/principals/useradmin.smarty
view.php
@@ -185,6 +185,8 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay {
             "document_data" => $aDocumentData,
             "document" => $aDocumentData["document"],
+			"filename" => $document->getFileName(),
+			
             "creator" => $creator,
             "creation_date" => $creation_date,
@@ -249,6 +251,9 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay {
             "document_data" => $aDocumentData,
             "document" => $aDocumentData["document"],
+			"filename" => $document->getFileName(),
+			"comparison_filename" => $comparison_document->getFileName(),
+			
             "creator" => $creator,
             "creation_date" => $creation_date,
@@ -21,6 +21,11 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher {
 		$show_all = KTUtil::arrayGet($_REQUEST, 'show_all', false);
 		$group_id = KTUtil::arrayGet($_REQUEST, 'group_id');
+        $no_search = true;
+        
+        if (KTUtil::arrayGet($_REQUEST, 'do_search', false) != false) {
+            $no_search = false;
+        }
 		$search_fields = array();
 		$search_fields[] =  new KTStringWidget(_('Group Name'),_("Enter part of the group's name.  e.g. <strong>ad</strong> will match <strong>administrators</strong>."), 'name', $name, $this->oPage, true);
@@ -29,6 +34,7 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher {
 			$search_results =& Group::getList('WHERE name LIKE "%' . DBUtil::escapeSimple($name) . '%"');
 		} else if ($show_all !== false) {
 			$search_results =& Group::getList();
+			$no_search = false;
 		}
@@ -38,6 +44,7 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher {
 			"context" => $this,
 			"search_fields" => $search_fields,
 			"search_results" => $search_results,
+			'no_search' => $no_search,
 		);
 		return $oTemplate->render($aTemplateData);
     }
@@ -25,6 +25,13 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         $show_all = KTUtil::arrayGet($_REQUEST, 'show_all', false);
         $user_id = KTUtil::arrayGet($_REQUEST, 'user_id');
+        $no_search = true;
+        
+        if (KTUtil::arrayGet($_REQUEST, 'do_search', false) != false) {
+            $no_search = false;
+        }
+        
+        
         $search_fields = array();
         $search_fields[] =  new KTStringWidget(_('Username'),_("Enter part of the person's username.  e.g. <strong>ra</strong> will match <strong>brad</strong>."), 'name', $name, $this->oPage, true);
@@ -35,6 +42,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
             $search_results =& User::getList('WHERE username LIKE "%' . DBUtil::escapeSimple($name) . '%"');
         } else if ($show_all !== false) {
             $search_results =& User::getList();
+            $no_search = false;
         }
         $oTemplating = new KTTemplating;        
@@ -43,6 +51,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
             "context" => $this,
             "search_fields" => $search_fields,
             "search_results" => $search_results,
+            'no_search' => $no_search,
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -22,7 +22,13 @@
 {capture assign=version}{$oVersion->getMajorVersionNumber()}.{$oVersion->getMinorVersionNumber()}{/capture}
 {capture assign=versionid}{$oVersion->getContentVersionId()}{/capture}
                 <td class="date"><a href="{$downloadaction->getURL()}&version={$versionid}">{$version}</a></td>
-                <td class="compare"><a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with current{/i18n}</a></td>                
+                <td class="compare">
+                {if ($document->getMetadataVersion() == $oVersion->getMetadataVersion())}
+                   <strong>{i18n}current version{/i18n}</strong>
+                {else}
+                   <a href="{$smarty.server.PHP_SELF}?action=viewComparison&fDocumentId={$document->getId()}&fComparisonVersion={$oVersion->getCurrentMetadataVersionId()}">{i18n}compare with current{/i18n}</a></td>                
+                {/if}
+                </td>                
             </tr>
             {/foreach}
         </tbody>
 <h2>{$document->getName()}</h2>
+
+
 {capture assign=version}
 {$document->getMajorVersionNumber()}.{$document->getMinorVersionNumber()}
 {/capture}
 <p class="descriptiveText">{i18n arg_version=$version}showing information for <strong>version #version#</strong>{/i18n}</p>
-    
+
 {foreach item=oFieldset from=$fieldsets}
 {$oFieldset->render($document_data)}
 {/foreach}
@@ -5,8 +5,11 @@
         document.{/i18n}
     </p>
     <dl class="metadata">
+        <dt>{i18n}Document Filename{/i18n}</dt>
+        <dd>{$filename} ({$context->_sizeHelper($document->getSize())})</dd>
+        
         <dt>{i18n}File is a{/i18n} </dt>
-        <dd>{$context->_mimeHelper($document->getMimeTypeID())} ({$context->_sizeHelper($document->getSize())})</dd>
+        <dd>{$context->_mimeHelper($document->getMimeTypeID())}</dd>
         <dt>{i18n}Created by{/i18n}</dt>
         <dd>{$creator} ({$creation_date})</dd>
@@ -5,10 +5,16 @@
         document.{/i18n}
     </p>
     <dl class="metadata versioned">
+        <dt>{i18n}Document Filename{/i18n}</dt>
+        <dd>
+            <div class="current">{$filename} ({$context->_sizeHelper($document->getSize())})</div>
+            <div class="previous">{$comparison_filename} ({$context->_sizeHelper($comparison_document->getSize())})</div>
+        </dd>
+    
         <dt>{i18n}File is a{/i18n} </dt>
         <dd>
-            <div class="current">{$context->_mimeHelper($document->getMimeTypeID())} ({$context->_sizeHelper($document->getSize())})</div>
-            <div class="previous">{$context->_mimeHelper($comparison_document->getMimeTypeID())} ({$context->_sizeHelper($comparison_document->getSize())})</div>
+            <div class="current">{$context->_mimeHelper($document->getMimeTypeID())}</div>
+            <div class="previous">{$context->_mimeHelper($comparison_document->getMimeTypeID())}</div>
         </dd>
         <dt>{i18n}Created by{/i18n}</dt>
@@ -5,10 +5,14 @@
     <title>{$page->title} | {$page->systemName}</title>
     <!-- CSS Files. -->
+    
     {foreach item=sResourceURL from=$page->getCSSResources()}
        <link rel="stylesheet" type="text/css" href="{$rootUrl}/{$sResourceURL}" />
     {/foreach}
+       <link rel="stylesheet" type="text/css" href="{$rootUrl}/resources/css/kt-print.css"
+           media="print" />
+    
     <!-- Standalone CSS. -->
     {foreach item=sCSS from=$page->getCSSStandalone()}
        <style>
@@ -4,7 +4,14 @@
 {/capture}
 <p class="descriptiveText">{i18n arg_version=$version}showing information for <strong>version
 #version#</strong>{/i18n}</p>
-    
+{if ($document->getIsCheckedOut() == 1)}
+{capture assign=checkout_user}<strong>{$sCheckoutUser}</strong>{/capture}
+<div class="ktInfo">
+<p>{i18n arg_checkoutuser=$checkout_user}This document is currently checked out by #checkoutuser#.  You cannot make 
+changes until that user checks it in.  If you have urgent modifications to make, please
+contact your KnowledgeTree Administrator.{/i18n}</p>
+</div>
+{/if}    
 {foreach item=oFieldset from=$fieldsets}
 {$oFieldset->render($document_data)}
 {/foreach}
@@ -20,7 +20,10 @@ action may take some time if you have many groups).{/i18n}&lt;/p&gt;
 </div class="form_actions">
 </fieldset>
 </form>
+{if ($no_search === true)}
+{else}
+{if (!empty($search_results))}
 <table class="listing">
 <thead>
    <tr>
@@ -33,7 +36,7 @@ action may take some time if you have many groups).{/i18n}&lt;/p&gt;
    </tr>
 </thead>
 <tbody>
-   {if (!empty($search_results))}
+   
    <!-- do we want to batch here? -->
      {foreach item=oGroup from=$search_results}
      <tr>
@@ -52,12 +55,12 @@ href=&quot;?action=manageSubgroups&amp;group_id={$oGroup-&gt;getId()}&quot;&gt;{i18n}Manage sub-grou
 class="ktAction ktDelete">{i18n}Delete{/i18n}</a></td>
      </tr>   
      {/foreach}
-   {else}  
-   <tr>
-      <td colspan="7" class="ktInfo">
-         <p>{i18n}No search specified, or no results for your search.{/i18n}</p>
-      </td>
-   </tr>
-   {/if}
+   
 </tbody>
 </table>
+
+{else}
+<div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>
+
+{/if}
+{/if}
 \ No newline at end of file
@@ -9,6 +9,7 @@ href=&quot;?action=addUser&quot;&gt;{i18n}Add a new user{/i18n}&lt;/a&gt;.&lt;/p&gt;
 <!-- we roll both in here. -->
 <form action="{$smarty.server.PHP_SELF}" method="POST">
+<input type="hidden" name="do_search" value="1" />
 <fieldset>
 <legend>Search for users</legend>
 <p class="descriptiveText">{i18n}Since there may be many users in the system, please
@@ -26,6 +27,11 @@ very slow if you have many users.{/i18n}&lt;/p&gt;
 </fieldset>
 </form>
+{if (no_search === true)}
+
+{else}
+
+   {if (!empty($search_results))}
 <table class="listing">
 <thead>
    <tr>
@@ -37,7 +43,6 @@ very slow if you have many users.{/i18n}&lt;/p&gt;
    </tr>
 </thead>
 <tbody>
-   {if (!empty($search_results))}
    <!-- do we want to batch here? -->
      {foreach item=oUser from=$search_results}
      <tr>
@@ -48,21 +53,12 @@ very slow if you have many users.{/i18n}&lt;/p&gt;
         <td><a href="?action=editgroups&user_id={$oUser->getId()}">{i18n}Groups{/i18n}</a></td>  
      </tr>   
      {/foreach}
-   {else}  
-   <tr>
-      <td colspan="5" class="ktInfo">
-         <!-- never show a very large set, if you can help it. -->
-         <p>
-{i18n}
-No search specified, or no results for your search.  Please choose some
-criteria from the list above to find users.
-{/i18n}
-</p>
-      </td>
-   </tr>
-   {/if}
-<!--
-   
--->
+
 </tbody>
 </table>
+
+{else}
+<div class="ktError"><p>{i18n}No results for your search.{/i18n}</p></div>
+
+{/if}
+{/if}
 \ No newline at end of file
@@ -124,10 +124,21 @@ class ViewDocumentDispatcher extends KTStandardDispatcher {
             array_push($fieldsets, new $displayClass($oFieldset));
         }
+		
+		$checkout_user = 'Unknown user';
+		if ($oDocument->getIsCheckedOut() == 1) {
+		    $oCOU = User::get($oDocument->getCheckedOutUserId());
+			if (!(PEAR::isError($oCOU) || ($oCOU == false))) {
+				$checkout_user = $oCOU->getName();
+			}
+		}
+		
+		
         $oTemplating = new KTTemplating;
 		$oTemplate = $oTemplating->loadTemplate("kt3/view_document");
 		$aTemplateData = array(
               "context" => $this,
+			  "sCheckoutUser" => $checkout_user,
 			  "document_id" => $document_id,
 			  "document" => $oDocument,
 			  "document_data" => $document_data,