gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-06-01 14:37:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.1.x' into seeddms-6.0.x

Browse Source
This commit is contained in:
Uwe Steinmann 2019-11-25 09:53:22 +01:00
commit dc770f3c17
5 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
views/bootstrap/class.ApprovalSummary.php
View File

@ -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')); 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->printDeleteDocumentButtonJs();
$this->printClickDocumentJs();
} /* }}} */ } /* }}} */
function show() { /* {{{ */ function show() { /* {{{ */

13
views/bootstrap/class.Bootstrap.php
View File

@ -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 * Start the row for a folder in list of documents and folders
* *

1
views/bootstrap/class.ReviewSummary.php
View File

@ -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')); 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->printDeleteDocumentButtonJs();
$this->printClickDocumentJs();
} /* }}} */ } /* }}} */
function show() { /* {{{ */ function show() { /* {{{ */

8
views/bootstrap/class.ViewFolder.php
View File

@ -189,11 +189,9 @@ $('body').on('click', '[id^=\"table-row-folder\"] td:nth-child(2)', function(ev)
scrollTop: 200 scrollTop: 200
}, 200); }, 200);
}); });
/* catch click on a document row in the list folders and documents */ <?php
$('body').on('click', '[id^=\"table-row-document\"] td:nth-child(2)', function(ev) { $this->printClickDocumentJs();
attr_id = $(ev.currentTarget).parent().attr('id').split('-')[3]; ?>
window.location = '../out/out.ViewDocument.php?documentid=' + attr_id;
});
$('body').on('click', '.order-btn', function(ev) { $('body').on('click', '.order-btn', function(ev) {
ev.preventDefault(); ev.preventDefault();
var element = $(this); var element = $(this);

8
views/bootstrap/class.WorkflowSummary.php
View File

@ -36,6 +36,14 @@ require_once("SeedDMS/Preview.php");
*/ */
class SeedDMS_View_WorkflowSummary extends SeedDMS_Bootstrap_Style { 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() { /* {{{ */ function show() { /* {{{ */
$dms = $this->params['dms']; $dms = $this->params['dms'];
$user = $this->params['user']; $user = $this->params['user'];