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

Phraseanet-production-client/config/config.js

@@ -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
 };

Phraseanet-production-client/dist/authenticate.js

@@ -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() {

Phraseanet-production-client/dist/authenticate.min.js

@@ -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() {

Phraseanet-production-client/dist/commons.js

@@ -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() {

Phraseanet-production-client/dist/commons.min.js

@@ -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() {

Phraseanet-production-client/dist/production.js

@@ -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,7 +60838,9 @@ 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();
 
+        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
@@ -60832,6 +60854,7 @@ var Feedback = function Feedback(services, options) {
                     (0, _jquery2.default)('#newParticipantsUser').val('');
                 }
             }
+        }
 
         $elem.fadeOut(function () {
             $elem.remove();

Phraseanet-production-client/dist/production.min.js

@@ -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,7 +60838,9 @@ 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();
 
+        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
@@ -60832,6 +60854,7 @@ var Feedback = function Feedback(services, options) {
                     (0, _jquery2.default)('#newParticipantsUser').val('');
                 }
             }
+        }
 
         $elem.fadeOut(function () {
             $elem.remove();

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

@@ -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,7 +389,9 @@ 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();
 
+        if (action == 'adduser') {
             let value = $('#newParticipantsUser').val();
             let actualParticipantsName = value.split('; ');
             // remove the user in the list of new participant if yet exist
@@ -383,6 +405,7 @@ const Feedback = function (services, options) {
                     $('#newParticipantsUser').val('');
                 }
             }
+        }
 
         $elem.fadeOut(function () {
             $elem.remove();

lib/Alchemy/Phrasea/Twig/PhraseanetExtension.php

@@ -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
         ];
 
     }