gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2026-01-27 03:29:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'seeddms-5.0.x' into develop

Browse Source
This commit is contained in:
Uwe Steinmann 2016-02-17 11:44:25 +01:00
commit 067890345e
11 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
out/out.Search.php
View File

@ -374,7 +374,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++;
}
@ -384,6 +383,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++;
}

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

@ -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()
{

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

@ -1048,11 +1048,10 @@ $(document).ready(function () {
function printDocumentChooserJs($formName) { /* {{{ */
?>
modalDocChooser<?php echo $formName ?> = $('#docChooser<?php echo $formName ?>');
function documentSelected<?php echo $formName ?>(id, name) {
$('#docid<?php echo $formName ?>').val(id);
$('#choosedocsearch').val(name);
modalDocChooser<?php echo $formName ?>.modal('hide');
$('#docChooser<?php echo $formName ?>').modal('hide');
}
function folderSelected<?php echo $formName ?>(id, name) {
}
@ -1097,11 +1096,10 @@ function folderSelected<?php echo $formName ?>(id, name) {
function printFolderChooserJs($formName) { /* {{{ */
?>
modalFolderChooser<?php echo $formName ?> = $('#folderChooser<?php echo $formName ?>');
function folderSelected<?php echo $formName ?>(id, name) {
$('#targetid<?php echo $formName ?>').val(id);
$('#choosefoldersearch<?php echo $formName ?>').val(name);
modalFolderChooser<?php echo $formName ?>.modal('hide');
$('#folderChooser<?php echo $formName ?>').modal('hide');
}
<?php
} /* }}} */

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

@ -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() {

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

@ -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()
{

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

@ -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');

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

@ -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()

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

@ -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()
{

2
views/bootstrap/class.Settings.php
View File

@ -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) {

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

@ -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()

2
views/bootstrap/class.UsrMgr.php
View File

@ -35,6 +35,8 @@ class SeedDMS_View_UsrMgr extends SeedDMS_Bootstrap_Style {
$seluser = $this->params['seluser'];
$strictformcheck = $this->params['strictformcheck'];
header('Content-Type: application/javascript');
$this->printFolderChooserJs("form");
?>
function checkForm()