hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-18 15:33:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into PHRAS-3129-worker-rabbit-not-up

Browse Source
This commit is contained in:
Nicolas Maillat
2021-01-06 17:34:13 +01:00
committed by GitHub
parent 93c32b9a11 bb8d89c61b
commit a8ea9cf1cd
4 changed files with 81 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Phraseanet-production-client/dist/production.js vendored
View File

@@ -10230,15 +10230,15 @@ var workzone = function workzone(services) {
selection: new _selectable2.default(services, (0, _jquery2.default)('#baskets'), { selector: '.CHIM' }), selection: new _selectable2.default(services, (0, _jquery2.default)('#baskets'), { selector: '.CHIM' }),
refresh: refreshBaskets, refresh: refreshBaskets,
addElementToBasket: function addElementToBasket(options) { addElementToBasket: function addElementToBasket(options) {
var sbas_id = options.sbas_id, var dbId = options.dbId,
record_id = options.record_id, recordId = options.recordId,
event = options.event, event = options.event,
singleSelection = options.singleSelection; singleSelection = options.singleSelection;
singleSelection = !!singleSelection || false; singleSelection = !!singleSelection || false;
if ((0, _jquery2.default)('#baskets .SSTT.active').length === 1) { if ((0, _jquery2.default)('#baskets .SSTT.active').length === 1) {
return dropOnBask(event, (0, _jquery2.default)('#IMGT_' + sbas_id + '_' + record_id), (0, _jquery2.default)('#baskets .SSTT.active'), singleSelection); return dropOnBask(event, (0, _jquery2.default)('#IMGT_' + dbId + '_' + recordId), (0, _jquery2.default)('#baskets .SSTT.active'), singleSelection);
} else { } else {
humane.info(localeService.t('noActiveBasket')); humane.info(localeService.t('noActiveBasket'));
} }
@@ -10397,7 +10397,7 @@ var workzone = function workzone(services) {
}); });
function WorkZoneElementRemover(el, confirm) { function WorkZoneElementRemover(el, confirm) {
var context = el.data('context'); var context = (0, _jquery2.default)(el).data('context');
if (confirm !== true && (0, _jquery2.default)(el).hasClass('groupings') && warnOnRemove) { if (confirm !== true && (0, _jquery2.default)(el).hasClass('groupings') && warnOnRemove) {
var buttons = {}; var buttons = {};
@@ -10519,7 +10519,9 @@ var workzone = function workzone(services) {
uiactive.addClass('ui-state-focus active'); uiactive.addClass('ui-state-focus active');
// reset selection when opening a basket type
workzoneOptions.selection.empty(); workzoneOptions.selection.empty();
appEvents.emit('broadcast.workzoneResultSelection', { asArray: [], serialized: "" });
getContent(uiactive); getContent(uiactive);
}, },
@@ -11125,6 +11127,8 @@ var workzone = function workzone(services) {
var publicationId = destKey.attr('data-publication-id'); var publicationId = destKey.attr('data-publication-id');
var exposeName = (0, _jquery2.default)('#expose_list').val(); var exposeName = (0, _jquery2.default)('#expose_list').val();
var assetsContainer = destKey.find('.expose_item_deployed'); var assetsContainer = destKey.find('.expose_item_deployed');
if (publicationId !== undefined) {
assetsContainer.empty().addClass('loading'); assetsContainer.empty().addClass('loading');
_jquery2.default.ajax({ _jquery2.default.ajax({
@@ -11146,6 +11150,7 @@ var workzone = function workzone(services) {
}); });
} }
} }
}
function fix() { function fix() {
_jquery2.default.ajax({ _jquery2.default.ajax({
@@ -63419,7 +63424,7 @@ var addToBasket = function addToBasket(services) {
var dbId = $el.data('db-id'); var dbId = $el.data('db-id');
var recordId = $el.data('record-id'); var recordId = $el.data('record-id');
appEvents.emit('workzone.doAddToBasket', { appEvents.emit('workzone.doAddToBasket', {
dbId: dbId, recordId: recordId, event: event.currentTarget dbId: dbId, recordId: recordId, event: event.currentTarget, singleSelection: true
}); });
}); });
}; };

15
Phraseanet-production-client/dist/production.min.js vendored
View File

@@ -10230,15 +10230,15 @@ var workzone = function workzone(services) {
selection: new _selectable2.default(services, (0, _jquery2.default)('#baskets'), { selector: '.CHIM' }), selection: new _selectable2.default(services, (0, _jquery2.default)('#baskets'), { selector: '.CHIM' }),
refresh: refreshBaskets, refresh: refreshBaskets,
addElementToBasket: function addElementToBasket(options) { addElementToBasket: function addElementToBasket(options) {
var sbas_id = options.sbas_id, var dbId = options.dbId,
record_id = options.record_id, recordId = options.recordId,
event = options.event, event = options.event,
singleSelection = options.singleSelection; singleSelection = options.singleSelection;
singleSelection = !!singleSelection || false; singleSelection = !!singleSelection || false;
if ((0, _jquery2.default)('#baskets .SSTT.active').length === 1) { if ((0, _jquery2.default)('#baskets .SSTT.active').length === 1) {
return dropOnBask(event, (0, _jquery2.default)('#IMGT_' + sbas_id + '_' + record_id), (0, _jquery2.default)('#baskets .SSTT.active'), singleSelection); return dropOnBask(event, (0, _jquery2.default)('#IMGT_' + dbId + '_' + recordId), (0, _jquery2.default)('#baskets .SSTT.active'), singleSelection);
} else { } else {
humane.info(localeService.t('noActiveBasket')); humane.info(localeService.t('noActiveBasket'));
} }
@@ -10397,7 +10397,7 @@ var workzone = function workzone(services) {
}); });
function WorkZoneElementRemover(el, confirm) { function WorkZoneElementRemover(el, confirm) {
var context = el.data('context'); var context = (0, _jquery2.default)(el).data('context');
if (confirm !== true && (0, _jquery2.default)(el).hasClass('groupings') && warnOnRemove) { if (confirm !== true && (0, _jquery2.default)(el).hasClass('groupings') && warnOnRemove) {
var buttons = {}; var buttons = {};
@@ -10519,7 +10519,9 @@ var workzone = function workzone(services) {
uiactive.addClass('ui-state-focus active'); uiactive.addClass('ui-state-focus active');
// reset selection when opening a basket type
workzoneOptions.selection.empty(); workzoneOptions.selection.empty();
appEvents.emit('broadcast.workzoneResultSelection', { asArray: [], serialized: "" });
getContent(uiactive); getContent(uiactive);
}, },
@@ -11125,6 +11127,8 @@ var workzone = function workzone(services) {
var publicationId = destKey.attr('data-publication-id'); var publicationId = destKey.attr('data-publication-id');
var exposeName = (0, _jquery2.default)('#expose_list').val(); var exposeName = (0, _jquery2.default)('#expose_list').val();
var assetsContainer = destKey.find('.expose_item_deployed'); var assetsContainer = destKey.find('.expose_item_deployed');
if (publicationId !== undefined) {
assetsContainer.empty().addClass('loading'); assetsContainer.empty().addClass('loading');
_jquery2.default.ajax({ _jquery2.default.ajax({
@@ -11146,6 +11150,7 @@ var workzone = function workzone(services) {
}); });
} }
} }
}
function fix() { function fix() {
_jquery2.default.ajax({ _jquery2.default.ajax({
@@ -63419,7 +63424,7 @@ var addToBasket = function addToBasket(services) {
var dbId = $el.data('db-id'); var dbId = $el.data('db-id');
var recordId = $el.data('record-id'); var recordId = $el.data('record-id');
appEvents.emit('workzone.doAddToBasket', { appEvents.emit('workzone.doAddToBasket', {
dbId: dbId, recordId: recordId, event: event.currentTarget dbId: dbId, recordId: recordId, event: event.currentTarget, singleSelection: true
}); });
}); });
}; };

2
Phraseanet-production-client/src/components/record/addToBasket.js
View File

@@ -11,7 +11,7 @@ const addToBasket = (services) => {
let dbId = $el.data('db-id'); let dbId = $el.data('db-id');
let recordId = $el.data('record-id'); let recordId = $el.data('record-id');
appEvents.emit('workzone.doAddToBasket', { appEvents.emit('workzone.doAddToBasket', {
dbId, recordId, event: event.currentTarget dbId, recordId, event: event.currentTarget, singleSelection: true
}); });
}); });
}; };

11
Phraseanet-production-client/src/components/ui/workzone/index.js
View File

@@ -214,11 +214,11 @@ const workzone = (services) => {
selection: new Selectable(services, $('#baskets'), {selector: '.CHIM'}), selection: new Selectable(services, $('#baskets'), {selector: '.CHIM'}),
refresh: refreshBaskets, refresh: refreshBaskets,
addElementToBasket: function (options) { addElementToBasket: function (options) {
let {sbas_id, record_id, event, singleSelection} = options; let {dbId, recordId, event, singleSelection} = options;
singleSelection = !!singleSelection || false; singleSelection = !!singleSelection || false;
if ($('#baskets .SSTT.active').length === 1) { if ($('#baskets .SSTT.active').length === 1) {
return dropOnBask(event, $('#IMGT_' + sbas_id + '_' + record_id), $('#baskets .SSTT.active'), singleSelection); return dropOnBask(event, $('#IMGT_' + dbId + '_' + recordId), $('#baskets .SSTT.active'), singleSelection);
} else { } else {
humane.info(localeService.t('noActiveBasket')); humane.info(localeService.t('noActiveBasket'));
} }
@@ -373,7 +373,7 @@ const workzone = (services) => {
}); });
function WorkZoneElementRemover(el, confirm) { function WorkZoneElementRemover(el, confirm) {
var context = el.data('context'); var context = $(el).data('context');
if (confirm !== true && $(el).hasClass('groupings') && warnOnRemove) { if (confirm !== true && $(el).hasClass('groupings') && warnOnRemove) {
var buttons = {}; var buttons = {};
@@ -500,7 +500,9 @@ const workzone = (services) => {
uiactive.addClass('ui-state-focus active'); uiactive.addClass('ui-state-focus active');
// reset selection when opening a basket type
workzoneOptions.selection.empty(); workzoneOptions.selection.empty();
appEvents.emit('broadcast.workzoneResultSelection', {asArray:[], serialized:""});
getContent(uiactive); getContent(uiactive);
@@ -1129,6 +1131,8 @@ const workzone = (services) => {
let publicationId = destKey.attr('data-publication-id'); let publicationId = destKey.attr('data-publication-id');
let exposeName = $('#expose_list').val(); let exposeName = $('#expose_list').val();
let assetsContainer = destKey.find('.expose_item_deployed'); let assetsContainer = destKey.find('.expose_item_deployed');
if (publicationId !== undefined) {
assetsContainer.empty().addClass('loading'); assetsContainer.empty().addClass('loading');
$.ajax({ $.ajax({
@@ -1151,6 +1155,7 @@ const workzone = (services) => {
}); });
} }
} }
}
function fix() { function fix() {
$.ajax({ $.ajax({