- add delete page.

- KTS-167: Unable to create workflow. - some actions are _always_ available. - spacing prevents title from overlapping other columns - KTS-163: add a "workflow" column to the browse page - improve titling on search / saved search - KTS-143: fields need validation. - KTS-103: change all "the KnowledgeTree" to "KnowledgeTree". git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4619 c91229c3-7414-0410-bfa2-8a42b809f60b

- add delete page.
- KTS-167: Unable to create workflow. - some actions are _always_ available. - spacing prevents title from overlapping other columns - KTS-163: add a "workflow" column to the browse page - improve titling on search / saved search - KTS-143: fields need validation. - KTS-103: change all "the KnowledgeTree" to "KnowledgeTree". git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4619 c91229c3-7414-0410-bfa2-8a42b809f60b
Brad Shuttleworth
1 parent 741da2be
Showing 15 changed files with 123 additions and 16 deletions
browse.php
lib/actions/folderaction.inc.php
lib/browse/BrowseColumns.inc.php
lib/validation/dispatchervalidation.inc.php
lib/widgets/fieldsetDisplay.inc.php
plugins/ktcore/KTFolderActions.php
plugins/ktcore/admin/documentFields.php
plugins/ktcore/admin/userManagement.php
plugins/ktcore/folder/addDocument.php
plugins/ktstandard/ldap/ldapauthenticationprovider.inc.php
resources/css/kt-contenttypes.css
resources/css/kt-framing.css
resources/js/toggleselect.js
search/booleanSearch.php
templates/ktcore/folder/mass_delete.smarty
@@ -137,6 +137,7 @@ class BrowseDispatcher extends KTStandardDispatcher {
         $collection->addColumn(new DateColumn(_("Created"),"created", "getCreatedDateTime"));
         $collection->addColumn(new DateColumn(_("Last Modified"),"modified", "getLastModifiedDate"));
         $collection->addColumn(new UserColumn(_('Creator'),'creator_id','getCreatorID'));
+        $collection->addColumn(new WorkflowColumn(_('Workflow State'),'workflow_state'));
  
  
         // setup the folderside add actions
@@ -11,6 +11,8 @@ class KTFolderAction extends KTStandardDispatcher {
  
     var $_sShowPermission;
     var $_sDisablePermission;
+    
+    var $_adminAlwaysAvailable = false;
  
     var $_bDisabled;
     var $_sDisabledText = null;
@@ -44,7 +46,7 @@ class KTFolderAction extends KTStandardDispatcher {
         if (PEAR::isError($oPermission)) {
             return true;
         }
-        return KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder);
+        return (KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder) || (($this->_adminAlwaysAvailable) && (Permission::userIsSystemAdministrator($this->oUser->getId()))));
     }
  
     function _disable() {
@@ -115,7 +117,7 @@ class KTFolderAction extends KTStandardDispatcher {
         if (!is_null($this->_sShowPermission)) {
             $oPermission =& KTPermission::getByName($this->_sShowPermission);
             if (!PEAR::isError($oPermission)) {
-                $res = KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder);
+                $res = (KTPermissionUtil::userHasPermissionOnItem($this->oUser, $oPermission, $this->oFolder) || (($this->_adminAlwaysAvailable) && (Permission::userIsSystemAdministrator($this->oUser->getId()))));
                 if (!$res) {
                     return false;
                 }
@@ -14,6 +14,10 @@
  
 require_once(KT_LIB_DIR . "/database/dbutil.inc");
 require_once(KT_LIB_DIR . '/users/User.inc');
+
+require_once(KT_LIB_DIR . '/workflow/workflowutil.inc.php');
+
+
 class BrowseColumn {
     var $label = null;
     var $sort_on = false;
@@ -252,4 +256,35 @@ class SelectionColumn extends BrowseColumn {
     }
 }
  
+
+class WorkflowColumn extends BrowseColumn {
+
+    function renderHeader($sReturnURL) {         
+        $text = $this->label; 
+        $href = $sReturnURL . "&sort_on=" . $this->name . "&sort_order=";
+        $href .= $this->sort_direction == "asc" ? "desc" : "asc" ;
+        
+        return '<a href="' . $href . '">'.$text.'</a>';
+    }
+    
+    // use inline, since its just too heavy to even _think_ about using smarty.
+    function renderData($aDataRow) { 
+        $localname = $this->name;
+
+        
+        // only _ever_ show this folder documents.
+        if ($aDataRow["type"] === "folder") { 
+            return '&nbsp;';
+        }
+        
+        $oWorkflow = KTWorkflowUtil::getWorkflowForDocument($aDataRow['document']);
+        $oState = KTWorkflowUtil::getWorkflowStateForDocument($aDataRow['document']);
+        if (($oState == null) || ($oWorkflow == null)) {
+            return '&mdash;';
+        } else {
+            return $oState->getName() . ' <span class="descriptiveText">(' . $oWorkflow->getName() . ')</span>';
+        }
+    }
+}
+
 ?>
@@ -311,8 +311,9 @@ class KTDispatcherValidation {
         $aNewOptions = $aOptions;
         $aNewOptions['message'] = KTUtil::arrayGet($aOptions, 'message', _("No name was given for the $sHumanEntityTypeName"));
  
+        // FIXME BD:  don't you mean $sName = $this->validateString ...
         $this->validateString($sName, $aNewOptions);
-        $this->validateDuplicateName($sEntityTypeName, $sHumanEntityTypeName, $sName, $aOptions);
+        return $this->validateDuplicateName($sEntityTypeName, $sHumanEntityTypeName, $sName, $aOptions);
     }
  
  
@@ -275,7 +275,7 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay {
     function renderEdit($document_data) {
         global $main; // FIXME remove direct access to $main
         $oField = new KTBaseWidget("Document Title",
-            _("The document title is used as the main name of a document through the KnowledgeTree."),
+            _("The document title is used as the main name of a document throughout KnowledgeTree&trade;."),
             "generic_title", $document_data["document"]->getName(), $main, true, null, array());
         $aFields = array($oField); // its the only one editable from the basic set (currently).
  
@@ -285,7 +285,7 @@ class GenericFieldsetDisplay extends KTFieldsetDisplay {
             "context" => $this,
             "fields" => $aFields,
             "title" => "Generic Document Information",
-            "description" => _("The information in this section is stored by the KnowledgeTree&trade; for every document."),
+            "description" => _("The information in this section is stored by KnowledgeTree&trade; for every document."),
         );
         return $oTemplate->render($aTemplateData);
     }
@@ -58,6 +58,7 @@ class KTFolderPermissionsAction extends KTFolderAction {
     var $sName = 'ktcore.actions.folder.permissions';
  
     var $_sShowPermission = "ktcore.permissions.write";
+    var $_adminAlwaysAvailable = true;
     var $bAutomaticTransaction = true;
  
     function do_main() {
@@ -155,6 +155,10 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
  
     // {{{ do_newfield
     function do_newfield() {
+        $aErrorOptions = array(
+			'redirect_to' => array('edit','fFieldsetId=' . $_REQUEST['fFieldsetId']),
+		);	
+	
         $is_lookup = false;
         $is_tree = false;
         if ($_REQUEST['type'] === "lookup") {
@@ -164,11 +168,18 @@ class KTDocumentFieldDispatcher extends KTStandardDispatcher {
             $is_lookup = true;
             $is_tree = true;
         }
+		
+		$sName = $this->oValidator->validateEntityName("DocumentField", "field", KTUtil::arrayGet($_REQUEST, 'name'), $aErrorOptions);
+		
+		$sDescription = $this->oValidator->validateString(KTUtil::arrayGet($_REQUEST, 'description'), 
+			KTUtil::meldOptions($aErrorOptions, array('message' => "You must provide a description")));
+		
+		
         $oFieldset = KTFieldset::get($_REQUEST['fFieldsetId']);
         $oField =& DocumentField::createFromArray(array(
             'name' => $_REQUEST['name'],
             'datatype' => 'STRING',
-	    'description' => $_REQUEST['description'],
+	        'description' => $sDescription,
             'haslookup' => $is_lookup,
             'haslookuptree' => $is_tree,
             'parentfieldset' => $oFieldset->getId(),
@@ -63,7 +63,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
  
  
         $add_fields = array();
-        $add_fields[] =  new KTStringWidget(_('Username'),_('The username the user will enter to gain access to the KnowledgeTree.  e.g. <strong>jsmith</strong>'), 'username', null, $this->oPage, true, null, null, $aOptions);
+        $add_fields[] =  new KTStringWidget(_('Username'),_('The username the user will enter to gain access to KnowledgeTree.  e.g. <strong>jsmith</strong>'), 'username', null, $this->oPage, true, null, null, $aOptions);
         $add_fields[] =  new KTStringWidget(_('Name'),_('The full name of the user.  This is shown in reports and listings.  e.g. <strong>John Smith</strong>'), 'name', null, $this->oPage, true, null, null, $aOptions);        
         $add_fields[] =  new KTStringWidget(_('Email Address'), _('The email address of the user.  Notifications and alerts are mailed to this address if <strong>email notifications</strong> is set below. e.g. <strong>jsmith@acme.com</strong>'), 'email_address', null, $this->oPage, false, null, null, $aOptions);        
         $add_fields[] =  new KTCheckboxWidget(_('Email Notifications'), _("If this is specified then the user will have notifications sent to the email address entered above.  If it isn't set, then the user will only see notifications on the <strong>Dashboard</strong>"), 'email_notifications', true, $this->oPage, false, null, null, $aOptions);        
@@ -117,7 +117,7 @@ class KTUserAdminDispatcher extends KTAdminDispatcher {
         $this->aBreadcrumbs[] = array('name' => $oUser->getName());
  
         $edit_fields = array();
-        $edit_fields[] =  new KTStringWidget(_('Username'),_('The username the user will enter to gain access to the KnowledgeTree.  e.g. <strong>jsmith</strong>'), 'username', $oUser->getUsername(), $this->oPage, true);
+        $edit_fields[] =  new KTStringWidget(_('Username'),_('The username the user will enter to gain access to KnowledgeTree.  e.g. <strong>jsmith</strong>'), 'username', $oUser->getUsername(), $this->oPage, true);
         $edit_fields[] =  new KTStringWidget(_('Name'), _('The full name of the user.  This is shown in reports and listings.  e.g. <strong>John Smith</strong>'), 'name', $oUser->getName(), $this->oPage, true);        
         $edit_fields[] =  new KTStringWidget(_('Email Address'),_('The email address of the user.  Notifications and alerts are mailed to this address if <strong>email notifications</strong> is set below. e.g. <strong>jsmith@acme.com</strong>'), 'email_address', $oUser->getEmail(), $this->oPage, false);        
         $edit_fields[] =  new KTCheckboxWidget(_('Email Notifications'), _('If this is specified then the user will have notifications sent to the email address entered above.  If it is not set, then the user will only see notifications on the <strong>Dashboard</strong>'), 'email_notifications', $oUser->getEmailNotification(), $this->oPage, false);        
@@ -41,7 +41,7 @@ class KTFolderAddDocumentAction extends KTFolderAction {
         $oTemplate =& $this->oValidator->validateTemplate('ktcore/document/add');
         $add_fields = array();
         $add_fields[] = new KTFileUploadWidget(_('File'), _('The contents of the document to be added to the document management system.'), 'file', "", $this->oPage, true);
-        $add_fields[] = new KTStringWidget(_('Title'), _('The document title is used as the main name of a document through the KnowledgeTree.'), 'title', "", $this->oPage, true);
+        $add_fields[] = new KTStringWidget(_('Title'), _('The document title is used as the main name of a document throughout KnowledgeTree.'), 'title', "", $this->oPage, true);
  
  
         $aVocab = array();
@@ -137,7 +137,7 @@ class KTLDAPAuthenticationProvider extends KTAuthenticationProvider {
  
         $fields = array();
         $fields[] =  new KTStaticTextWidget(_('LDAP DN'), _('The location of the user within the LDAP directory.'), 'dn', $aResults[$aAttributes[0]], $this->oPage);
-        $fields[] =  new KTStringWidget(_('Username'), _('The username the user will enter to gain access to the KnowledgeTree.  e.g. <strong>jsmith</strong>'), 'ldap_username', $aResults[$aAttributes[1]], $this->oPage, true);
+        $fields[] =  new KTStringWidget(_('Username'), _('The username the user will enter to gain access to KnowledgeTree.  e.g. <strong>jsmith</strong>'), 'ldap_username', $aResults[$aAttributes[1]], $this->oPage, true);
         $fields[] =  new KTStringWidget(_('Name'), _('The full name of the user.  This is shown in reports and listings.  e.g. <strong>John Smith</strong>'), 'name', join(" ", array($aResults[$aAttributes[2]], $aResults[$aAttributes[3]])), $this->oPage, true);
         $fields[] =  new KTStringWidget(_('Email Address'), _('The email address of the user.  Notifications and alerts are mailed to this address if <strong>email notifications</strong> is set below. e.g. <strong>jsmith@acme.com</strong>'), 'email_address', $aResults[$aAttributes[4]], $this->oPage, false);
         $fields[] =  new KTCheckboxWidget(_('Email Notifications'), _('If this is specified then the user will have notifications sent to the email address entered above.  If it is not set, then the user will only see notifications on the <strong>Dashboard</strong>'), 'email_notifications', true, $this->oPage, false);
@@ -10,6 +10,7 @@
     padding-left: 25px;
     padding-top: 5px;
     padding-bottom: 5px;
+    margin-right: 25px;
 }
  
 .contenttype.ms-presentation { background-image: url(../../resources/mimetypes/powerp.gif); }
@@ -432,6 +432,7 @@ a.main_nav_item {
 }
  
 .metadata.versioned dd div {
+    
     padding: 0.2em 0.5em;
     border-style: solid;
     border-color: #ccc;
@@ -507,11 +508,13 @@ a.main_nav_item {
 .kt_collection
 {
     width: 100%;
+    white-space: nowrap !important;
 }
  
 .kt_collection thead th {
     border-bottom: 1px solid #888;
     text-align: left;
+    white-space: nowrap !important;
 }
  
 .kt_collection th.sort_on.sort_asc {
@@ -531,6 +534,8 @@ a.main_nav_item {
 .kt_collection th,
 .kt_collection td {
     padding: 0.25em 0.5em;
+    white-space: nowrap !important;
+    overflow: hidden;
 }
  
 .kt_collection td.sort_on {
+function toggleSelectFor(source, nameprefix) {
+    var content = getElement('content');
+    
+    var state = source.checked;
+    
+    // now:  find other items like the stated one (IN id=content)
+    var inputs = content.getElementsByTagName('INPUT');
+    for (var i=0; i<inputs.length; i++) {
+        var c = inputs[i];
+        var n = c.name;
+        if (c.type == 'checkbox') {
+            if ((n.length >= nameprefix.length) && (nameprefix == n.substring(0,nameprefix.length))) {
+                c.checked = state;
+            }
+        }
+    }
+}
@@ -25,7 +25,7 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
     }
  
    function do_main() {
-        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _("Boolean search"));
+        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _("Advanced Search"));
         $this->oPage->setBreadcrumbDetails(_('defining search'));
         $oTemplating = new KTTemplating;
         $oTemplate = $oTemplating->loadTemplate("ktcore/boolean_search");
@@ -40,7 +40,7 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
     }
  
     function do_performSearch() {
-        $title = _('Advanced Search Results');
+        $title = null;
         $datavars = KTUtil::arrayGet($_REQUEST, 'boolean_search');
         if (!is_array($datavars)) {
             $datavars = unserialize($datavars);
@@ -53,7 +53,7 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
         if (!empty($iSavedSearchId)) {
             $oSearch = KTSavedSearch::get($iSavedSearchId);
             $datavars = $oSearch->getSearch();
-            $title = _('Saved Search: ') . $oSearch->getName();
+            $title = $oSearch->getName();
         }
  
         if (empty($datavars)) {
@@ -66,12 +66,16 @@ class BooleanSearchDispatcher extends KTStandardDispatcher {
     }
  
     function handleCriteriaSet($aCriteriaSet, $iStartIndex, $sTitle=null) {
-        $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _("Boolean search"));
+        
         if ($sTitle == null) {
-            $this->oPage->setBreadcrumbDetails(_('searching'));
+            $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Advanced Search'));
+            $sTitle =  _('Search Results');
         } else {
-            $this->oPage->setBreadcrumbDetails($sTitle);
+           $this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Saved Search'));
+            $this->oPage->setTitle(_('Saved Search: ') . $sTitle);
         }
+        $this->oPage->setBreadcrumbDetails($sTitle);
+        
         $collection = new DocumentCollection;
         $this->browseType = "Folder";
  
+<h2>{i18n}Delete Files and Folders{/i18n}</h2>
+
+<form action="{$smarty.server.PHP_SELF}" method="POST">
+<fieldset>
+<legend>{i18n}Specify Reason for Delete{/i18n}</legend>
+<p class="descriptiveText">{i18n}Please give a reason for deleting these files.  This 
+will be recorded in the documents' "Transaction History"{/i18n}</p>
+<input type="hidden" name="action" value="doDelete" />
+
+{* Include the document/folder ids *}
+
+{foreach item=iDocId from=$documents}
+<input type="hidden" name="selection_d[]" value="{$iDocId}" />
+{/foreach}
+
+{foreach item=iFolderId from=$folders}
+<input type="hidden" name="selection_f[]" value="{$iFolderId}" />
+{/foreach}
+
+{foreach item=oWidget from=$form_fields}
+{$oWidget->render()}
+{/foreach}
+
+<div class="form_actions">
+    <input type="submit" value="Delete" />
+</div>
+
+</fieldset>
+</form>
 \ No newline at end of file