- handle the case where no workflow actions are controlled gracefully.

- user-passwords are controlled. - make conditions editable - add copyright to VD - clean up user/group visual display. - conditional metadata was broken again - help-overview was not using correct CSS. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4602 c91229c3-7414-0410-bfa2-8a42b809f60b

- handle the case where no workflow actions are controlled gracefully.
- user-passwords are controlled. - make conditions editable - add copyright to VD - clean up user/group visual display. - conditional metadata was broken again - help-overview was not using correct CSS. git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@4602 c91229c3-7414-0410-bfa2-8a42b809f60b
bshuttle
1 parent 56270082
Showing 13 changed files with 29 additions and 24 deletions
lib/workflow/workflowutil.inc.php
plugins/ktcore/KTCorePlugin.php
plugins/ktcore/KTDocumentActions.php
plugins/ktcore/admin/ajaxSimpleConditionals.php
plugins/ktcore/admin/groupManagement.php
plugins/ktcore/admin/manageConditionals.php
plugins/ktcore/folder/addDocument.php
templates/ktcore/folder/roles.smarty
templates/ktcore/metadata/conditional/editsimple.smarty
templates/ktcore/metadata/conditional/manageConditional.smarty
templates/ktcore/principals/addgroup.smarty
templates/ktcore/principals/groupadmin.smarty
templates/ktcore/principals/useradmin.smarty
@@ -147,13 +147,15 @@ class KTWorkflowUtil {
             return $res;
         }
         $aOptions = array('noid' => true);
-        foreach ($aActions as $sAction) {
-            $res = DBUtil::autoInsert($sTable, array(
-                'workflow_id' => $iWorkflowId,
-                'action_name' => $sAction,
-            ), $aOptions);
-            if (PEAR::isError($res)) {
-                return $res;
+        if (!empty($aActions)) {
+            foreach ($aActions as $sAction) {
+                $res = DBUtil::autoInsert($sTable, array(
+                    'workflow_id' => $iWorkflowId,
+                    'action_name' => $sAction,
+                ), $aOptions);
+                if (PEAR::isError($res)) {
+                   return $res;
+                }
             }
         }
         return;
@@ -110,7 +110,7 @@ class KTCorePlugin extends KTPlugin {
             _('Archived Document Restoration'), _("Restore old (archived) documents, usually at a user's request."),
             'admin/archivedDocuments.php', null);
         $this->registerAdminPage("expunge", 'DeletedDocumentsDispatcher', 'storage',
-            _('Expunge Deleted Documents'), _('Permanently expunge deleted documents.'),
+            _('Restore or Expunge Deleted Documents'), _('Restore previously deleted documents, or permanently expunge them.'),
             'admin/deletedDocuments.php', null);
  
         // misc
@@ -626,6 +626,9 @@ class KTDocumentWorkflowAction extends KTDocumentAction {
         $oDocument =& $this->oValidator->validateDocument($_REQUEST['fDocumentId']);
         $oWorkflow =& $this->oValidator->validateWorkflow($_REQUEST['fWorkflowId']);
         $res = KTWorkflowUtil::startWorkflowOnDocument($oWorkflow, $oDocument);
+        if (PEAR::isError($res)) {
+            $this->errorRedirectToMain($res->message, sprintf('fDocumentId=%s',$oDocument->getId()));
+        }
         $this->successRedirectToMain(_('Workflow started'),
                 array('fDocumentId' => $oDocument->getId()));
         exit(0);
 <?php
-require_once("../../../../../../config/dmsDefaults.php");
+require_once("../../../config/dmsDefaults.php");
 require_once(KT_LIB_DIR . "/templating/templating.inc.php");
 require_once(KT_LIB_DIR . "/documentmanagement/DocumentField.inc");
 require_once(KT_LIB_DIR . "/database/dbutil.inc");
 require_once(KT_LIB_DIR . "/util/ktutil.inc");
 require_once(KT_LIB_DIR . "/dispatcher.inc.php");
 $sectionName = "Administration";
-require_once(KT_DIR . "/presentation/webpageTemplate.inc");
+
  
 require_once(KT_LIB_DIR . "/metadata/fieldset.inc.php");
 require_once(KT_LIB_DIR . '/metadata/fieldbehaviour.inc.php');
@@ -330,10 +330,10 @@ class KTGroupAdminDispatcher extends KTAdminDispatcher {
  
     function do_addGroup() {
 		$this->aBreadcrumbs[] = array('url' => $_SERVER['PHP_SELF'], 'name' => _('Group Management'));
-		$this->oPage->setBreadcrumbDetails(_('create new group'));
+		$this->oPage->setBreadcrumbDetails(_('Add a new group'));
  
  
-		$this->oPage->setTitle(_("Create New Group"));
+		$this->oPage->setTitle(_("Add a new group"));
  
 		$edit_fields = array();
 		$add_fields[] =  new KTStringWidget(_('Group Name'),_('A short name for the group.  e.g. <strong>administrators</strong>.'), 'group_name', null, $this->oPage, true);
 <?php
-require_once("../../../../../../config/dmsDefaults.php");
+require_once("../../../config/dmsDefaults.php");
 require_once(KT_LIB_DIR . "/templating/templating.inc.php");
 require_once(KT_LIB_DIR . "/documentmanagement/DocumentField.inc");
 require_once(KT_LIB_DIR . "/database/dbutil.inc");
@@ -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'), _('Describe the changes made to the document.'), 'title', "", $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);
  
         $aVocab = array();
         foreach (DocumentType::getList() as $oDocumentType) {
@@ -20,6 +20,7 @@ role allocations can take very long time, depending on the number of folders bel
     </tr>
 </thead>
 <tbody>
+{if (count($roles) > 0)}
 {foreach item=aRole key=role_id from=$roles}
     <tr class="{cycle values=odd,even}">
         <td>{$aRole.name}</td>
@@ -43,5 +44,8 @@ role allocations can take very long time, depending on the number of folders bel
         {/if}
     </tr>
 {/foreach}
+{else}
+<tr><td colspan="4" class="ktInfo"><p>{i18n}No roles defined in the Role Administration area.{/i18n}</p></td></tr>
+{/if}
 </tbody>
 </table>
 \ No newline at end of file
@@ -93,7 +93,7 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId}));
  
 </tr>
 </table>
-
+<!--
 <table id="brad-log">
 <tr>
     <th>Severity</th>
@@ -104,3 +104,4 @@ addLoadEvent(partial(editSimpleField, {$iMasterFieldId}));
  
 </tbody>
 </table>
+-->
 \ No newline at end of file
@@ -40,7 +40,7 @@ complex conditional{/i18n}&lt;/a&gt;
 {else}
  
 {i18n}Simple{/i18n}: <a
-href="{$config->get("urls/uiUrl")}/administration/docfieldmanagement/conditional/manageConditionals.php?action=editFieldset&fieldset_id={$oFieldset->getId()}">{i18n}Manage simple conditional{/i18n}</a>
+href="{$rootUrl}/plugins/ktcore/admin/manageConditionals.php?action=editFieldset&fieldset_id={$oFieldset->getId()}">{i18n}Manage simple conditional{/i18n}</a>
  
 <form action="{$smarty.server.PHP_SELF}" method="POST">
 <input type="hidden" name="action" value="changeToComplex" />
-<h2>{i18n}Create a new Group{/i18n}</h2>
+<h2>{i18n}Add a new group{/i18n}</h2>
  
-<p class="descriptiveText">{i18n}Create a new group.{/i18n}</p>
+<p class="descriptiveText">{i18n}Add a new group{/i18n}</p>
  
 <form action="{$smarty.server.PHP_SELF}" method="POST">
    <input type="hidden" name="action" value="createGroup" />
  
    <fieldset>
-      <legend>{i18n}Change Group Details{/i18n}</legend>
+      <legend>{i18n}Specify group details{/i18n}</legend>
       <p class="descriptiveText"><strong>FIXME</strong> brief overview of group editing.</p>
       {foreach item=oWidget from=$add_fields}
         {$oWidget->render()}
 <h2>{i18n}Group Administration{/i18n}</h2>
  
-<p class="descriptiveText"><strong>FIXME</strong> Overview of groups.</p>
-
-
 <p><a href="?action=addGroup" class="ktAction ktAddGroup" style="float: left; padding-right: 0.5em;">Add Group</a><a href="?action=addGroup">Add a new group</a>.</p>
  
 <!-- we roll both in here. -->
 <h2>User Management</h2>
  
-<p class="descriptiveText"><strong>FIXME</strong> brief overview of user management.</p>
-<div class="ktError"><p>Restrict groups that are editable based on <strong>group_id</strong> if only a unitAdmin</p></div>
  
 <!-- FIXME inline CSS is _very_ bad. -->