mirror of
				https://git.code.sf.net/p/seeddms/code
				synced 2025-10-30 20:51:22 +00:00 
			
		
		
		
	Merge branch 'seeddms-5.1.x' into seeddms-6.0.x
This commit is contained in:
		
						commit
						dc770f3c17
					
				|  | @ -41,6 +41,7 @@ class SeedDMS_View_ApprovalSummary extends SeedDMS_Bootstrap_Style { | |||
| 		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder')); | ||||
| 
 | ||||
| 		$this->printDeleteDocumentButtonJs(); | ||||
| 		$this->printClickDocumentJs(); | ||||
| 	} /* }}} */ | ||||
| 
 | ||||
| 	function show() { /* {{{ */ | ||||
|  |  | |||
|  | @ -2419,6 +2419,19 @@ $(document).ready( function() { | |||
| 		";
 | ||||
| 	} /* }}} */ | ||||
| 
 | ||||
| 	function printClickDocumentJs() { /* {{{ */ | ||||
| 		$onepage = $this->params['onepage']; | ||||
| 		if($onepage) { | ||||
| ?>
 | ||||
| /* catch click on a document row in the list folders and documents */ | ||||
| $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { | ||||
| 	attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; | ||||
| 	window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; | ||||
| }); | ||||
| <?php | ||||
| 		} | ||||
| 	} /* }}} */ | ||||
| 
 | ||||
| 	/** | ||||
| 	 * Start the row for a folder in list of documents and folders | ||||
| 	 * | ||||
|  |  | |||
|  | @ -41,6 +41,7 @@ class SeedDMS_View_ReviewSummary extends SeedDMS_Bootstrap_Style { | |||
| 		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder')); | ||||
| 
 | ||||
| 		$this->printDeleteDocumentButtonJs(); | ||||
| 		$this->printClickDocumentJs(); | ||||
| 	} /* }}} */ | ||||
| 
 | ||||
| 	function show() { /* {{{ */ | ||||
|  |  | |||
|  | @ -189,11 +189,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev) | |||
| 	scrollTop: 200 | ||||
| 	}, 200); | ||||
| }); | ||||
| /* catch click on a document row in the list folders and documents */ | ||||
| $('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { | ||||
| 	attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; | ||||
| 	window.location = '../out/out.ViewDocument.php?documentid=' + attr_id; | ||||
| }); | ||||
| <?php | ||||
| 		$this->printClickDocumentJs(); | ||||
| ?>
 | ||||
| $('body').on('click', '.order-btn', function(ev) { | ||||
| 	ev.preventDefault(); | ||||
| 	var element = $(this); | ||||
|  |  | |||
|  | @ -36,6 +36,14 @@ require_once("SeedDMS/Preview.php"); | |||
|  */ | ||||
| class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { | ||||
| 
 | ||||
| 	function js() { /* {{{ */ | ||||
| 		header('Content-Type: application/javascript; charset=UTF-8'); | ||||
| 		parent::jsTranslations(array('cancel', 'splash_move_document', 'confirm_move_document', 'move_document', 'confirm_transfer_link_document', 'transfer_content', 'link_document', 'splash_move_folder', 'confirm_move_folder', 'move_folder')); | ||||
| 
 | ||||
| 		$this->printDeleteDocumentButtonJs(); | ||||
| 		$this->printClickDocumentJs(); | ||||
| 	} /* }}} */ | ||||
| 
 | ||||
| 	function show() { /* {{{ */ | ||||
| 		$dms = $this->params['dms']; | ||||
| 		$user = $this->params['user']; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 Uwe Steinmann
						Uwe Steinmann