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

Gruntfile.js

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

SeedDMS_Lucene/Lucene/IndexedDocument.php

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

SeedDMS_SQLiteFTS/SQLiteFTS/IndexedDocument.php

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

conf/settings.xml.template

@@ -18,6 +18,7 @@
       theme = "bootstrap"
       previewWidthList = "40"
       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.
@@ -106,7 +107,7 @@
       luceneDir = ""
       logFileEnable = "true"
       logFileRotation = "d"
-      enableLargeFileUpload = "true"
+      enableLargeFileUpload = "false"
       partitionSize = "2000000"
       dropFolderDir = ""
       cacheDir = ""
@@ -257,7 +258,7 @@
     <edition
       enableAdminRevApp = "false"
       versioningFileName = "versioning_info.txt"
-      workflowMode = "advanced"
+      workflowMode = "traditional"
       enableVersionDeletion = "true"
       enableVersionModification = "true"
       enableDuplicateDocNames = "true"

inc/inc.Settings.php

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

op/op.ExtensionMgr.php

@@ -91,7 +91,7 @@ elseif ($action == "upload") { /* {{{ */
 	$controller->setParam('extmgr', $extMgr);
 	$controller->setParam('file', $_FILES['userfile']['tmp_name']);
 	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')));
 	add_log_line();

package.json

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