- fix for KTS-345

- add config flag (off by default) to show_al... - fix for KTS-339 and 340 git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4882 c91229c3-7414-0410-bfa2-8a42b809f60b

- fix for KTS-345
- add config flag (off by default) to show_al... - fix for KTS-339 and 340 git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4882 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent a689151f
Showing 9 changed files with 118 additions and 10 deletions
browse.php
config/config.ini
config/dmsDefaults.php
lib/templating/kt3template.inc.php
plugins/ktcore/admin/groupManagement.php
plugins/ktcore/admin/userManagement.php
templates/kt3/standard_page.smarty
templates/ktcore/action/mass_move.smarty
templates/ktcore/folder/mass_delete.smarty
@@ -57,6 +57,19 @@ class KTMassMoveColumn extends TitleColumn {
         parent::TitleColumn($sLabel, $sName);
     }
+    function renderFolderLink($aDataRow) {
+        $aFolders = $_SESSION['moves'][$this->sMoveCode]['folders'];
+        if (array_search($aDataRow['folder']->getId(), $aFolders) === false) {
+            $outStr = '<a href="' . $this->buildFolderLink($aDataRow) . '">';
+            $outStr .= $aDataRow["folder"]->getName();
+            $outStr .= '</a>';
+        } else { 
+            $outStr = $aDataRow["folder"]->getName() . ' <span class="descriptiveText">(' . _('you cannot move folders to themselves') . ')';
+        }
+        return $outStr;    
+    
+    }
+    
     function buildFolderLink($aDataRow) {
         return KTUtil::addQueryStringSelf(sprintf('fMoveCode=%s&fFolderId=%d&action=startMove', $this->sMoveCode, $aDataRow["folder"]->getId()));
     }
@@ -275,6 +288,13 @@ class BrowseDispatcher extends KTStandardDispatcher {
             $this->errorRedirectToMain(_('No action selected.'));
             exit(0);
         }
+
+        $aFolderSelection = KTUtil::arrayGet($_REQUEST, 'selection_f' , array());
+        $aDocumentSelection = KTUtil::arrayGet($_REQUEST, 'selection_d' , array());        
+        if (empty($aFolderSelection) && empty($aDocumentSelection)) {
+                $this->errorRedirectToMain(_('Please select documents or folders first.'));
+                exit(0);
+            }        
         if ($target == 'delete') {
             return $this->do_startDelete();
@@ -300,18 +320,16 @@ class BrowseDispatcher extends KTStandardDispatcher {
             $aDocumentSelection = KTUtil::arrayGet($_REQUEST, 'selection_d' , array());
-            
             $sMoveCode = KTUtil::randomString();
             $aMoveData = array('folders' => $aFolderSelection, 'documents' => $aDocumentSelection);
-            var_dump($aMoveData);
-            
             $moves = KTUtil::arrayGet($_SESSION, 'moves', array());
             $moves = (array) $moves; // ?
             $moves[$sMoveCode] = $aMoveData;
             $_SESSION['moves'] = $moves; // ...
         }
-
+        
+        
         $oFolder = Folder::get(KTUtil::arrayGet($_REQUEST, 'fFolderId', 1));
         if (PEAR::isError($oFolder)) { 
             $this->errorRedirectToMain(_('Invalid folder selected.'));
@@ -355,6 +373,34 @@ class BrowseDispatcher extends KTStandardDispatcher {
             $aBreadcrumbs[] = array("url" => $url, "name" => $folder_path_names[$index]);
         }
+        
+        // now show the items...
+        $moveSet = $_SESSION['moves'][$sMoveCode];
+        $moveItems = array();
+        $moveItems['folders'] = array();
+        $moveItems['documents'] = array();
+        
+        $folderStr = '';
+        $documentStr = '';
+        
+        if (!empty($moveSet['folders'])) {
+            $folderStr = '<strong>' . _('Folders: ') . '</strong>';
+            foreach ($moveSet['folders'] as $iFolderId) {
+                $oF = Folder::get($iFolderId);
+                $moveItems['folders'][] = $oF->getName();
+            }
+            $folderStr .= implode(', ', $moveItems['folders']);
+        }
+        
+        if (!empty($moveSet['documents'])) {
+            $documentStr = '<strong>' . _('Documents: ') . '</strong>';
+            foreach ($moveSet['documents'] as $iDocId) {
+                $oD = Document::get($iDocId);
+                $moveItems['documents'][] = $oD->getName();
+            }
+            $documentStr .= implode(', ', $moveItems['documents']);
+        }
+        
         $oTemplating = new KTTemplating;
         $oTemplate = $oTemplating->loadTemplate("ktcore/action/mass_move");
         $aTemplateData = array(
@@ -363,6 +409,8 @@ class BrowseDispatcher extends KTStandardDispatcher {
               'move_code' => $sMoveCode,
               'collection' => $collection,
               'collection_breadcrumbs' => $aBreadcrumbs,
+              'folders' => $folderStr,
+              'documents' => $documentStr,
         );
         return $oTemplate->render($aTemplateData);       
@@ -520,6 +568,33 @@ class BrowseDispatcher extends KTStandardDispatcher {
         $aFolderSelection = KTUtil::arrayGet($_REQUEST, 'selection_f' , array());
         $aDocumentSelection = KTUtil::arrayGet($_REQUEST, 'selection_d' , array());
+
+        // now show the items...
+        $delItems = array();
+        $delItems['folders'] = array();
+        $delItems['documents'] = array();
+        
+        $folderStr = '';
+        $documentStr = '';
+        
+        if (!empty($aFolderSelection)) {
+            $folderStr = '<strong>' . _('Folders: ') . '</strong>';
+            foreach ($aFolderSelection as $iFolderId) {
+                $oF = Folder::get($iFolderId);
+                $delItems['folders'][] = $oF->getName();
+            }
+            $folderStr .= implode(', ', $delItems['folders']);
+        }
+        
+        if (!empty($aDocumentSelection)) {
+            $documentStr = '<strong>' . _('Documents: ') . '</strong>';
+            foreach ($aDocumentSelection as $iDocId) {
+                $oD = Document::get($iDocId);
+                $delItems['documents'][] = $oD->getName();
+            }
+            $documentStr .= implode(', ', $delItems['documents']);
+        }
+        
         $aFields = array();
         $aFields[] = new KTStringWidget(_('Reason'), _('The reason for the deletion of these documents and folders for historical purposes.'), 'sReason', "", $this->oPage, true);
@@ -531,6 +606,8 @@ class BrowseDispatcher extends KTStandardDispatcher {
               'form_fields' => $aFields,
               'folders' => $aFolderSelection,
               'documents' => $aDocumentSelection,
+              'folder_string' => $folderStr,
+              'document_string' => $documentStr,
         );
         return $oTemplate->render($aTemplateData);        
     }
@@ -75,7 +75,10 @@ companyLogoTitle = ACME Corporation
 ; use the additional IE specific GIF theme overrides.
 ; using this means that arbitrary theme packs may not work without 
 ; having GIF versions available.
-ieGIF = true
+ieGIF = default
+
+; do not restrict to searches (e.g. always show_all) on users and groups pages.
+alwaysShowAll = default
 ; ----------------------------------------------------------------
 ; These sections are for more esoteric settings - you probably don't
@@ -381,6 +381,9 @@ $oKTConfig-&gt;setdefaultns(&quot;tweaks&quot;, &quot;genericMetaDataRequired&quot;, true);
 $oKTConfig->setdefaultns("tweaks", "phpErrorLogFile", false);
 $oKTConfig->setdefaultns("tweaks", "developmentWindowLog", false);
+$oKTConfig->setdefaultns("ui", "ieGIF", true);
+$oKTConfig->setdefaultns("ui", "alwaysShowAll", false);
+
 $oKTConfig->setdefaultns(null, "logLevel", 'INFO');
 $oKTConfig->setdefaultns("import", "unzip", 'unzip');
@@ -238,7 +238,7 @@ class KTPage {
     /* final render call. */
     function render() {
-
+	    global $default; 
         if (empty($this->contents)) {
             $this->contents = "";
         }
@@ -281,6 +281,7 @@ class KTPage {
         $oTemplate = $oTemplating->loadTemplate($this->template);
         $aTemplateData = array(
             "page" => $this,
+			"systemversion" => $default->systemVersion,
         );
         // unlike the rest of KT, we use echo here.
@@ -21,9 +21,11 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher {
 		$this->oPage->setBreadcrumbDetails(_('select a group'));
 		$this->oPage->setTitle(_("Group Management"));
+		$KTConfig =& KTConfig::getSingleton();
+        $alwaysAll = $KTConfig->get("alwaysShowAll");
 		$name = KTUtil::arrayGet($_REQUEST, 'name');
-		$show_all = KTUtil::arrayGet($_REQUEST, 'show_all', false);
+		$show_all = KTUtil::arrayGet($_REQUEST, 'show_all', $alwaysAll);
 		$group_id = KTUtil::arrayGet($_REQUEST, 'group_id');
         $no_search = true;
@@ -20,9 +20,12 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('User Management'));
         $this->oPage->setBreadcrumbDetails(_('select a user'));
         $this->oPage->setTitle(_("User Management"));
-        
+		
+		$KTConfig =& KTConfig::getSingleton();
+        $alwaysAll = $KTConfig->get("alwaysShowAll");
+		
         $name = KTUtil::arrayGet($_REQUEST, 'name');
-        $show_all = KTUtil::arrayGet($_REQUEST, 'show_all', false);
+        $show_all = KTUtil::arrayGet($_REQUEST, 'show_all', $alwaysAll);
         $user_id = KTUtil::arrayGet($_REQUEST, 'user_id');
         $no_search = true;
@@ -155,7 +155,8 @@
 {$page->contents}
 <div id="copyrightbar">
-{i18n}&copy; 2006 <a href="http://www.ktdms.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved.{/i18n}
+{i18n}&copy; 2006 <a href="http://www.ktdms.com/">The Jam Warehouse Software (Pty) Ltd.</a> All Rights Reserved{/i18n} 
+&mdash; {i18n arg_version="$systemversion"}KnowledgeTree Version: #version#{/i18n}
 </div>
 </div>
@@ -6,6 +6,13 @@
 <input type="hidden" name="action" value="finaliseMove" />
 <input type="hidden" name="fMoveCode" value="{$move_code}" />
+<div class="field">
+<label>Items to move</label>
+<p class="descriptiveText">{i18n}The items that you selected to move.{/i18n}</p>
+{if ($folders)}{$folders}<br />{/if}
+{if ($documents)}{$documents}{/if}
+</div>
+
 <div class="field ">
 <label for="fFolderId">{i18n}Target folder{/i18n}</label>
 <p class="descriptiveText">{i18n}Use the folder collection and path below to
@@ -18,6 +18,17 @@ will be recorded in the documents&#39; &quot;Transaction History&quot;{/i18n}&lt;/p&gt;
 <input type="hidden" name="selection_f[]" value="{$iFolderId}" />
 {/foreach}
+
+
+<div class="field">
+<label>Items to delete</label>
+<p class="descriptiveText">{i18n}The items that you selected to delete.{/i18n}</p>
+{if ($folder_string)}{$folder_string}<br />{/if}
+{if ($document_string)}{$document_string}{/if}
+</div>
+
+
+
 {foreach item=oWidget from=$form_fields}
 {$oWidget->render()}
 {/foreach}