mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-31 13:18:06 +00:00 
			
		
		
		
	allow to set receiver when uploading a document
This commit is contained in:
		
							parent
							
								
									d547fdd05b
								
							
						
					
					
						commit
						e97c3a4b25
					
				|  | @ -53,6 +53,7 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { | |||
| 		$sequence = $this->getParam('sequence'); | ||||
| 		$reviewers = $this->getParam('reviewers'); | ||||
| 		$approvers = $this->getParam('approvers'); | ||||
| 		$recipients = $this->getParam('recipients'); | ||||
| 		$reqversion = $this->getParam('reqversion'); | ||||
| 		$version_comment = $this->getParam('versioncomment'); | ||||
| 		$attributes = $this->getParam('attributes'); | ||||
|  | @ -88,6 +89,22 @@ class SeedDMS_Controller_AddDocument extends SeedDMS_Controller_Common { | |||
| 				} | ||||
| 			} | ||||
| 
 | ||||
| 			$lc = $document->getLatestContent(); | ||||
| 			if($recipients['i']) { | ||||
| 				foreach($recipients['i'] as $uid) { | ||||
| 					if($u = $dms->getUser($uid)) { | ||||
| 						$res = $lc->addIndRecipient($u, $user); | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 			if($recipients['g']) { | ||||
| 				foreach($recipients['g'] as $gid) { | ||||
| 					if($g = $dms->getGroup($gid)) { | ||||
| 						$res = $lc->addGrpRecipient($g, $user); | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 
 | ||||
| 			if($index) { | ||||
| 				$idoc = new $indexconf['IndexedDocument']($dms, $document, isset($settings->_converters['fulltext']) ? $settings->_converters['fulltext'] : null, !($filesize < $settings->_maxSizeForFullText)); | ||||
| 				if(!$this->callHook('preIndexDocument', $document, $idoc)) { | ||||
|  |  | |||
|  | @ -50,6 +50,7 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common { | |||
| 		$userfiletype = $this->getParam('userfiletype'); | ||||
| 		$reviewers = $this->getParam('reviewers'); | ||||
| 		$approvers = $this->getParam('approvers'); | ||||
| 		$recipients = $this->getParam('recipients'); | ||||
| 		$reqversion = $this->getParam('reqversion'); | ||||
| 		$comment = $this->getParam('comment'); | ||||
| 		$attributes = $this->getParam('attributes'); | ||||
|  | @ -68,6 +69,21 @@ class SeedDMS_Controller_UpdateDocument extends SeedDMS_Controller_Common { | |||
| 				} | ||||
| 			} | ||||
| 
 | ||||
| 			if($recipients['i']) { | ||||
| 				foreach($recipients['i'] as $uid) { | ||||
| 					if($u = $dms->getUser($uid)) { | ||||
| 						$res = $contentResult->getContent()->addIndRecipient($u, $user); | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 			if($recipients['g']) { | ||||
| 				foreach($recipients['g'] as $gid) { | ||||
| 					if($g = $dms->getGroup($gid)) { | ||||
| 						$res = $contentResult->getContent()->addGrpRecipient($g, $user); | ||||
| 					} | ||||
| 				} | ||||
| 			} | ||||
| 
 | ||||
| 			if($index) { | ||||
| 				$lucenesearch = new $indexconf['Search']($index); | ||||
| 				if($hit = $lucenesearch->getDocument((int) $document->getId())) { | ||||
|  |  | |||
|  | @ -145,12 +145,16 @@ class Settings { /* {{{ */ | |||
| 	var $_enableSelfRevApp = false; | ||||
| 	// enable/disable update of a review/approval by the reviewer/approver
 | ||||
| 	var $_enableUpdateRevApp = false; | ||||
| 	// enable/disable listing logged in user as recipient
 | ||||
| 	var $_enableSelfReceipt = false; | ||||
| 	// enable/disable update of a receipt by the recipient
 | ||||
| 	var $_enableUpdateReceipt = false; | ||||
| 	// enable/disable listing administrator as recipient
 | ||||
| 	var $_enableAdminReceipt = false; | ||||
| 	// enable/disable listing owner as recipient
 | ||||
| 	var $_enableOwnerReceipt = false; | ||||
| 	// enable/disable filter for receipt by the recipient
 | ||||
| 	var $_enableFilterReceipt = false; | ||||
| 	// enable/disable default notification for owner
 | ||||
| 	var $_enableOwnerNotification = false; | ||||
| 	// enable/disable deleting of versions for regular users
 | ||||
|  | @ -629,9 +633,11 @@ class Settings { /* {{{ */ | |||
| 		$this->_enableOwnerRevApp = Settings::boolval($tab["enableOwnerRevApp"]); | ||||
| 		$this->_enableSelfRevApp = Settings::boolval($tab["enableSelfRevApp"]); | ||||
| 		$this->_enableUpdateRevApp = Settings::boolval($tab["enableUpdateRevApp"]); | ||||
| 		$this->_enableSelfReceipt = Settings::boolval($tab["enableSelfReceipt"]); | ||||
| 		$this->_enableAdminReceipt = Settings::boolval($tab["enableAdminReceipt"]); | ||||
| 		$this->_enableOwnerReceipt = Settings::boolval($tab["enableOwnerReceipt"]); | ||||
| 		$this->_enableUpdateReceipt = Settings::boolval($tab["enableUpdateReceipt"]); | ||||
| 		$this->_enableFilterReceipt = Settings::boolval($tab["enableFilterReceipt"]); | ||||
| 		$this->_presetExpirationDate = strval($tab["presetExpirationDate"]); | ||||
| 		$this->_initialDocumentStatus = intval($tab["initialDocumentStatus"]); | ||||
| 		$this->_versioningFileName = strval($tab["versioningFileName"]); | ||||
|  | @ -941,9 +947,11 @@ class Settings { /* {{{ */ | |||
|     $this->setXMLAttributValue($node, "enableOwnerRevApp", $this->_enableOwnerRevApp); | ||||
|     $this->setXMLAttributValue($node, "enableSelfRevApp", $this->_enableSelfRevApp); | ||||
|     $this->setXMLAttributValue($node, "enableUpdateRevApp", $this->_enableUpdateRevApp); | ||||
|     $this->setXMLAttributValue($node, "enableSelfReceipt", $this->_enableSelfReceipt); | ||||
|     $this->setXMLAttributValue($node, "enableAdminReceipt", $this->_enableAdminReceipt); | ||||
|     $this->setXMLAttributValue($node, "enableOwnerReceipt", $this->_enableOwnerReceipt); | ||||
|     $this->setXMLAttributValue($node, "enableUpdateReceipt", $this->_enableUpdateReceipt); | ||||
|     $this->setXMLAttributValue($node, "enableFilterReceipt", $this->_enableFilterReceipt); | ||||
|     $this->setXMLAttributValue($node, "presetExpirationDate", $this->_presetExpirationDate); | ||||
|     $this->setXMLAttributValue($node, "initialDocumentStatus", $this->_initialDocumentStatus); | ||||
|     $this->setXMLAttributValue($node, "versioningFileName", $this->_versioningFileName); | ||||
|  |  | |||
|  | @ -62,7 +62,8 @@ if($settings->_quota > 0) { | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| if($user->isAdmin()) { | ||||
| $accessop = new SeedDMS_AccessOperation($dms, $user, $settings); | ||||
| if ($accessop->check_controller_access($controller, array('action'=>'setOwner'))) { | ||||
| 	$ownerid = (int) $_POST["ownerid"]; | ||||
| 	if($ownerid) { | ||||
| 		if(!($owner = $dms->getUser($ownerid))) { | ||||
|  | @ -157,10 +158,13 @@ default: | |||
| // Get the list of reviewers and approvers for this document.
 | ||||
| $reviewers = array(); | ||||
| $approvers = array(); | ||||
| $recipients = array(); | ||||
| $reviewers["i"] = array(); | ||||
| $reviewers["g"] = array(); | ||||
| $approvers["i"] = array(); | ||||
| $approvers["g"] = array(); | ||||
| $recipients["i"] = array(); | ||||
| $recipients["g"] = array(); | ||||
| $workflow = null; | ||||
| 
 | ||||
| if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') { | ||||
|  | @ -269,6 +273,31 @@ if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'tra | |||
| 	} | ||||
| } | ||||
| 
 | ||||
| // Retrieve the list of individual recipients from the form.
 | ||||
| $recipients["i"] = array(); | ||||
| if (isset($_POST["indRecipients"])) { | ||||
| 	foreach ($_POST["indRecipients"] as $ind) { | ||||
| 		$recipients["i"][] = $ind; | ||||
| 	} | ||||
| } | ||||
| // Retrieve the list of recipient groups from the form.
 | ||||
| $recipients["g"] = array(); | ||||
| if (isset($_POST["grpRecipients"])) { | ||||
| 	foreach ($_POST["grpRecipients"] as $grp) { | ||||
| 		$recipients["g"][] = $grp; | ||||
| 	} | ||||
| } | ||||
| // Retrieve the list of recipient groups whose members become individual recipients
 | ||||
| if (isset($_POST["grpIndRecipients"])) { | ||||
| 	foreach ($_POST["grpIndRecipients"] as $grp) { | ||||
| 		if($group = $dms->getGroup($grp)) { | ||||
| 			$members = $group->getUsers(); | ||||
| 			foreach($members as $member) | ||||
| 				$recipients["i"][] = $member->getID(); | ||||
| 		} | ||||
| 	} | ||||
| } | ||||
| 
 | ||||
| $docsource = 'upload'; | ||||
| 
 | ||||
| if($settings->_dropFolderDir) { | ||||
|  | @ -410,6 +439,7 @@ for ($file_num=0;$file_num<count($_FILES["userfile"]["tmp_name"]);$file_num++){ | |||
| 	$controller->setParam('sequence', $sequence); | ||||
| 	$controller->setParam('reviewers', $reviewers); | ||||
| 	$controller->setParam('approvers', $approvers); | ||||
| 	$controller->setParam('recipients', $recipients); | ||||
| 	$controller->setParam('reqversion', $reqversion); | ||||
| 	$controller->setParam('versioncomment', $version_comment); | ||||
| 	$controller->setParam('attributes', $attributes); | ||||
|  |  | |||
|  | @ -65,10 +65,13 @@ else | |||
| 	// Get the list of reviewers and approvers for this document.
 | ||||
| 	$reviewers = array(); | ||||
| 	$approvers = array(); | ||||
| 	$recipients = array(); | ||||
| 	$reviewers["i"] = array(); | ||||
| 	$reviewers["g"] = array(); | ||||
| 	$approvers["i"] = array(); | ||||
| 	$approvers["g"] = array(); | ||||
| 	$recipients["i"] = array(); | ||||
| 	$recipients["g"] = array(); | ||||
| 	$workflow = null; | ||||
| 
 | ||||
| 	if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') { | ||||
|  | @ -173,6 +176,31 @@ else | |||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	// Retrieve the list of individual recipients from the form.
 | ||||
| 	$recipients["i"] = array(); | ||||
| 	if (isset($_POST["indRecipients"])) { | ||||
| 		foreach ($_POST["indRecipients"] as $ind) { | ||||
| 			$recipients["i"][] = $ind; | ||||
| 		} | ||||
| 	} | ||||
| 	// Retrieve the list of recipient groups from the form.
 | ||||
| 	$recipients["g"] = array(); | ||||
| 	if (isset($_POST["grpRecipients"])) { | ||||
| 		foreach ($_POST["grpRecipients"] as $grp) { | ||||
| 			$recipients["g"][] = $grp; | ||||
| 		} | ||||
| 	} | ||||
| 	// Retrieve the list of recipient groups whose members become individual recipients
 | ||||
| 	if (isset($_POST["grpIndRecipients"])) { | ||||
| 		foreach ($_POST["grpIndRecipients"] as $grp) { | ||||
| 			if($group = $dms->getGroup($grp)) { | ||||
| 				$members = $group->getUsers(); | ||||
| 				foreach($members as $member) | ||||
| 					$recipients["i"][] = $member->getID(); | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	if(isset($_POST["attributes"]) && $_POST["attributes"]) { | ||||
| 		$attributes = $_POST["attributes"]; | ||||
| 		foreach($attributes as $attrdefid=>$attribute) { | ||||
|  | @ -316,6 +344,21 @@ else | |||
| 			} | ||||
| 		} | ||||
| 
 | ||||
| 		if($recipients['i']) { | ||||
| 			foreach($recipients['i'] as $uid) { | ||||
| 				if($u = $dms->getUser($uid)) { | ||||
| 					$res = $contentResult->getContent()->addIndRecipient($u, $user); | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 		if($recipients['g']) { | ||||
| 			foreach($recipients['g'] as $gid) { | ||||
| 				if($g = $dms->getGroup($gid)) { | ||||
| 					$res = $contentResult->getContent()->addGrpRecipient($g, $user); | ||||
| 				} | ||||
| 			} | ||||
| 		} | ||||
| 
 | ||||
| 		$expires = false; | ||||
| 		if (!isset($_POST['expires']) || $_POST["expires"] != "false") { | ||||
| 			if($_POST["expdate"]) { | ||||
|  |  | |||
|  | @ -182,10 +182,12 @@ if ($action == "saveSettings") | |||
|   $settings->_enableAdminRevApp = getBoolValue("enableAdminRevApp"); | ||||
|   $settings->_enableOwnerRevApp = getBoolValue("enableOwnerRevApp"); | ||||
|   $settings->_enableSelfRevApp = getBoolValue("enableSelfRevApp"); | ||||
|   $settings->_enableSelfReceipt = getBoolValue("enableSelfReceipt"); | ||||
|   $settings->_enableUpdateRevApp = getBoolValue("enableUpdateRevApp"); | ||||
|   $settings->_enableAdminReceipt = getBoolValue("enableAdminReceipt"); | ||||
|   $settings->_enableOwnerReceipt = getBoolValue("enableOwnerReceipt"); | ||||
|   $settings->_enableUpdateReceipt = getBoolValue("enableUpdateReceipt"); | ||||
|   $settings->_enableFilterReceipt = getBoolValue("enableFilterReceipt"); | ||||
|   $settings->_enableVersionDeletion = getBoolValue("enableVersionDeletion"); | ||||
|   $settings->_enableVersionModification = getBoolValue("enableVersionModification"); | ||||
|   $settings->_enableDuplicateDocNames = getBoolValue("enableDuplicateDocNames"); | ||||
|  |  | |||
|  | @ -169,10 +169,13 @@ default: | |||
| 	// Get the list of reviewers and approvers for this document.
 | ||||
| 	$reviewers = array(); | ||||
| 	$approvers = array(); | ||||
| 	$recipients = array(); | ||||
| 	$reviewers["i"] = array(); | ||||
| 	$reviewers["g"] = array(); | ||||
| 	$approvers["i"] = array(); | ||||
| 	$approvers["g"] = array(); | ||||
| 	$recipients["i"] = array(); | ||||
| 	$recipients["g"] = array(); | ||||
| 	$workflow = null; | ||||
| 
 | ||||
| 	if($settings->_workflowMode == 'traditional' || $settings->_workflowMode == 'traditional_only_approval') { | ||||
|  | @ -285,6 +288,31 @@ default: | |||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	// Retrieve the list of individual recipients from the form.
 | ||||
| 	$recipients["i"] = array(); | ||||
| 	if (isset($_POST["indRecipients"])) { | ||||
| 		foreach ($_POST["indRecipients"] as $ind) { | ||||
| 			$recipients["i"][] = $ind; | ||||
| 		} | ||||
| 	} | ||||
| 	// Retrieve the list of recipient groups from the form.
 | ||||
| 	$recipients["g"] = array(); | ||||
| 	if (isset($_POST["grpRecipients"])) { | ||||
| 		foreach ($_POST["grpRecipients"] as $grp) { | ||||
| 			$recipients["g"][] = $grp; | ||||
| 		} | ||||
| 	} | ||||
| 	// Retrieve the list of recipient groups whose members become individual recipients
 | ||||
| 	if (isset($_POST["grpIndRecipients"])) { | ||||
| 		foreach ($_POST["grpIndRecipients"] as $grp) { | ||||
| 			if($group = $dms->getGroup($grp)) { | ||||
| 				$members = $group->getUsers(); | ||||
| 				foreach($members as $member) | ||||
| 					$recipients["i"][] = $member->getID(); | ||||
| 			} | ||||
| 		} | ||||
| 	} | ||||
| 
 | ||||
| 	if(isset($_POST["attributes_version"]) && $_POST["attributes_version"]) { | ||||
| 		$attributes = $_POST["attributes_version"]; | ||||
| 		foreach($attributes as $attrdefid=>$attribute) { | ||||
|  | @ -315,6 +343,7 @@ default: | |||
| 	$controller->setParam('userfiletype', $userfiletype); | ||||
| 	$controller->setParam('reviewers', $reviewers); | ||||
| 	$controller->setParam('approvers', $approvers); | ||||
| 	$controller->setParam('recipients', $recipients); | ||||
| 	$controller->setParam('attributes', $attributes); | ||||
| 	$controller->setParam('workflow', $workflow); | ||||
| 	$controller->setParam('initialdocumentstatus', $settings->_initialDocumentStatus); | ||||
|  |  | |||
|  | @ -72,6 +72,7 @@ if($view) { | |||
| 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); | ||||
| 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); | ||||
| 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp); | ||||
| 	$view->setParam('enableselfrec', $settings->_enableSelfReceipt); | ||||
| 	$view->setParam('dropfolderdir', $settings->_dropFolderDir); | ||||
| 	$view->setParam('workflowmode', $settings->_workflowMode); | ||||
| 	$view->setParam('presetexpiration', $settings->_presetExpirationDate); | ||||
|  |  | |||
|  | @ -71,6 +71,7 @@ if($view) { | |||
| 	$view->setParam('enableadminrevapp', $settings->_enableAdminRevApp); | ||||
| 	$view->setParam('enableownerrevapp', $settings->_enableOwnerRevApp); | ||||
| 	$view->setParam('enableselfrevapp', $settings->_enableSelfRevApp); | ||||
| 	$view->setParam('enableselfreceipt', $settings->_enableSelfReceipt); | ||||
| 	$view->setParam('dropfolderdir', $settings->_dropFolderDir); | ||||
| 	$view->setParam('workflowmode', $settings->_workflowMode); | ||||
| 	$view->setParam('presetexpiration', $settings->_presetExpirationDate); | ||||
|  |  | |||
|  | @ -169,6 +169,7 @@ $(document).ready(function() { | |||
| 		$sortusersinlist = $this->params['sortusersinlist']; | ||||
| 		$orderby = $this->params['orderby']; | ||||
| 		$folderid = $folder->getId(); | ||||
| 		$accessop = $this->params['accessobject']; | ||||
| 
 | ||||
| 		$this->htmlAddHeader('<script type="text/javascript" src="../styles/'.$this->theme.'/validate/jquery.validate.js"></script>'."\n", 'js'); | ||||
| 		if($enablelargefileupload) { | ||||
|  | @ -261,7 +262,8 @@ $(document).ready(function() { | |||
| 			</td> | ||||
| 		</tr> | ||||
| 
 | ||||
| <?php if($user->isAdmin()) { ?>
 | ||||
| <?php //if($user->isAdmin()) { ?>
 | ||||
| <?php if ($accessop->check_controller_access('AddDocument', array('action'=>'setOwner'))) { ?>
 | ||||
| 		<tr> | ||||
| 			<td><?php printMLText("owner");?>:</td>
 | ||||
| 			<td> | ||||
|  | @ -695,6 +697,76 @@ $(document).ready(function() { | |||
| <?php | ||||
| 		} | ||||
| ?>
 | ||||
| 		<tr> | ||||
| 			<td colspan="2"> | ||||
| 				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
 | ||||
|       </td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|       <td> | ||||
| 				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
 | ||||
|       </td> | ||||
| 			<td> | ||||
|         <select id="IndRecipient" class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>"> | ||||
| <?php | ||||
| 				foreach ($docAccess["users"] as $usr) { | ||||
| 					if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue;  | ||||
| 					print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>"; | ||||
| 				} | ||||
| ?>
 | ||||
| 				</select> | ||||
| <?php | ||||
| 				$tmp = array(); | ||||
| 				foreach($receiptStatus as $r) { | ||||
| 					if($r['type'] == 0) { | ||||
| 						$tmp[] = $r['required']; | ||||
| 					} | ||||
| 				} | ||||
| 				if($tmp) { | ||||
| 					$this->printSelectPresetButtonHtml("IndRecipient", $tmp); | ||||
| 				} | ||||
| ?>
 | ||||
|       </td> | ||||
|     </tr> | ||||
|       <tr> | ||||
|         <td> | ||||
| 			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
 | ||||
|         </td> | ||||
|         <td> | ||||
|         <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>"> | ||||
| <?php | ||||
| 			foreach ($docAccess["groups"] as $grp) { | ||||
| 				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>"; | ||||
| 			} | ||||
| ?>
 | ||||
| 			</select> | ||||
| 			</td> | ||||
| 			</tr> | ||||
|     <tr> | ||||
|       <td> | ||||
| 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
 | ||||
|       </td> | ||||
|       <td> | ||||
|         <select id="GrpRecipient" class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>"> | ||||
| <?php | ||||
| 				foreach ($docAccess["groups"] as $grp) { | ||||
| 					print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>"; | ||||
| 				} | ||||
| ?>
 | ||||
| 			</select> | ||||
| <?php | ||||
| 				$tmp = array(); | ||||
| 				foreach($receiptStatus as $r) { | ||||
| 					if($r['type'] == 1) { | ||||
| 						$tmp[] = $r['required']; | ||||
| 					} | ||||
| 				} | ||||
| 				if($tmp) { | ||||
| 					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp); | ||||
| 				} | ||||
| ?>
 | ||||
|       </td> | ||||
| 		</tr> | ||||
| 		  <tr>	 | ||||
|         <td> | ||||
| 		<?php $this->contentSubHeading(getMLText("add_document_notify")); ?>
 | ||||
|  |  | |||
|  | @ -2112,7 +2112,7 @@ $(document).ready( function() { | |||
| 			} else { | ||||
| 				$content .= getOverallStatusText($status["status"]); | ||||
| 			} | ||||
| 			if($owner->getID() == $user->getID() && $receiptStatus = $latestContent->getReceiptStatus()) { | ||||
| 			if($accessop->check_view_access($this, array('action'=>'receptionBar')) /*$owner->getID() == $user->getID()*/ && $receiptStatus = $latestContent->getReceiptStatus()) { | ||||
| 				$rstat = array('-1'=>0, '0'=>0, '1'=>0, '-2'=>0); | ||||
| 				$allcomments = array('-1'=>array(), '1'=>array()); | ||||
| 				foreach ($receiptStatus as $r) { | ||||
|  |  | |||
|  | @ -82,6 +82,7 @@ $(document).ready(function() { | |||
| 		$enableadminrevapp = $this->params['enableadminrevapp']; | ||||
| 		$enableownerrevapp = $this->params['enableownerrevapp']; | ||||
| 		$enableselfrevapp = $this->params['enableselfrevapp']; | ||||
| 		$enableselfreceipt = $this->params['enableselfreceipt']; | ||||
| 		$dropfolderdir = $this->params['dropfolderdir']; | ||||
| 		$workflowmode = $this->params['workflowmode']; | ||||
| 		$presetexpiration = $this->params['presetexpiration']; | ||||
|  | @ -142,6 +143,7 @@ $(document).ready(function() { | |||
| 		$latestContent = $document->getLatestContent(); | ||||
| 		$reviewStatus = $latestContent->getReviewStatus(); | ||||
| 		$approvalStatus = $latestContent->getApprovalStatus(); | ||||
| 		$receiptStatus = $latestContent->getReceiptStatus(); | ||||
| 		if($workflowmode == 'advanced') { | ||||
| 			if($status = $latestContent->getStatus()) { | ||||
| 				if($status["status"] == S_IN_WORKFLOW) { | ||||
|  | @ -568,6 +570,76 @@ $(document).ready(function() { | |||
| <?php | ||||
| 	} | ||||
| ?>
 | ||||
| 		<tr> | ||||
| 			<td colspan="2"> | ||||
| 				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
 | ||||
|       </td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|       <td> | ||||
| 				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
 | ||||
|       </td> | ||||
| 			<td> | ||||
|         <select id="IndRecipient" class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>"> | ||||
| <?php | ||||
| 				foreach ($docAccess["users"] as $usr) { | ||||
| 					if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue;  | ||||
| 					print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>"; | ||||
| 				} | ||||
| ?>
 | ||||
| 				</select> | ||||
| <?php | ||||
| 				$tmp = array(); | ||||
| 				foreach($receiptStatus as $r) { | ||||
| 					if($r['type'] == 0) { | ||||
| 						$tmp[] = $r['required']; | ||||
| 					} | ||||
| 				} | ||||
| 				if($tmp) { | ||||
| 					$this->printSelectPresetButtonHtml("IndRecipient", $tmp); | ||||
| 				} | ||||
| ?>
 | ||||
|       </td> | ||||
|     </tr> | ||||
|       <tr> | ||||
|         <td> | ||||
| 			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
 | ||||
|         </td> | ||||
|         <td> | ||||
|         <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>"> | ||||
| <?php | ||||
| 			foreach ($docAccess["groups"] as $grp) { | ||||
| 				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>"; | ||||
| 			} | ||||
| ?>
 | ||||
| 			</select> | ||||
| 			</td> | ||||
| 			</tr> | ||||
|     <tr> | ||||
|       <td> | ||||
| 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
 | ||||
|       </td> | ||||
|       <td> | ||||
|         <select id="GrpRecipient" class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>"> | ||||
| <?php | ||||
| 				foreach ($docAccess["groups"] as $grp) { | ||||
| 					print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>"; | ||||
| 				} | ||||
| ?>
 | ||||
| 			</select> | ||||
| <?php | ||||
| 				$tmp = array(); | ||||
| 				foreach($receiptStatus as $r) { | ||||
| 					if($r['type'] == 1) { | ||||
| 						$tmp[] = $r['required']; | ||||
| 					} | ||||
| 				} | ||||
| 				if($tmp) { | ||||
| 					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp); | ||||
| 				} | ||||
| ?>
 | ||||
|       </td> | ||||
| 		</tr> | ||||
| 		<tr> | ||||
| 			<td></td> | ||||
| 			<td><input type="submit" class="btn" value="<?php printMLText("checkin_document")?>"></td> | ||||
|  |  | |||
|  | @ -703,6 +703,10 @@ if(!is_writeable($settings->_configFilePath)) { | |||
|         <td><?php printMLText("settings_enableUpdateRevApp");?>:</td>
 | ||||
|         <td><input name="enableUpdateRevApp" type="checkbox" <?php if ($settings->_enableUpdateRevApp) echo "checked" ?> /></td>
 | ||||
|       </tr> | ||||
|       <tr title="<?php printMLText("settings_enableSelfReceipt_desc");?>"> | ||||
|         <td><?php printMLText("settings_enableSelfReceipt");?>:</td>
 | ||||
|         <td><input name="enableSelfReceipt" type="checkbox" <?php if ($settings->_enableSelfReceipt) echo "checked" ?> /></td>
 | ||||
|       </tr> | ||||
|       <tr title="<?php printMLText("settings_enableAdminReceipt_desc");?>"> | ||||
|         <td><?php printMLText("settings_enableAdminReceipt");?>:</td>
 | ||||
|         <td><input name="enableAdminReceipt" type="checkbox" <?php if ($settings->_enableAdminReceipt) echo "checked" ?> /></td>
 | ||||
|  | @ -715,6 +719,10 @@ if(!is_writeable($settings->_configFilePath)) { | |||
|         <td><?php printMLText("settings_enableUpdateReceipt");?>:</td>
 | ||||
|         <td><input name="enableUpdateReceipt" type="checkbox" <?php if ($settings->_enableUpdateReceipt) echo "checked" ?> /></td>
 | ||||
|       </tr> | ||||
|       <tr title="<?php printMLText("settings_enableFilterReceipt_desc");?>"> | ||||
|         <td><?php printMLText("settings_enableFilterReceipt");?>:</td>
 | ||||
|         <td><input name="enableFilterReceipt" type="checkbox" <?php if ($settings->_enableFilterReceipt) echo "checked" ?> /></td>
 | ||||
|       </tr> | ||||
|       <tr title="<?php printMLText("settings_enableVersionDeletion_desc");?>"> | ||||
|         <td><?php printMLText("settings_enableVersionDeletion");?>:</td>
 | ||||
|         <td><input name="enableVersionDeletion" type="checkbox" <?php if ($settings->_enableVersionDeletion) echo "checked" ?> /></td>
 | ||||
|  |  | |||
|  | @ -146,6 +146,7 @@ console.log(element); | |||
| 		$enableadminrevapp = $this->params['enableadminrevapp']; | ||||
| 		$enableownerrevapp = $this->params['enableownerrevapp']; | ||||
| 		$enableselfrevapp = $this->params['enableselfrevapp']; | ||||
| 		$enableselfreceipt = $this->params['enableselfreceipt']; | ||||
| 		$dropfolderdir = $this->params['dropfolderdir']; | ||||
| 		$workflowmode = $this->params['workflowmode']; | ||||
| 		$presetexpiration = $this->params['presetexpiration']; | ||||
|  | @ -189,6 +190,7 @@ console.log(element); | |||
| 
 | ||||
| 		$latestContent = $document->getLatestContent(); | ||||
| 		$reviewStatus = $latestContent->getReviewStatus(); | ||||
| 		$receiptStatus = $latestContent->getReceiptStatus(); | ||||
| 		$approvalStatus = $latestContent->getApprovalStatus(); | ||||
| 		if($workflowmode == 'advanced') { | ||||
| 			if($status = $latestContent->getStatus()) { | ||||
|  | @ -715,6 +717,76 @@ console.log(element); | |||
| <?php | ||||
| 	} | ||||
| ?>
 | ||||
| 		<tr> | ||||
| 			<td colspan="2"> | ||||
| 				<?php $this->contentSubHeading(getMLText("assign_recipents")); ?>
 | ||||
|       </td> | ||||
|     </tr> | ||||
|     <tr> | ||||
|       <td> | ||||
| 				<div class="cbSelectTitle"><?php printMLText("individuals");?>:</div>
 | ||||
|       </td> | ||||
| 			<td> | ||||
|         <select id="IndRecipient" class="chzn-select span9" name="indRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_ind_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_owner'); ?>"> | ||||
| <?php | ||||
| 				foreach ($docAccess["users"] as $usr) { | ||||
| 					if (!$enableselfreceipt && $usr->getID()==$user->getID()) continue;  | ||||
| 					print "<option value=\"".$usr->getID()."\">". htmlspecialchars($usr->getLogin()." - ".$usr->getFullName())."</option>"; | ||||
| 				} | ||||
| ?>
 | ||||
| 				</select> | ||||
| <?php | ||||
| 				$tmp = array(); | ||||
| 				foreach($receiptStatus as $r) { | ||||
| 					if($r['type'] == 0) { | ||||
| 						$tmp[] = $r['required']; | ||||
| 					} | ||||
| 				} | ||||
| 				if($tmp) { | ||||
| 					$this->printSelectPresetButtonHtml("IndRecipient", $tmp); | ||||
| 				} | ||||
| ?>
 | ||||
|       </td> | ||||
|     </tr> | ||||
|       <tr> | ||||
|         <td> | ||||
| 			<div class="cbSelectTitle"><?php printMLText("indivіduals_in_groups");?>:</div>
 | ||||
|         </td> | ||||
|         <td> | ||||
|         <select class="chzn-select span9" name="grpIndRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_ind_recipients'); ?>"> | ||||
| <?php | ||||
| 			foreach ($docAccess["groups"] as $grp) { | ||||
| 				print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>"; | ||||
| 			} | ||||
| ?>
 | ||||
| 			</select> | ||||
| 			</td> | ||||
| 			</tr> | ||||
|     <tr> | ||||
|       <td> | ||||
| 				<div class="cbSelectTitle"><?php printMLText("groups");?>:</div>
 | ||||
|       </td> | ||||
|       <td> | ||||
|         <select id="GrpRecipient" class="chzn-select span9" name="grpRecipients[]" multiple="multiple" data-placeholder="<?php printMLText('select_grp_recipients'); ?>" data-no_results_text="<?php printMLText('unknown_group'); ?>"> | ||||
| <?php | ||||
| 				foreach ($docAccess["groups"] as $grp) { | ||||
| 					print "<option value=\"".$grp->getID()."\">".htmlspecialchars($grp->getName())."</option>"; | ||||
| 				} | ||||
| ?>
 | ||||
| 			</select> | ||||
| <?php | ||||
| 				$tmp = array(); | ||||
| 				foreach($receiptStatus as $r) { | ||||
| 					if($r['type'] == 1) { | ||||
| 						$tmp[] = $r['required']; | ||||
| 					} | ||||
| 				} | ||||
| 				if($tmp) { | ||||
| 					$this->printSelectPresetButtonHtml("GrpRecipient", $tmp); | ||||
| 				} | ||||
| ?>
 | ||||
|       </td> | ||||
| 		</tr> | ||||
| 		<tr> | ||||
| 			<td></td> | ||||
| 			<td><input type="submit" class="btn" value="<?php printMLText("update_document")?>"></td> | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann