gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-12 20:51:30 +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 2021-11-27 13:51:15 +01:00
commit f635d0e546
7 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Gruntfile.js
View File

@ -1,7 +1,7 @@
module.exports = function (grunt) { module.exports = function (grunt) {
'use strict'; 'use strict';
var bootstrapDir = 'views/bootstrap4/vendors', var bootstrapDir = 'views/bootstrap/vendors',
tdkDir = 'views/tdk/vendors', tdkDir = 'views/tdk/vendors',
nodeDir = 'node_modules'; nodeDir = 'node_modules';
@ -106,6 +106,13 @@ module.exports = function (grunt) {
], ],
dest: bootstrapDir + '/jquery-validation', dest: bootstrapDir + '/jquery-validation',
flatten: true flatten: true
},{
expand: true,
src: [
nodeDir + '/jquery-typeahead/dist/*'
],
dest: bootstrapDir + '/jquery-typeahead',
flatten: true
},{ },{
expand: true, expand: true,
src: [ src: [

2
SeedDMS_Lucene/Lucene/IndexedDocument.php
View File

@ -186,6 +186,8 @@ class SeedDMS_Lucene_IndexedDocument extends Zend_Search_Lucene_Document {
$content = $convcmd->convert($path, $mimetype, 'text/plain'); $content = $convcmd->convert($path, $mimetype, 'text/plain');
if($content) { if($content) {
self::setContent($content); self::setContent($content);
} elseif($content === false) {
$this->errormsg = 'Conversion failed';
} }
$this->cmd = get_class($service); $this->cmd = get_class($service);
} else { } else {

2
SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php
View File

@ -186,6 +186,8 @@ class SeedDMS_SQLiteFTS_IndexedDocument extends SeedDMS_SQLiteFTS_Document {
$content = $convcmd->convert($path, $mimetype, 'text/plain'); $content = $convcmd->convert($path, $mimetype, 'text/plain');
if($content) { if($content) {
self::setContent($content); self::setContent($content);
} elseif($content === false) {
$this->errormsg = 'Conversion failed';
} }
$this->cmd = get_class($service); $this->cmd = get_class($service);
} else { } else {

5
conf/settings.xml.template
View File

@ -18,6 +18,7 @@
theme = "bootstrap" theme = "bootstrap"
previewWidthList = "40" previewWidthList = "40"
previewWidthDetail = "100" previewWidthDetail = "100"
onePageMode="true"
/> />
<!-- <!--
- strictFormCheck: Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status. - strictFormCheck: Strict form checking. If set to true, then all fields in the form will be checked for a value. If set to false, then (most) comments and keyword fields become optional. Comments are always required when submitting a review or overriding document status.
@ -106,7 +107,7 @@
luceneDir = "" luceneDir = ""
logFileEnable = "true" logFileEnable = "true"
logFileRotation = "d" logFileRotation = "d"
enableLargeFileUpload = "true" enableLargeFileUpload = "false"
partitionSize = "2000000" partitionSize = "2000000"
dropFolderDir = "" dropFolderDir = ""
cacheDir = "" cacheDir = ""
@ -257,7 +258,7 @@
<edition <edition
enableAdminRevApp = "false" enableAdminRevApp = "false"
versioningFileName = "versioning_info.txt" versioningFileName = "versioning_info.txt"
workflowMode = "advanced" workflowMode = "traditional"
enableVersionDeletion = "true" enableVersionDeletion = "true"
enableVersionModification = "true" enableVersionModification = "true"
enableDuplicateDocNames = "true" enableDuplicateDocNames = "true"

2
inc/inc.Settings.php
View File

@ -42,7 +42,7 @@ if(empty($settings->_rootDir)) {
$settings->_rootDir = $__basedir."/www/"; $settings->_rootDir = $__basedir."/www/";
} }
if(empty($settings->_contentDir)) { if(empty($settings->_contentDir)) {
$settings->_contentDir = $__basedir; $settings->_contentDir = $__datadir;
} }
if(empty($settings->_cacheDir)) { if(empty($settings->_cacheDir)) {
$settings->_cacheDir = $__datadir."/cache/"; $settings->_cacheDir = $__datadir."/cache/";

2
op/op.ExtensionMgr.php
View File

@ -91,7 +91,7 @@ elseif ($action == "upload") { /* {{{ */
$controller->setParam('extmgr', $extMgr); $controller->setParam('extmgr', $extMgr);
$controller->setParam('file', $_FILES['userfile']['tmp_name']); $controller->setParam('file', $_FILES['userfile']['tmp_name']);
if (!$controller($_POST)) { if (!$controller($_POST)) {
UI::exitError(getMLText("admin_tools"),getMLText("error_occured")); UI::exitError(getMLText("admin_tools"),$controller->getErrorMsg());
} }
$session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_import'))); $session->setSplashMsg(array('type'=>'success', 'msg'=>getMLText('splash_extension_import')));
add_log_line(); add_log_line();

1
package.json
View File

@ -26,6 +26,7 @@
"grunt-contrib-copy": "^1.0.0", "grunt-contrib-copy": "^1.0.0",
"jqtree": "^1.5.1", "jqtree": "^1.5.1",
"jquery": "^1.12.4", "jquery": "^1.12.4",
"jquery-typeahead": "^2.11.1",
"jquery-validation": "^1.19.2", "jquery-validation": "^1.19.2",
"moment": "^2.29.1", "moment": "^2.29.1",
"noty": "^2.4.1", "noty": "^2.4.1",