Merge branch 'edge' of github.com:ktgit/knowledgetree into edge

Mark Holtzhausen
2 parents d00003d8 16c973ec
Showing 4 changed files with 8 additions and 50 deletions
plugins/ktcore/KTBulkActions.php
plugins/ktcore/admin/workflowsv2.php
plugins/multiselect/templates/ktcore/search2/adv_query_builder.smarty
templates/ktcore/search2/adv_query_builder.smarty
@@ -259,16 +259,9 @@ class KTBulkDeleteAction extends KTBulkAction {
         return parent::do_performaction();
     }
  
-     /*
+     /**
       * Bulk delete
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
-      *
-      * Description :   Since its a bulk operation, the delete function needs to
-      *                 know that. Added extra boolean param to the delete
-      *                 function.
       */
     function perform_action($oEntity) {
         $sReason = $this->res['reason'];
@@ -526,16 +519,10 @@ class KTBulkMoveAction extends KTBulkAction {
         return parent::do_performaction();
     }
  
-     /*
+     /**
       * Bulk move
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
       *
-      * Description :   Since its a bulk operation, the move function needs to
-      *                 know that. Added extra boolean param to the move
-      *                 function.
       */
     function perform_action($oEntity) {
         if(is_a($oEntity, 'Document')) {
@@ -771,16 +758,10 @@ class KTBulkCopyAction extends KTBulkAction {
         return parent::do_performaction();
     }
  
-     /*
+     /**
       * Bulk copy
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
-      *
-      * Description :   Since its a bulk operation, the copy function needs to
-      *                 know that. Added extra boolean param to the copy
-      *                 function.
+	  *
       */
     function perform_action($oEntity) {
         if(is_a($oEntity, 'Document')) {
@@ -1029,16 +1010,10 @@ class KTBulkArchiveAction extends KTBulkAction {
         return parent::do_performaction();
     }
  
-     /*
+     /**
       * Bulk archive
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
       *
-      * Description :   Since its a bulk operation, the archive function needs
-      *                 to know that. Added extra boolean param to the archive
-      *                 function.
       */
     function perform_action($oEntity) {
         if(is_a($oEntity, 'Document')) {
@@ -1216,16 +1191,10 @@ class KTBrowseBulkExportAction extends KTBulkAction {
         return $str;
     }
  
-     /*
+     /**
       * Bulk export
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
       *
-      * Description :   Since its a bulk operation, the export function needs
-      *                 to know that. Added extra boolean param to the export
-      *                 function.
       */
     function perform_action($oEntity) {
 // TODO find a way to do bulk email
@@ -1489,16 +1458,10 @@ class KTBrowseBulkCheckoutAction extends KTBulkAction {
         return $result;
     }
  
-     /*
+     /**
       * Bulk checkout
-      * Author      :   Jarrett Jordaan
-      * Modified    :   28/04/09
-      *
       * @params     :   KTDocumentUtil/KTFolderUtil $oEntity
       *
-      * Description :   Since its a bulk operation, the checkout function needs
-      *                 to know that. Added extra boolean param to the checkout
-      *                 function.
       */
     function perform_action($oEntity) {
         // checkout document
@@ -2365,8 +2365,7 @@ class KTWorkflowAdminV2 extends KTAdminDispatcher {
  
     	if (!empty($sFilter)) {
     	    $allowed = array();
-            // Modified Jarrett Jordaan Only notify enabled users
-    	    $q = sprintf('name like "%%%s%%" AND disabled = 0', DBUtil::escapeSimple($sFilter));
+    	    $q = sprintf('name like "%%%s%%" AND disabled = 0', DBUtil::escapeSimple($sFilter)); // notify enabled users
     	    $aUsers = User::getList($q);
     	    $q = sprintf('name like "%%%s%%"', DBUtil::escapeSimple($sFilter));
         	$aGroups = Group::getList($q);
@@ -519,8 +519,6 @@ function addFieldTypeSelection(groupid, fid, type, options)
 		default:
 			html += 'unknown: ' + type;
 	}
-    // Jarrett Jordaan
-    // Closing tags added
     html += "</nobr></td>";
  
 	return {html: html, init: callback};
@@ -472,8 +472,6 @@ function addFieldTypeSelection(groupid, fid, type, options)
 		default:
 			html += 'unknown: ' + type;
 	}
-    // Jarrett Jordaan
-    // Closing tags added
     html += "</nobr></td>";
  
 	return {html: html, init: callback};