Merge pull request #3747 from alchemy-fr/PHRAS-3390-delete-action

PHRAS-3390 merge Prod - Workzone - basket tab - local menu - "Delete" action, add "Archive" and "Cancel" choice in confirmation windows
This commit is contained in:
Nicolas Maillat
2021-03-26 15:04:17 +01:00
committed by GitHub
28 changed files with 825 additions and 673 deletions

View File

@@ -13,5 +13,5 @@ module.exports = {
setupDir: _root + 'tests/setup/node.js',
karmaConf: _root + 'config/karma.conf.js',
// change this version when you change JS file for lazy loading
jsFileVersion: 13
jsFileVersion: 14
};

View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=13";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=14";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

View File

@@ -96,7 +96,7 @@ return /******/ (function(modules) { // webpackBootstrap
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=13";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=14";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=13";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=14";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

View File

@@ -91,7 +91,7 @@
/******/ if (__webpack_require__.nc) {
/******/ script.setAttribute("nonce", __webpack_require__.nc);
/******/ }
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=13";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=14";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

View File

@@ -11027,7 +11027,7 @@ var workzone = function workzone(services) {
}
function openExposePublicationEdit(edit) {
(0, _jquery2.default)('#DIALOG-expose-edit').empty().html('<img src="/assets/common/images/icons/main-loader.gif" alt="loading"/>');
(0, _jquery2.default)('#DIALOG-expose-edit .expose-edit-content').empty().html('<div style="text-align: center;"><img src="/assets/common/images/icons/main-loader.gif" alt="loading"/> </div>');
(0, _jquery2.default)('#DIALOG-expose-edit').attr('title', localeService.t('Edit expose title')).dialog({
autoOpen: false,
@@ -11042,19 +11042,19 @@ var workzone = function workzone(services) {
opacity: 0.7
},
close: function close(e, ui) {
(0, _jquery2.default)('#DIALOG-expose-edit').empty();
(0, _jquery2.default)('#DIALOG-expose-edit .expose-edit-content').empty();
}
}).dialog('open');
(0, _jquery2.default)('.ui-dialog').addClass('black-dialog-wrap publish-dialog');
(0, _jquery2.default)('#DIALOG-expose-edit').on('click', '.close-expose-modal', function () {
(0, _jquery2.default)('#DIALOG-expose-edit').dialog('close');
(0, _jquery2.default)('#DIALOG-expose-edit .expose-edit-content').dialog('close');
});
_jquery2.default.ajax({
type: "GET",
url: '/prod/expose/get-publication/' + edit.data("id") + '?exposeName=' + (0, _jquery2.default)("#expose_list").val(),
success: function success(data) {
(0, _jquery2.default)('#DIALOG-expose-edit').empty().html(data);
(0, _jquery2.default)('#DIALOG-expose-edit .expose-edit-content').empty().html(data);
}
});
}
@@ -17477,16 +17477,29 @@ var deleteBasket = function deleteBasket(services) {
case 'SSTT':
var buttons = {};
buttons[localeService.t('valider')] = function (e) {
buttons[localeService.t('archive')] = function (e) {
_archiveBasket($el);
};
buttons[localeService.t('deleteTitle')] = function (e) {
_deleteBasket($el);
};
(0, _jquery2.default)('#DIALOG').empty().append(localeService.t('confirmDel')).attr('title', localeService.t('attention')).dialog({
autoOpen: false,
resizable: false,
modal: true,
draggable: false
}).dialog('open').dialog('option', 'buttons', buttons);
var dialogWindow = _dialog2.default.create(services, {
size: 'Medium',
title: localeService.t('attention'),
closeButton: true
});
//Add custom class to dialog wrapper
dialogWindow.getDomElement().closest('.ui-dialog').addClass('black-dialog-wrap');
var content = '<div class="well-small">' + localeService.t('confirmDel') + '</div>';
dialogWindow.setContent(content);
dialogWindow.setOption('buttons', buttons);
(0, _jquery2.default)('#tooltip').hide();
break;
/*case 'STORY':
@@ -17498,9 +17511,9 @@ var deleteBasket = function deleteBasket(services) {
};
var _deleteBasket = function _deleteBasket(item) {
if ((0, _jquery2.default)('#DIALOG').data('ui-dialog')) {
(0, _jquery2.default)('#DIALOG').dialog('destroy');
}
var dialogWindow = _dialog2.default.get(1);
dialogWindow.close();
// id de chutier
var k = (0, _jquery2.default)(item).attr('id').split('_').slice(1, 2).pop();
_jquery2.default.ajax({
@@ -17535,6 +17548,44 @@ var deleteBasket = function deleteBasket(services) {
});
};
var _archiveBasket = function _archiveBasket(item) {
var dialogWindow = _dialog2.default.get(1);
dialogWindow.close();
var basketId = (0, _jquery2.default)(item).attr('id').split('_').slice(1, 2).pop();
_jquery2.default.ajax({
type: 'POST',
url: url + 'prod/baskets/' + basketId + '/archive/?archive=1',
dataType: 'json',
success: function success(data) {
if (data.success) {
var basket = (0, _jquery2.default)('#SSTT_' + basketId);
var basketNext = basket.next();
if (basketNext.data('ui-droppable')) {
basketNext.droppable('destroy');
}
basketNext.slideUp().remove();
if (basket.data('ui-droppable')) {
basket.droppable('destroy');
}
basket.slideUp().remove();
if ((0, _jquery2.default)('#baskets .SSTT').length === 0) {
appEvents.emit('workzone.refresh');
}
} else {
alert(data.message);
}
return false;
}
});
};
/*const _deleteRecords = (lst) => {
if (lst.split(';').length === 0) {
alert(localeService.t('nodocselected'));

View File

@@ -11027,7 +11027,7 @@ var workzone = function workzone(services) {
}
function openExposePublicationEdit(edit) {
(0, _jquery2.default)('#DIALOG-expose-edit').empty().html('<img src="/assets/common/images/icons/main-loader.gif" alt="loading"/>');
(0, _jquery2.default)('#DIALOG-expose-edit .expose-edit-content').empty().html('<div style="text-align: center;"><img src="/assets/common/images/icons/main-loader.gif" alt="loading"/> </div>');
(0, _jquery2.default)('#DIALOG-expose-edit').attr('title', localeService.t('Edit expose title')).dialog({
autoOpen: false,
@@ -11042,19 +11042,19 @@ var workzone = function workzone(services) {
opacity: 0.7
},
close: function close(e, ui) {
(0, _jquery2.default)('#DIALOG-expose-edit').empty();
(0, _jquery2.default)('#DIALOG-expose-edit .expose-edit-content').empty();
}
}).dialog('open');
(0, _jquery2.default)('.ui-dialog').addClass('black-dialog-wrap publish-dialog');
(0, _jquery2.default)('#DIALOG-expose-edit').on('click', '.close-expose-modal', function () {
(0, _jquery2.default)('#DIALOG-expose-edit').dialog('close');
(0, _jquery2.default)('#DIALOG-expose-edit .expose-edit-content').dialog('close');
});
_jquery2.default.ajax({
type: "GET",
url: '/prod/expose/get-publication/' + edit.data("id") + '?exposeName=' + (0, _jquery2.default)("#expose_list").val(),
success: function success(data) {
(0, _jquery2.default)('#DIALOG-expose-edit').empty().html(data);
(0, _jquery2.default)('#DIALOG-expose-edit .expose-edit-content').empty().html(data);
}
});
}
@@ -17477,16 +17477,29 @@ var deleteBasket = function deleteBasket(services) {
case 'SSTT':
var buttons = {};
buttons[localeService.t('valider')] = function (e) {
buttons[localeService.t('archive')] = function (e) {
_archiveBasket($el);
};
buttons[localeService.t('deleteTitle')] = function (e) {
_deleteBasket($el);
};
(0, _jquery2.default)('#DIALOG').empty().append(localeService.t('confirmDel')).attr('title', localeService.t('attention')).dialog({
autoOpen: false,
resizable: false,
modal: true,
draggable: false
}).dialog('open').dialog('option', 'buttons', buttons);
var dialogWindow = _dialog2.default.create(services, {
size: 'Medium',
title: localeService.t('attention'),
closeButton: true
});
//Add custom class to dialog wrapper
dialogWindow.getDomElement().closest('.ui-dialog').addClass('black-dialog-wrap');
var content = '<div class="well-small">' + localeService.t('confirmDel') + '</div>';
dialogWindow.setContent(content);
dialogWindow.setOption('buttons', buttons);
(0, _jquery2.default)('#tooltip').hide();
break;
/*case 'STORY':
@@ -17498,9 +17511,9 @@ var deleteBasket = function deleteBasket(services) {
};
var _deleteBasket = function _deleteBasket(item) {
if ((0, _jquery2.default)('#DIALOG').data('ui-dialog')) {
(0, _jquery2.default)('#DIALOG').dialog('destroy');
}
var dialogWindow = _dialog2.default.get(1);
dialogWindow.close();
// id de chutier
var k = (0, _jquery2.default)(item).attr('id').split('_').slice(1, 2).pop();
_jquery2.default.ajax({
@@ -17535,6 +17548,44 @@ var deleteBasket = function deleteBasket(services) {
});
};
var _archiveBasket = function _archiveBasket(item) {
var dialogWindow = _dialog2.default.get(1);
dialogWindow.close();
var basketId = (0, _jquery2.default)(item).attr('id').split('_').slice(1, 2).pop();
_jquery2.default.ajax({
type: 'POST',
url: url + 'prod/baskets/' + basketId + '/archive/?archive=1',
dataType: 'json',
success: function success(data) {
if (data.success) {
var basket = (0, _jquery2.default)('#SSTT_' + basketId);
var basketNext = basket.next();
if (basketNext.data('ui-droppable')) {
basketNext.droppable('destroy');
}
basketNext.slideUp().remove();
if (basket.data('ui-droppable')) {
basket.droppable('destroy');
}
basket.slideUp().remove();
if ((0, _jquery2.default)('#baskets .SSTT').length === 0) {
appEvents.emit('workzone.refresh');
}
} else {
alert(data.message);
}
return false;
}
});
};
/*const _deleteRecords = (lst) => {
if (lst.split(';').length === 0) {
alert(localeService.t('nodocselected'));

View File

@@ -2284,7 +2284,7 @@ span.ww_winTitle {
font-size: 16px;
}
.black-dialog-wrap.ui-dialog.ui-widget-content.move-dialog .ui-dialog-content {
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-content {
height: auto !important;
}
@@ -2327,15 +2327,15 @@ span.ww_winTitle {
min-width: 170px;
margin: 12px 10px;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.36);
background: #e6e6e6;
color: #000;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:first-child {
background: #787878;
color: #fff;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:last-child {
background: #e6e6e6;
color: #000;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:hover {
background: #282828;
color: #fff;

File diff suppressed because one or more lines are too long

View File

@@ -2299,7 +2299,7 @@ span.ww_winTitle {
font-size: 16px;
}
.black-dialog-wrap.ui-dialog.ui-widget-content.move-dialog .ui-dialog-content {
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-content {
height: auto !important;
}
@@ -2342,15 +2342,15 @@ span.ww_winTitle {
min-width: 170px;
margin: 12px 10px;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.36);
background: #e6e6e6;
color: #000;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:first-child {
background: #787878;
color: #fff;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:last-child {
background: #e6e6e6;
color: #000;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:hover {
background: #282828;
color: #fff;

File diff suppressed because one or more lines are too long

View File

@@ -2301,7 +2301,7 @@ span.ww_winTitle {
font-size: 16px;
}
.black-dialog-wrap.ui-dialog.ui-widget-content.move-dialog .ui-dialog-content {
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-content {
height: auto !important;
}
@@ -2344,15 +2344,15 @@ span.ww_winTitle {
min-width: 170px;
margin: 12px 10px;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.36);
background: #e6e6e6;
color: #000;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:first-child {
background: #787878;
color: #fff;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:last-child {
background: #e6e6e6;
color: #000;
}
.black-dialog-wrap.ui-dialog.ui-widget-content .ui-dialog-buttonpane button:hover {
background: #282828;
color: #fff;

File diff suppressed because one or more lines are too long

View File

@@ -34,16 +34,29 @@ const deleteBasket = (services) => {
case 'SSTT':
var buttons = {};
buttons[localeService.t('valider')] = function (e) {
buttons[localeService.t('archive')] = function (e) {
_archiveBasket($el);
};
buttons[localeService.t('deleteTitle')] = function (e) {
_deleteBasket($el);
};
$('#DIALOG').empty().append(localeService.t('confirmDel')).attr('title', localeService.t('attention')).dialog({
autoOpen: false,
resizable: false,
modal: true,
draggable: false
}).dialog('open').dialog('option', 'buttons', buttons);
let dialogWindow = dialog.create(services, {
size: 'Medium',
title: localeService.t('attention'),
closeButton: true,
});
//Add custom class to dialog wrapper
dialogWindow.getDomElement().closest('.ui-dialog').addClass('black-dialog-wrap');
let content = '<div class="well-small">' + localeService.t('confirmDel') + '</div>';
dialogWindow.setContent(content);
dialogWindow.setOption('buttons', buttons);
$('#tooltip').hide();
break;
/*case 'STORY':
@@ -55,9 +68,9 @@ const deleteBasket = (services) => {
};
const _deleteBasket = (item) => {
if ($('#DIALOG').data('ui-dialog')) {
$('#DIALOG').dialog('destroy');
}
let dialogWindow = dialog.get(1);
dialogWindow.close();
// id de chutier
var k = $(item).attr('id').split('_').slice(1, 2).pop();
$.ajax({
@@ -92,6 +105,44 @@ const deleteBasket = (services) => {
});
};
const _archiveBasket = (item) => {
let dialogWindow = dialog.get(1);
dialogWindow.close();
let basketId = $(item).attr('id').split('_').slice(1, 2).pop();
$.ajax({
type: 'POST',
url: `${url}prod/baskets/${basketId}/archive/?archive=1`,
dataType: 'json',
success: function (data) {
if (data.success) {
const basket = $('#SSTT_' + basketId);
const basketNext = basket.next();
if (basketNext.data('ui-droppable')) {
basketNext.droppable('destroy');
}
basketNext.slideUp().remove();
if (basket.data('ui-droppable')) {
basket.droppable('destroy');
}
basket.slideUp().remove();
if ($('#baskets .SSTT').length === 0) {
appEvents.emit('workzone.refresh');
}
} else {
alert(data.message);
}
return false;
}
});
};
/*const _deleteRecords = (lst) => {
if (lst.split(';').length === 0) {
alert(localeService.t('nodocselected'));

View File

@@ -1011,7 +1011,7 @@ const workzone = (services) => {
}
function openExposePublicationEdit(edit) {
$('#DIALOG-expose-edit').empty().html('<img src="/assets/common/images/icons/main-loader.gif" alt="loading"/>');
$('#DIALOG-expose-edit .expose-edit-content').empty().html('<div style="text-align: center;"><img src="/assets/common/images/icons/main-loader.gif" alt="loading"/> </div>');
$('#DIALOG-expose-edit').attr('title', localeService.t('Edit expose title'))
.dialog({
@@ -1027,19 +1027,19 @@ const workzone = (services) => {
opacity: 0.7
},
close: function(e, ui) {
$('#DIALOG-expose-edit').empty();
$('#DIALOG-expose-edit .expose-edit-content').empty();
}
}).dialog('open');
$('.ui-dialog').addClass('black-dialog-wrap publish-dialog');
$('#DIALOG-expose-edit').on('click', '.close-expose-modal', function () {
$('#DIALOG-expose-edit').dialog('close');
$('#DIALOG-expose-edit .expose-edit-content').dialog('close');
});
$.ajax({
type: "GET",
url: `/prod/expose/get-publication/${edit.data("id")}?exposeName=${$("#expose_list").val()}` ,
success: function (data) {
$('#DIALOG-expose-edit').empty().html(data);
$('#DIALOG-expose-edit .expose-edit-content').empty().html(data);
}
});
}

View File

@@ -416,12 +416,8 @@ span.ww_winTitle {
border: 0 none ;
background: $dialogWrapBg;
font-size: 16px;
&.move-dialog {
.ui-dialog-content {
height: auto!important;
}
}
.ui-dialog-content {
height: auto!important;
// padding: 0;
// display: flex;
// align-items: center;
@@ -463,11 +459,11 @@ span.ww_winTitle {
min-width: 170px;
margin: 12px 10px;
box-shadow: 0 2px 4px 0 rgba(0, 0, 0, 0.36);
background: $dialogBtnBg;
color: $dialogBtnColor;
&:first-child {
background: $dialogBtnBg2;
color: $dialogBtnColor2;
background: $dialogBtnBg2;
color: $dialogBtnColor2;
&:last-child {
background: $dialogBtnBg;
color: $dialogBtnColor;
}
&:hover {
background: $dialogBtnBgHover;

View File

@@ -30,6 +30,7 @@ class LanguageController
return new JsonResponse([
'serverName' => $this->serverName,
'archive' => $translator->trans('Archive'),
'thesaurusBasesChanged' => $translator->trans( 'prod::recherche: Attention : la liste des bases selectionnees pour la recherche a ete changee.'),
'confirmDel' => $translator->trans('paniers::Vous etes sur le point de supprimer ce panier. Cette action est irreversible. Souhaitez-vous continuer ?'),
'serverError' => $translator->trans('phraseanet::erreur: Une erreur est survenue, si ce probleme persiste, contactez le support technique'),

View File

@@ -59,7 +59,7 @@ class PhraseanetExtension extends \Twig_Extension
{
return [
// change this version when you change JS file to force the navigation to reload js file
'jsFileVersion' => 13
'jsFileVersion' => 14
];
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2021-03-26T07:49:01Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<file date="2021-03-26T11:07:53Z" source-language="en" target-language="de" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2021-03-26T07:49:13Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<file date="2021-03-26T11:08:06Z" source-language="en" target-language="en" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2021-03-26T07:49:28Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<file date="2021-03-26T11:08:21Z" source-language="en" target-language="fr" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<xliff xmlns="urn:oasis:names:tc:xliff:document:1.2" xmlns:jms="urn:jms:translation" version="1.2">
<file date="2021-03-26T07:49:45Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<file date="2021-03-26T11:08:39Z" source-language="en" target-language="nl" datatype="plaintext" original="not.available">
<header>
<tool tool-id="JMSTranslationBundle" tool-name="JMSTranslationBundle" tool-version="1.1.0-DEV"/>
<note>The source node in most cases contains the sample message as written by the developer. If it looks like a dot-delimitted string such as "form.label.firstname", then the developer has not provided a default message.</note>

View File

@@ -1,10 +1,6 @@
{% macro add_publication(app) %}
<div id='DIALOG-expose-add' style="display: none">
<div class="expose-edit-wrapper" style="margin-top: 100px">
<br/>
<br/>
<br/>
<br/>
<div class="expose-edit-wrapper">
<form id="publication-data-form" >
<div class="edit-publication-block">
<div class="ui-widget">

View File

@@ -476,7 +476,9 @@
</div>
</div>
</div>
<div id='DIALOG-expose-edit' style="display: none"></div>
<div id='DIALOG-expose-edit'>
<div class="expose-edit-content" style="min-height: 522px;"></div>
</div>
{% import 'prod/WorkZone/ExposeNew.html.twig' as ExposeNew %}
{{ ExposeNew.add_publication(app) }}