gnh1201/seeddms-code
1
0
Fork 0
mirror of https://git.code.sf.net/p/seeddms/code synced 2025-05-21 17:11:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Uwe Steinmann 2016-10-04 16:36:00 +02:00
commit b869c4253c
2 changed files with 46 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -68,6 +68,8 @@
Changes in version 4.3.30 Changes in version 4.3.30
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
- fix adding new workflows - fix adding new workflows
- fix moving documents/folders via drag&drop in Edge (Closes #286)
- upate folder tree after moving a document/folder with drag&drop (Closes #288)
-------------------------------------------------------------------------------- --------------------------------------------------------------------------------
Changes in version 4.3.29 Changes in version 4.3.29

58
styles/bootstrap/application.js
View File

@ -240,6 +240,7 @@ $(document).ready( function() {
{ command: 'movefolder', folderid: attr_source, targetfolderid: attr_dest, formtoken: attr_formtoken }, { command: 'movefolder', folderid: attr_source, targetfolderid: attr_dest, formtoken: attr_formtoken },
function(data) { function(data) {
if(data.success) { if(data.success) {
$('#table-row-folder-'+attr_source).hide('slow');
noty({ noty({
text: data.msg, text: data.msg,
type: data.success ? 'success' : 'error', type: data.success ? 'success' : 'error',
@ -264,6 +265,7 @@ $(document).ready( function() {
{ command: 'movedocument', docid: attr_source, targetfolderid: attr_dest, formtoken: attr_formtoken }, { command: 'movedocument', docid: attr_source, targetfolderid: attr_dest, formtoken: attr_formtoken },
function(data) { function(data) {
if(data.success) { if(data.success) {
$('#table-row-document-'+attr_source).hide('slow');
noty({ noty({
text: data.msg, text: data.msg,
type: data.success ? 'success' : 'error', type: data.success ? 'success' : 'error',
@ -410,8 +412,12 @@ $(document).ready( function() {
function onAddClipboard(ev) { /* {{{ */ function onAddClipboard(ev) { /* {{{ */
ev.preventDefault(); ev.preventDefault();
source_type = ev.originalEvent.dataTransfer.getData("type"); var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
source_id = ev.originalEvent.dataTransfer.getData("id"); source_type = source_info.type;
source_id = source_info.id;
formtoken = source_info.formtoken;
// source_type = ev.originalEvent.dataTransfer.getData("type");
// source_id = ev.originalEvent.dataTransfer.getData("id");
if(source_type == 'document' || source_type == 'folder') { if(source_type == 'document' || source_type == 'folder') {
$.get('../op/op.Ajax.php', $.get('../op/op.Ajax.php',
{ command: 'addtoclipboard', type: source_type, id: source_id }, { command: 'addtoclipboard', type: source_type, id: source_id },
@ -643,9 +649,13 @@ $(document).ready(function() {
attr_rel = $(e.currentTarget).attr('rel'); attr_rel = $(e.currentTarget).attr('rel');
target_type = attr_rel.split("_")[0]; target_type = attr_rel.split("_")[0];
target_id = attr_rel.split("_")[1]; target_id = attr_rel.split("_")[1];
source_type = e.originalEvent.dataTransfer.getData("type"); var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
source_id = e.originalEvent.dataTransfer.getData("id"); source_type = source_info.type;
formtoken = e.originalEvent.dataTransfer.getData("formtoken"); source_id = source_info.id;
formtoken = source_info.formtoken;
// source_type = e.originalEvent.dataTransfer.getData("type");
// source_id = e.originalEvent.dataTransfer.getData("id");
// formtoken = e.originalEvent.dataTransfer.getData("formtoken");
if(source_type == 'document') { if(source_type == 'document') {
bootbox.dialog(trans.confirm_move_document, [{ bootbox.dialog(trans.confirm_move_document, [{
"label" : "<i class='icon-remove'></i> "+trans.move_document, "label" : "<i class='icon-remove'></i> "+trans.move_document,
@ -655,6 +665,7 @@ $(document).ready(function() {
{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken }, { command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
function(data) { function(data) {
if(data.success) { if(data.success) {
$('#table-row-document-'+source_id).hide('slow');
noty({ noty({
text: data.message, text: data.message,
type: 'success', type: 'success',
@ -695,6 +706,7 @@ $(document).ready(function() {
{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken }, { command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
function(data) { function(data) {
if(data.success) { if(data.success) {
$('#table-row-folder-'+source_id).hide('slow');
noty({ noty({
text: data.message, text: data.message,
type: 'success', type: 'success',
@ -732,18 +744,30 @@ $(document).ready(function() {
attr_rel = $(e.target).attr('rel'); attr_rel = $(e.target).attr('rel');
if(typeof attr_rel == 'undefined') if(typeof attr_rel == 'undefined')
return; return;
e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]); var dragStartInfo = {
e.originalEvent.dataTransfer.setData("type","folder"); id : attr_rel.split("_")[1],
e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken')); type : "folder",
formtoken : $(e.target).attr('formtoken')
};
e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
// e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
// e.originalEvent.dataTransfer.setData("type","folder");
// e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
}); });
$(document).on('dragstart', '.table-row-document', function (e) { $(document).on('dragstart', '.table-row-document', function (e) {
attr_rel = $(e.target).attr('rel'); attr_rel = $(e.target).attr('rel');
if(typeof attr_rel == 'undefined') if(typeof attr_rel == 'undefined')
return; return;
e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]); var dragStartInfo = {
e.originalEvent.dataTransfer.setData("type","document"); id : attr_rel.split("_")[1],
e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken')); type : "document",
formtoken : $(e.target).attr('formtoken')
};
e.originalEvent.dataTransfer.setData("text", JSON.stringify(dragStartInfo));
// e.originalEvent.dataTransfer.setData("id", attr_rel.split("_")[1]);
// e.originalEvent.dataTransfer.setData("type","document");
// e.originalEvent.dataTransfer.setData("formtoken", $(e.target).attr('formtoken'));
}); });
/* Dropping item on alert below clipboard */ /* Dropping item on alert below clipboard */
@ -792,9 +816,13 @@ $(document).ready(function() {
$(e.target).parent().css('border', '0px solid white'); $(e.target).parent().css('border', '0px solid white');
target_type = attr_rel.split("_")[0]; target_type = attr_rel.split("_")[0];
target_id = attr_rel.split("_")[1]; target_id = attr_rel.split("_")[1];
source_type = e.originalEvent.dataTransfer.getData("type"); var source_info = JSON.parse(e.originalEvent.dataTransfer.getData("text"));
source_id = e.originalEvent.dataTransfer.getData("id"); source_type = source_info.type;
formtoken = e.originalEvent.dataTransfer.getData("formtoken"); source_id = source_info.id;
formtoken = source_info.formtoken;
// source_type = e.originalEvent.dataTransfer.getData("type");
// source_id = e.originalEvent.dataTransfer.getData("id");
// formtoken = e.originalEvent.dataTransfer.getData("formtoken");
if(source_type == 'document') { if(source_type == 'document') {
bootbox.dialog(trans.confirm_move_document, [{ bootbox.dialog(trans.confirm_move_document, [{
"label" : "<i class='icon-remove'></i> "+trans.move_document, "label" : "<i class='icon-remove'></i> "+trans.move_document,
@ -804,6 +832,7 @@ $(document).ready(function() {
{ command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken }, { command: 'movedocument', docid: source_id, targetfolderid: target_id, formtoken: formtoken },
function(data) { function(data) {
if(data.success) { if(data.success) {
$('#table-row-document-'+source_id).hide('slow');
noty({ noty({
text: data.message, text: data.message,
type: 'success', type: 'success',
@ -844,6 +873,7 @@ $(document).ready(function() {
{ command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken }, { command: 'movefolder', folderid: source_id, targetfolderid: target_id, formtoken: formtoken },
function(data) { function(data) {
if(data.success) { if(data.success) {
$('#table-row-folder-'+source_id).hide('slow');
noty({ noty({
text: data.message, text: data.message,
type: 'success', type: 'success',