Brad Shuttleworth 2006-02-20 fix for KTS-428

Brad Shuttleworth 2006-02-17 fix for KTS-94 fix for subscriptions not fi... git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4980 c91229c3-7414-0410-bfa2-8a42b809f60b

Brad Shuttleworth 2006-02-20 fix for KTS-428
Brad Shuttleworth 2006-02-17 fix for KTS-94 fix for subscriptions not fi... git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4980 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 69bdd4f5
Showing 14 changed files with 134 additions and 15 deletions
admin.php
config/config.ini
config/dmsDefaults.php
lib/dispatcher.inc.php
lib/util/ktutil.inc
plugins/ktcore/KTCorePlugin.php
plugins/ktcore/KTPortlets.php
plugins/ktcore/admin/documentFields.php
plugins/ktcore/folder/addDocument.php
plugins/ktstandard/KTSubscriptions.php
resources/css/kt-framing.css
templates/kt3/admin_fulllist.smarty
templates/kt3/portlets/admin_categories.smarty
templates/ktcore/metadata/listFieldsets.smarty
@@ -28,15 +28,31 @@ class AdminSplashDispatcher extends KTAdminDispatcher {
         // are we categorised, or not?
         $oRegistry =& KTAdminNavigationRegistry::getSingleton();
         $categories = $oRegistry->getCategories();		
+		$KTConfig =& KTConfig::getSingleton();
+        $condensed_admin = $KTConfig->get("condensedAdminUI");
  
+        $aAllItems = array();
         // we need to investigate sub_url solutions.
+        if ($condensed_admin) {
+            foreach ($categories as $aCategory) {
+                $aItems = $oRegistry->getItemsForCategory($aCategory['name']);
+                $aAllItems[$aCategory['name']] = $aItems;
+            }
+        }
  
         $this->oPage->title = _("DMS Administration") . ": ";
         $oTemplating = new KTTemplating;
-        $oTemplate = $oTemplating->loadTemplate("kt3/admin_categories");
+        
+        if ($condensed_admin) {
+            $oTemplate = $oTemplating->loadTemplate("kt3/admin_fulllist");
+        } else {
+            $oTemplate = $oTemplating->loadTemplate("kt3/admin_categories");
+        }
+        
         $aTemplateData = array(
               "context" => $this,
               "categories" => $categories,
+              "all_items" => $aAllItems,
               "baseurl" => $_SERVER['PHP_SELF'],
         );
         return $oTemplate->render($aTemplateData);				
@@ -85,8 +101,9 @@ if (empty($sub_url)) {
        $aCategory = $oRegistry->getCategory($aParts[0]);			   
  
        $oDispatcher->aBreadcrumbs = array();
-       $oDispatcher->aBreadcrumbs[] = array('url' => KTUtil::getRequestScriptName($_SERVER), 'name' => 'Administration');
+       $oDispatcher->aBreadcrumbs[] = array('action' => "administration", 'name' => 'Administration');
        $oDispatcher->aBreadcrumbs[] = array("name" => $aCategory['title'], "url" => KTUtil::ktLink('admin.php',$aParts[0]));
+       
     } else {
        // FIXME (minor) redirect to no-suburl?
        $oDispatcher = new AdminSplashDispatcher();
@@ -86,6 +86,9 @@ alwaysShowAll = default
 ; have expired.
 automaticRefresh = default
  
+; use a condensed admin ui
+condensedAdminUI = default
+
 ; ----------------------------------------------------------------
 ; These sections are for more esoteric settings - you probably don't
 ; want to mess with these
@@ -401,6 +401,7 @@ $oKTConfig-&gt;setdefaultns(&quot;user_prefs&quot;, &quot;restrictAdminPasswords&quot;, false);
  
 $oKTConfig->setdefaultns("ui", "ieGIF", true);
 $oKTConfig->setdefaultns("ui", "alwaysShowAll", false);
+$oKTConfig->setdefaultns("ui", "condensedAdminUI", false);
  
 $oKTConfig->setdefaultns(null, "logLevel", 'INFO');
 $oKTConfig->setdefaultns("import", "unzip", 'unzip');
@@ -216,6 +216,10 @@ class KTStandardDispatcher extends KTDispatcher {
         return true;
     }
  
+	function addInfoMessage($sMessage) { $_SESSION['KTInfoMessage'][] = $sMessage; }
+	
+	function addErrorMessage($sMessage) { $_SESSION['KTErrorMessage'][] = $sMessage; }	
+	
     function handleOutput($data) {
 	    global $default;
 		global $sectionName;
@@ -488,11 +488,13 @@ class KTUtil {
         $root = $KTConfig->get("KnowledgeTree/rootUrl");
         $url = generateLink($base);
  
-        $hasPathInfo = $KTConfig->get("KnowledgeTree/pathInfoSupport");
-        if ($hasPathInfo) {
-            $url .= $subpath;
-        } else {
-            $url = KTUtil::addQueryString($url, "kt_path_info=" . $subpath);
+        if (!empty($subpath)) {
+            $hasPathInfo = $KTConfig->get("KnowledgeTree/pathInfoSupport");
+            if ($hasPathInfo) {
+                $url .= $subpath;
+            } else {
+                $url = KTUtil::addQueryString($url, "kt_path_info=" . $subpath);
+            }
         }
  
         return KTUtil::addQueryString($url, $qs);
@@ -51,6 +51,10 @@ class KTCorePlugin extends KTPlugin {
                 'KTBrowseModePortlet', 'ktcore.portlets.browsemodes',
                 'KTPortlets.php');
  
+        $this->registerPortlet(array('administration'),
+                'KTAdminSectionNavigation', 'ktcore.portlets.adminnavigation',
+                'KTPortlets.php');
+
         $this->setupAdmin();
     }
  
@@ -41,7 +41,7 @@ class KTBrowseModePortlet extends KTPortlet {
         parent::KTPortlet($sTitle);
     }
  
-    function render() {    
+    function render() { 
         // this is unfortunate, but such is life.
         $current_action = KTUtil::arrayGet($_REQUEST, 'fBrowseMode', null);
         $modes = array(
@@ -107,3 +107,29 @@ class KTAdminModePortlet extends KTPortlet {
         return $oTemplate->render($aTemplateData);
     }
 }
+
+
+
+class KTAdminSectionNavigation extends KTPortlet {
+
+    function KTAdminSectionNavigation() {
+        parent::KTPortlet(_("Administration"));
+    }
+    
+    function render() {
+        require_once(KT_LIB_DIR . "/plugins/KTAdminNavigation.php");
+    
+        $oRegistry =& KTAdminNavigationRegistry::getSingleton();
+        $categories = $oRegistry->getCategories();		
+        
+        // we need to investigate sub_url solutions.
+        
+        $oTemplating = new KTTemplating;
+        $oTemplate = $oTemplating->loadTemplate("kt3/portlets/admin_categories");
+        $aTemplateData = array(
+              "context" => $this,
+              "categories" => $categories,
+        );
+        return $oTemplate->render($aTemplateData);			
+    }
+}
@@ -32,7 +32,7 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
         $createFields[] = new KTTextWidget('Description', _('A brief description of the information stored in this fieldset.'), 'description', null, $this->oPage, true);
         $createFields[] = new KTCheckboxWidget('Generic', _('A generic fieldset is one that is available for every document by default.  These fieldsets will be available for users to edit and add for every document in the document management system.'), 'generic', false, $this->oPage, false);
         $createFields[] = new KTCheckboxWidget('System',
-            _('A system fieldset is one that is never displayed to a user, and is used only by the document management system.'), 'generic', false, $this->oPage, false);
+            _('A system fieldset is one that is never displayed to a user, and is used only by the document management system.'), 'system', false, $this->oPage, false);
  
  
         $oTemplating =& KTTemplating::getSingleton();
@@ -120,7 +120,11 @@ class KTDocumentFieldDispatcher extends KTAdminDispatcher {
         if (KTUtil::arrayGet($_REQUEST, 'system')) {
             $bIsSystem = true;
             // Can't be a system fieldset and a generic fieldset...
-            $bIsGeneric = false;
+			if ($bIsGeneric) {
+                $bIsGeneric = false;
+			    $this->addInfoMessage(_('System fieldsets cannot be generic.  Generic flag removed.'));
+			}
+			
         }
  
 		// basic validation
@@ -91,6 +91,11 @@ class KTFolderAddDocumentAction extends KTFolderAction {
         $aFile = $this->oValidator->validateFile($_FILES['file'], $aErrorOptions);
         $sTitle = $this->oValidator->validateString($_REQUEST['title'], $aErrorOptions);
  
+        if (KTDocumentUtil::exists( $this->oFolder, basename($aFile['name']))) {
+            $this->errorRedirectToMain(_('There is already a document with that filename in this folder.'),'fFolderId=' . $this->oFolder->getId());
+            exit(0);
+        }
+
         $matches = array();
         $aFields = array();
         foreach ($_REQUEST as $k => $v) {
@@ -24,6 +24,8 @@ class KTSubscriptionPlugin extends KTPlugin {
             'ktstandard.subscription.documentunsubscription');
         $this->registerTrigger('checkout', 'postValidate', 'KTCheckoutSubscriptionTrigger',
             'ktstandard.triggers.subscription.checkout');
+        $this->registerTrigger('edit', 'postValidate', 'KTEditSubscriptionTrigger',
+            'ktstandard.triggers.subscription.checkout');            
         $this->registerTrigger('delete', 'postValidate', 'KTDeleteSubscriptionTrigger',
             'ktstandard.triggers.subscription.delete');
         $this->registerTrigger('moveDocument', 'postValidate', 'KTDocumentMoveSubscriptionTrigger',
@@ -180,6 +182,28 @@ class KTCheckoutSubscriptionTrigger {
 }
 // }}}
  
+
+// {{{ KTCheckoutSubscriptionTrigger
+class KTEditSubscriptionTrigger {
+    var $aInfo = null;
+    function setInfo(&$aInfo) {
+        $this->aInfo =& $aInfo;
+    }
+
+    function postValidate() {
+        global $default;
+        $oDocument =& $this->aInfo["document"];
+        // fire subscription alerts for the checked out document
+
+        // fire subscription alerts for the checked in document
+        $oSubscriptionEvent = new SubscriptionEvent();
+        $oFolder = Folder::get($oDocument->getFolderID());
+        $oSubscriptionEvent->ModifyDocument($oDocument, $oFolder);
+
+    }
+}
+// }}}
+
 // {{{ KTDeleteSubscriptionTrigger
 class KTDeleteSubscriptionTrigger {
     var $aInfo = null;
@@ -550,6 +550,10 @@ a.main_nav_item {
     white-space: nowrap !important;
 }
  
+.kt_collection.narrow {
+    width: auto;
+}
+
 .kt_collection thead th {
     border-bottom: 1px solid #888;
     text-align: left;
+<dl class="panel_menu">
+   {foreach item=aCategory from=$categories}
+   <dt>{capture assign="cat_id"}{$aCategory.name}{/capture}<a href="{$smarty.server.PHP_SELF|addQueryString:"action=viewCategory&fCategory=$cat_id"}">{$aCategory.title}</a></dt>
+   <dd>
+   <p class="descriptiveText">{$aCategory.description}</p>   
+   <p>{foreach item=aItem from=$all_items.$cat_id name=itemlist}
+   <a href="{ktLink base="admin.php" subpath="`$aItem.fullname`"}">{$aItem.title}</a> {if !($smarty.foreach.itemlist.last)} | {/if}
+   {/foreach}
+   </p>
+   </dd>
+   {/foreach}
+</dl>
 \ No newline at end of file
+<ul class="actionlist">
+   {foreach item=aCategory from=$categories}
+      <li><a href="{ktLink base="admin.php" query="action=viewCategory&fCategory=`$aCategory.name`"}">{$aCategory.title}</a></li>
+   {/foreach}
+</ul>
 \ No newline at end of file
@@ -5,11 +5,12 @@
 { if $fieldsets}
 <h3>{i18n}Existing document fieldsets{/i18n}</h3>
  
-<table class="listing" cellpadding="1.5em" cellspacing="0">
+<table class="kt_collection narrow" cellpadding="1.5em" cellspacing="0">
   <thead>
     <tr>
       <th>{i18n}Name{/i18n}</th>
-      <th>{i18n}Is Generic{/i18n}</th>
+      <th class="centered">{i18n}Is Generic{/i18n}</th>
+	  <th class="centered">{i18n}Is System{/i18n}</th>
       <th>{i18n}Fields{/i18n}</th>
 	  <th>{i18n}Edit{/i18n}</th>
 	  <th>{i18n}Delete{/i18n}</th>
@@ -22,13 +23,20 @@
          { $oFieldset->getName() }
         </a>
       </td>
-      <td>
+      <td class="centered">
 {if ($oFieldset->getIsGeneric())}
-	{i18n}Yes{/i18n} 
+	<span class="ktAction ktInline ktAllowed">{i18n}Yes{/i18n}</span>
 {else}
-	{i18n}No{/i18n} 
+	<span class="ktAction ktInline ktDenied">{i18n}No{/i18n}</span>
 {/if}
       </td>
+      <td class="centered">
+{if ($oFieldset->getIsSystem())}
+	<span class="ktAction ktInline ktAllowed">{i18n}Yes{/i18n}</span>
+{else}
+	<span class="ktAction ktInline ktDenied">{i18n}No{/i18n}</span>
+{/if}
+      </td>	  
       <td>
 {assign var="aFields" value=$oFieldset->getFields()}
 {if $aFields}