From 4d2ade4d7c69a5d4f9fafc129e0998f9ceed25c9 Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Tue, 16 Feb 2016 12:21:48 +0100 Subject: [PATCH 1/3] do not call SeedDMS_Core_Folder::verifyLastestContentExpriry() on folders --- out/out.Search.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/out/out.Search.php b/out/out.Search.php index 8c75e0b70..fca8c96c2 100644 --- a/out/out.Search.php +++ b/out/out.Search.php @@ -369,7 +369,6 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe if($resArr['folders']) { foreach ($resArr['folders'] as $entry) { if ($entry->getAccessMode($user) >= M_READ) { - $entry->verifyLastestContentExpriry(); $entries[] = $entry; $fcount++; } @@ -379,6 +378,7 @@ if(isset($_GET["fullsearch"]) && $_GET["fullsearch"] && $settings->_enableFullSe if($resArr['docs']) { foreach ($resArr['docs'] as $entry) { if ($entry->getAccessMode($user) >= M_READ) { + $entry->verifyLastestContentExpriry(); $entries[] = $entry; $dcount++; } From a691c9628cebfc858e33d824c710d2d76cce278c Mon Sep 17 00:00:00 2001 From: Uwe Steinmann Date: Wed, 17 Feb 2016 11:38:32 +0100 Subject: [PATCH 2/3] remove extra variable in print[Document|Folder]ChooserJs() for modal form --- views/bootstrap/class.Bootstrap.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/views/bootstrap/class.Bootstrap.php b/views/bootstrap/class.Bootstrap.php index 566df6494..e72ac94db 100644 --- a/views/bootstrap/class.Bootstrap.php +++ b/views/bootstrap/class.Bootstrap.php @@ -892,11 +892,10 @@ $(document).ready(function () { function printDocumentChooserJs($formName) { /* {{{ */ ?> -modalDocChooser = $('#docChooser'); function documentSelected(id, name) { $('#docid').val(id); $('#choosedocsearch').val(name); - modalDocChooser.modal('hide'); + $('#docChooser').modal('hide'); } function folderSelected(id, name) { } @@ -938,11 +937,10 @@ function folderSelected(id, name) { function printFolderChooserJs($formName) { /* {{{ */ ?> -modalFolderChooser = $('#folderChooser'); function folderSelected(id, name) { $('#targetid').val(id); $('#choosefoldersearch').val(name); - modalFolderChooser.modal('hide'); + $('#folderChooser').modal('hide'); } Date: Wed, 17 Feb 2016 11:43:19 +0100 Subject: [PATCH 3/3] add setting header of javascript file --- views/bootstrap/class.AddFile.php | 1 + views/bootstrap/class.Categories.php | 1 + views/bootstrap/class.DefaultKeywords.php | 1 + views/bootstrap/class.DropFolderChooser.php | 1 + views/bootstrap/class.EditDocument.php | 1 + views/bootstrap/class.EditUserData.php | 1 + views/bootstrap/class.Settings.php | 2 ++ views/bootstrap/class.UpdateDocument.php | 1 + views/bootstrap/class.UsrMgr.php | 2 ++ 9 files changed, 11 insertions(+) diff --git a/views/bootstrap/class.AddFile.php b/views/bootstrap/class.AddFile.php index 924c66474..3c0daa52e 100644 --- a/views/bootstrap/class.AddFile.php +++ b/views/bootstrap/class.AddFile.php @@ -32,6 +32,7 @@ require_once("class.Bootstrap.php"); class SeedDMS_View_AddFile extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ + header('Content-Type: application/javascript'); ?> function checkForm() { diff --git a/views/bootstrap/class.Categories.php b/views/bootstrap/class.Categories.php index fbc3513f9..ae5ae0c52 100644 --- a/views/bootstrap/class.Categories.php +++ b/views/bootstrap/class.Categories.php @@ -33,6 +33,7 @@ class SeedDMS_View_Categories extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ $selcat = $this->params['selcategory']; + header('Content-Type: application/javascript'); ?> $(document).ready( function() { $( "#selector" ).change(function() { diff --git a/views/bootstrap/class.DefaultKeywords.php b/views/bootstrap/class.DefaultKeywords.php index ff71eba4c..ea1987812 100644 --- a/views/bootstrap/class.DefaultKeywords.php +++ b/views/bootstrap/class.DefaultKeywords.php @@ -32,6 +32,7 @@ require_once("class.Bootstrap.php"); class SeedDMS_View_DefaultKeywords extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ + header('Content-Type: application/javascript'); ?> function checkForm() { diff --git a/views/bootstrap/class.DropFolderChooser.php b/views/bootstrap/class.DropFolderChooser.php index c1223e23b..553191dc5 100644 --- a/views/bootstrap/class.DropFolderChooser.php +++ b/views/bootstrap/class.DropFolderChooser.php @@ -32,6 +32,7 @@ require_once("class.Bootstrap.php"); class SeedDMS_View_DropFolderChooser extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ + header('Content-Type: application/javascript'); ?> $('#fileselect').click(function(ev) { attr_filename = $(ev.currentTarget).attr('filename'); diff --git a/views/bootstrap/class.EditDocument.php b/views/bootstrap/class.EditDocument.php index 4e660a551..3da170eda 100644 --- a/views/bootstrap/class.EditDocument.php +++ b/views/bootstrap/class.EditDocument.php @@ -33,6 +33,7 @@ class SeedDMS_View_EditDocument extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ $strictformcheck = $this->params['strictformcheck']; + header('Content-Type: application/javascript'); $this->printKeywordChooserJs('form1'); ?> function checkForm() diff --git a/views/bootstrap/class.EditUserData.php b/views/bootstrap/class.EditUserData.php index a9b860be7..27acf2464 100644 --- a/views/bootstrap/class.EditUserData.php +++ b/views/bootstrap/class.EditUserData.php @@ -32,6 +32,7 @@ require_once("class.Bootstrap.php"); class SeedDMS_View_EditUserData extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ + header('Content-Type: application/javascript'); ?> function checkForm() { diff --git a/views/bootstrap/class.Settings.php b/views/bootstrap/class.Settings.php index 8d26427e5..85e5d599c 100644 --- a/views/bootstrap/class.Settings.php +++ b/views/bootstrap/class.Settings.php @@ -50,6 +50,8 @@ class SeedDMS_View_Settings extends SeedDMS_Bootstrap_Style { } /* }}} */ function js() { /* {{{ */ + + header('Content-Type: application/javascript'); ?> $(document).ready( function() { $('#settingstab li a').click(function(event) { diff --git a/views/bootstrap/class.UpdateDocument.php b/views/bootstrap/class.UpdateDocument.php index cf60e86f0..da05ce842 100644 --- a/views/bootstrap/class.UpdateDocument.php +++ b/views/bootstrap/class.UpdateDocument.php @@ -53,6 +53,7 @@ $(document).ready( function() { function js() { /* {{{ */ $strictformcheck = $this->params['strictformcheck']; $dropfolderdir = $this->params['dropfolderdir']; + header('Content-Type: application/javascript'); $this->printDropFolderChooserJs("form1"); ?> function checkForm() diff --git a/views/bootstrap/class.UsrMgr.php b/views/bootstrap/class.UsrMgr.php index c4c2f5aa4..ba3da82e0 100644 --- a/views/bootstrap/class.UsrMgr.php +++ b/views/bootstrap/class.UsrMgr.php @@ -34,6 +34,8 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style { function js() { /* {{{ */ $seluser = $this->params['seluser']; $strictformcheck = $this->params['strictformcheck']; + + header('Content-Type: application/javascript'); ?> function checkForm() {