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

Merge branch 'master' into PHRAS-3445-fix-recordEdit-worker

Browse Source
This commit is contained in:
Nicolas Maillat
2021-05-28 15:34:50 +02:00
committed by GitHub
parent fa977e1cd5 0c5ba091c8
commit 3bc93c4bcb
9 changed files with 108 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Phraseanet-production-client/config/config.js
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: 19
jsFileVersion: 20
};

2
Phraseanet-production-client/dist/authenticate.js vendored
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=19";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=20";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/authenticate.min.js vendored
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=19";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=20";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.js vendored
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=19";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".js?v=20";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

2
Phraseanet-production-client/dist/commons.min.js vendored
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=19";
/******/ script.src = __webpack_require__.p + "lazy-" + ({}[chunkId]||chunkId) + ".min.js?v=20";
/******/ var timeout = setTimeout(onScriptComplete, 120000);
/******/ script.onerror = script.onload = onScriptComplete;
/******/ function onScriptComplete() {

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

@@ -60539,6 +60539,26 @@ var Feedback = function Feedback(services, options) {
_.each((0, _jquery2.default)('.badges.selectionnable').children(), function (item) {
var $elem = (0, _jquery2.default)(item);
if ($elem.hasClass('selected')) {
var userEmail = $elem.find('.user-email').val();
var action = (0, _jquery2.default)('input[name="feedbackAction"]').val();
if (action == 'adduser') {
var value = (0, _jquery2.default)('#newParticipantsUser').val();
var actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
var key = _jquery2.default.inArray(userEmail, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
(0, _jquery2.default)('#newParticipantsUser').val(value);
} else {
(0, _jquery2.default)('#newParticipantsUser').val('');
}
}
}
$elem.fadeOut(function () {
$elem.remove();
});
@@ -60818,18 +60838,21 @@ var Feedback = function Feedback(services, options) {
this.container.on('click', '.user_content .badges .badge .deleter', function (event) {
var $elem = (0, _jquery2.default)(this).closest('.badge');
var userEmailEl = $elem.find('.user-email').val();
var action = (0, _jquery2.default)('input[name="feedbackAction"]').val();
var value = (0, _jquery2.default)('#newParticipantsUser').val();
var actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
var key = _jquery2.default.inArray(userEmailEl, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
(0, _jquery2.default)('#newParticipantsUser').val(value);
} else {
(0, _jquery2.default)('#newParticipantsUser').val('');
if (action == 'adduser') {
var value = (0, _jquery2.default)('#newParticipantsUser').val();
var actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
var key = _jquery2.default.inArray(userEmailEl, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
(0, _jquery2.default)('#newParticipantsUser').val(value);
} else {
(0, _jquery2.default)('#newParticipantsUser').val('');
}
}
}

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

@@ -60539,6 +60539,26 @@ var Feedback = function Feedback(services, options) {
_.each((0, _jquery2.default)('.badges.selectionnable').children(), function (item) {
var $elem = (0, _jquery2.default)(item);
if ($elem.hasClass('selected')) {
var userEmail = $elem.find('.user-email').val();
var action = (0, _jquery2.default)('input[name="feedbackAction"]').val();
if (action == 'adduser') {
var value = (0, _jquery2.default)('#newParticipantsUser').val();
var actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
var key = _jquery2.default.inArray(userEmail, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
(0, _jquery2.default)('#newParticipantsUser').val(value);
} else {
(0, _jquery2.default)('#newParticipantsUser').val('');
}
}
}
$elem.fadeOut(function () {
$elem.remove();
});
@@ -60818,18 +60838,21 @@ var Feedback = function Feedback(services, options) {
this.container.on('click', '.user_content .badges .badge .deleter', function (event) {
var $elem = (0, _jquery2.default)(this).closest('.badge');
var userEmailEl = $elem.find('.user-email').val();
var action = (0, _jquery2.default)('input[name="feedbackAction"]').val();
var value = (0, _jquery2.default)('#newParticipantsUser').val();
var actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
var key = _jquery2.default.inArray(userEmailEl, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
(0, _jquery2.default)('#newParticipantsUser').val(value);
} else {
(0, _jquery2.default)('#newParticipantsUser').val('');
if (action == 'adduser') {
var value = (0, _jquery2.default)('#newParticipantsUser').val();
var actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
var key = _jquery2.default.inArray(userEmailEl, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
(0, _jquery2.default)('#newParticipantsUser').val(value);
} else {
(0, _jquery2.default)('#newParticipantsUser').val('');
}
}
}

45
Phraseanet-production-client/src/components/record/recordPush/feedback.js
View File

@@ -82,6 +82,26 @@ const Feedback = function (services, options) {
_.each($('.badges.selectionnable').children(), function(item) {
var $elem = $(item);
if($elem.hasClass('selected')) {
let userEmail = $elem.find('.user-email').val();
let action = $('input[name="feedbackAction"]').val();
if (action == 'adduser') {
let value = $('#newParticipantsUser').val();
let actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
let key = $.inArray(userEmail, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
$('#newParticipantsUser').val(value);
} else {
$('#newParticipantsUser').val('');
}
}
}
$elem.fadeOut(function () {
$elem.remove();
});
@@ -369,18 +389,21 @@ const Feedback = function (services, options) {
this.container.on('click', '.user_content .badges .badge .deleter', function (event) {
var $elem = $(this).closest('.badge');
let userEmailEl = $elem.find('.user-email').val();
let action = $('input[name="feedbackAction"]').val();
let value = $('#newParticipantsUser').val();
let actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
let key = $.inArray(userEmailEl, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
$('#newParticipantsUser').val(value);
} else {
$('#newParticipantsUser').val('');
if (action == 'adduser') {
let value = $('#newParticipantsUser').val();
let actualParticipantsName = value.split('; ');
// remove the user in the list of new participant if yet exist
let key = $.inArray(userEmailEl, actualParticipantsName);
if (key > -1) {
actualParticipantsName.splice(key, 1);
if (actualParticipantsName.length != 0) {
value = actualParticipantsName.join('; ');
$('#newParticipantsUser').val(value);
} else {
$('#newParticipantsUser').val('');
}
}
}

2
lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php
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' => 19
'jsFileVersion' => 20
];
}