gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-09 13:06:14 +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 2022-03-07 15:20:24 +01:00
commit a4f96c76d6
3 changed files with 70 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
op/op.Ajax.php
View File

@ -755,6 +755,16 @@ switch($command) {
} }
} }
if(isset($_POST["attributes"]))
$attributes = $_POST["attributes"];
else
$attributes = array();
if(isset($_POST["comment"]))
$comment = trim($_POST["comment"]);
else
$comment = '';
// Get the list of reviewers and approvers for this document. // Get the list of reviewers and approvers for this document.
$reviewers = array(); $reviewers = array();
$approvers = array(); $approvers = array();
@ -796,7 +806,7 @@ switch($command) {
$controller->setParam('folder', $folder); $controller->setParam('folder', $folder);
$controller->setParam('fulltextservice', $fulltextservice); $controller->setParam('fulltextservice', $fulltextservice);
$controller->setParam('name', $name); $controller->setParam('name', $name);
$controller->setParam('comment', ''); $controller->setParam('comment', $comment);
$controller->setParam('expires', $expires); $controller->setParam('expires', $expires);
$controller->setParam('keywords', ''); $controller->setParam('keywords', '');
$controller->setParam('categories', $cats); $controller->setParam('categories', $cats);
@ -814,7 +824,7 @@ switch($command) {
$controller->setParam('approvers', $approvers); $controller->setParam('approvers', $approvers);
$controller->setParam('reqversion', 1); $controller->setParam('reqversion', 1);
$controller->setParam('versioncomment', ''); $controller->setParam('versioncomment', '');
$controller->setParam('attributes', array()); $controller->setParam('attributes', $attributes);
$controller->setParam('attributesversion', array()); $controller->setParam('attributesversion', array());
$controller->setParam('workflow', $workflow); $controller->setParam('workflow', $workflow);
$controller->setParam('notificationgroups', array()); $controller->setParam('notificationgroups', array());

29
views/bootstrap/styles/application.js
View File

@ -777,6 +777,31 @@ function onAddClipboard(ev) { /* {{{ */
} }
} }
// formData - instance of FormData object
// data - object to post
SeedDMSUpload.getFormData = function(formData, data, previousKey) {
if (data instanceof Object) {
Object.keys(data).forEach(key => {
const value = data[key];
if (value instanceof Object && !Array.isArray(value)) {
return this.getFormData(formData, value, key);
}
if (previousKey) {
key = `${previousKey}[${key}]`;
}
if (Array.isArray(value)) {
value.forEach(val => {
formData.append(`${key}[]`, val);
});
} else {
formData.append(key, value);
}
});
} else {
formData.append(previousKey, data);
}
}
SeedDMSUpload.handleFileUpload = function(files,obj,statusbar) { SeedDMSUpload.handleFileUpload = function(files,obj,statusbar) {
/* target is set for the quick upload area */ /* target is set for the quick upload area */
var target_id = obj.data('target'); var target_id = obj.data('target');
@ -794,8 +819,12 @@ function onAddClipboard(ev) { /* {{{ */
fd.append('targettype', target_type); fd.append('targettype', target_type);
fd.append('folderid', target_id); fd.append('folderid', target_id);
fd.append('formtoken', obj.data('uploadformtoken')); fd.append('formtoken', obj.data('uploadformtoken'));
if (typeof obj.data('comment') !== 'undefined') {
fd.append('comment', obj.data('comment'));
}
fd.append('userfile', files[i]); fd.append('userfile', files[i]);
fd.append('command', 'uploaddocument'); fd.append('command', 'uploaddocument');
this.getFormData(fd, obj.data('attributes'), 'attributes');
// fd.append('path', files[i].webkitRelativePath); // fd.append('path', files[i].webkitRelativePath);
statusbar.parent().show(); statusbar.parent().show();

29
views/bootstrap4/styles/application.js
View File

@ -808,6 +808,31 @@ function onAddClipboard(ev) { /* {{{ */
} }
} }
// formData - instance of FormData object
// data - object to post
SeedDMSUpload.getFormData = function(formData, data, previousKey) {
if (data instanceof Object) {
Object.keys(data).forEach(key => {
const value = data[key];
if (value instanceof Object && !Array.isArray(value)) {
return this.getFormData(formData, value, key);
}
if (previousKey) {
key = `${previousKey}[${key}]`;
}
if (Array.isArray(value)) {
value.forEach(val => {
formData.append(`${key}[]`, val);
});
} else {
formData.append(key, value);
}
});
} else {
formData.append(previousKey, data);
}
}
SeedDMSUpload.handleFileUpload = function(files,obj,statusbar) { SeedDMSUpload.handleFileUpload = function(files,obj,statusbar) {
/* target is set for the quick upload area */ /* target is set for the quick upload area */
var target_id = obj.data('target'); var target_id = obj.data('target');
@ -825,8 +850,12 @@ function onAddClipboard(ev) { /* {{{ */
fd.append('targettype', target_type); fd.append('targettype', target_type);
fd.append('folderid', target_id); fd.append('folderid', target_id);
fd.append('formtoken', obj.data('uploadformtoken')); fd.append('formtoken', obj.data('uploadformtoken'));
if (typeof obj.data('comment') !== 'undefined') {
fd.append('comment', obj.data('comment'));
}
fd.append('userfile', files[i]); fd.append('userfile', files[i]);
fd.append('command', 'uploaddocument'); fd.append('command', 'uploaddocument');
this.getFormData(fd, obj.data('attributes'), 'attributes');
// fd.append('path', files[i].webkitRelativePath); // fd.append('path', files[i].webkitRelativePath);
statusbar.parent().show(); statusbar.parent().show();