Commit 0d1d031f authored by Noel Alonso's avatar Noel Alonso
Browse files

Merge branch 'feature-AtlasServiceUpgrade' of... 

Merge branch 'feature-AtlasServiceUpgrade' of gitlab.com:redmic-project/client/web into feature-AtlasServiceUpgrade
parents 8054dcdb 55820d10

public/javascript/app/designs/textSearchList/main/Selection.js

+2 −1
Original line number Diff line number Diff line
@@ -94,6 +94,7 @@ define([ 
		_subUpdateTarget: function(res) {



			this.target = res.target;

			this.editionTarget = res.editionTarget;



			this._emitEvt('UPDATE_TARGET', res);

		},
@@ -121,7 +122,7 @@ define([ 
				lang.hitch(this, function(id) {



					this._emitEvt('REMOVE', {

						target: this.target,

						target: this.editionTarget,

						id: id

					});

				}, data.id),

public/javascript/redmic/modules/selection/SelectionManager.js

+5 −2
Original line number Diff line number Diff line
@@ -240,10 +240,12 @@ define([ 


		_subSelectionsTargetRetrieved: function(res) {



			var selectionTarget = res.target;

			var selectionTarget = res.target,

				selectionEditionTarget = res.editionTarget;



			if (!this._loadSelection) {

				this.loadSelectionConfig.target = selectionTarget;

				this.loadSelectionConfig.editionTarget = selectionEditionTarget;



				var SelectionDefinition = declare(Selection).extend(_ShowInPopup);

				this._loadSelection = new SelectionDefinition(this.loadSelectionConfig);
@@ -252,7 +254,8 @@ define([ 
					this._subSelectionLoad));

			} else {

				this._publish(this._loadSelection.getChannel('UPDATE_TARGET'), {

					target: selectionTarget

					target: selectionTarget,

					editionTarget: selectionEditionTarget

				});

			}

public/javascript/redmic/modules/selection/_SelectorPersistence.js

+7 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ define([ 
			groupSelected: 'view',

			storeSelection: 'commands',

			retrieveSelectionsTarget: 'view',

			retrieveSelectionsEditionTarget: 'commands',

			cloneSelection: 'commands'

		},
@@ -382,11 +383,15 @@ define([ 
		_retrieveSelectionsTarget: function(req) {



			var target = req.target,

				editionTarget = req.editionTarget,

				action = this.actions.RETRIEVE_SELECTIONS_TARGET,

				selectionTarget = this._getSelectionTarget(action, target);

				editionAction = 'retrieveSelectionsEditionTarget',

				selectionTarget = this._getSelectionTarget(action, target),

				selectionEditionTarget = this._getSelectionTarget(editionAction, target);



			this._emitEvt('RETRIEVE_SELECTIONS_TARGET', {

				target: selectionTarget

				target: selectionTarget,

				editionTarget: selectionEditionTarget

			});

		},

public/javascript/redmic/modules/store/RequestJoiner/AtlasDataImpl.js

+4 −0
Original line number Diff line number Diff line
@@ -144,6 +144,10 @@ define([ 
				ids.push(categoryId);

			}



			if (!ids.length) {

				return;

			}



			return this._merge([{

				queryParams: {

					ids: ids

public/javascript/redmic/modules/store/RequestJoiner/RequestJoiner.js

+8 −2
Original line number Diff line number Diff line
@@ -95,9 +95,15 @@ define([ 
				if (i > 0) {

					dfds[i - 1].then(lang.hitch(this, function(target, queryObj, prevRes) {



						var expandedQueryObj = this._expandQueryWithPreviousResponse(target, queryObj, prevRes),

							reqParams = this._getRequestParams(target, expandedQueryObj);

						var expandedQueryObj = this._expandQueryWithPreviousResponse(target, queryObj, prevRes);



						if (!expandedQueryObj) {

							var dfd = this._responsePromises[target];

							dfd.reject();

							return;

						}



						var reqParams = this._getRequestParams(target, expandedQueryObj);

						this._emitEvt('REQUEST', reqParams);

					}, target, queryObj));

				} else {