Commit 148b6462 authored by Pedro Eduardo Trujillo's avatar Pedro Eduardo Trujillo
Browse files

Permite borrar DataDefs, arregla bugs de Browser 

La emisión de ciertos eventos estaba mal preparada, porque no se enviaba
el valor del argumento original sino la respuesta del método original
(aspect.after funciona así).
Además, se elimina funcionalidad de selección en el step de formulario
con listado y se corrige plantilla para mostrar la z.
parent f10cca41

public/javascript/app/base/views/extensions/_EditionFormList.js

+3 −30
Original line number Diff line number Diff line 
define([

	"app/base/views/extensions/_LocalSelectionView"

	"app/base/views/extensions/_Edition"

	, "dojo/_base/declare"

	, "dojo/_base/lang"

	, "dojo/aspect"

	, "redmic/modules/base/_Store"

	, "redmic/modules/browser/_Select"

	, "app/base/views/extensions/_Edition"

], function(

	_LocalSelectionView

	_Edition

	, declare

	, lang

	, aspect

	, _Store

	, _Select

	, _Edition

){

	return declare([_Store, _Edition, _LocalSelectionView], {

	return declare([_Store, _Edition], {

		//	summary:

		//		Extensión para las vistas de edición de datos.

		//	description:
@@ -43,7 +39,6 @@ define([ 


			lang.mixin(this, this.config);



			aspect.before(this, "_afterSetConfigurations", this._setEditionFormListConfigurations);

			aspect.before(this, "_createFormSubscriptions", this._addEditionFormSubscriptions);

		},
@@ -62,18 +57,6 @@ define([ 
			}]);

		},



		_setEditionFormListConfigurations: function() {



			this.browserConfig = this._merge([{

				browserExts: [_Select],

				browserConfig: {

					selectorChannel: this.getChannel(),

					noSeeSelect: true,

					simpleSelection: true

				}

			}, this.browserConfig || {}]);

		},



		_getBrowserConfig: function() {



			return this.browserConfig.browserConfig;
@@ -116,7 +99,6 @@ define([ 
		_itemAvailable: function(response) {



			if (response.target == this.target) {



				var item = lang.clone(response.data);



				if (this.type === "copy") {
@@ -126,15 +108,6 @@ define([ 
				this._emitEvt('SHOW_FORM', {

					data: item

				});



				this._publish(this.getChannel("SELECTED"), {

					"success": true,

					"body": {

						"ids": [item[this.idProperty]],

						"selectionTarget": this.getChannel(),

						"total": 1

					}

				});

			} else {

				this.inherited(arguments);

			}

public/javascript/app/designs/formList/main/FormListByStep.js

+1 −1
Original line number Diff line number Diff line
@@ -118,7 +118,7 @@ define([ 


		_listDataRemoved: function(response) {



			var removedItemId = response[this.idProperty] || response;

			var removedItemId = response.idProperty || response;



			this._removeItemFromResults(removedItemId);

			this._emitRemoveItem(removedItemId);

public/javascript/redmic/modules/browser/Browser.js

+20 −4
Original line number Diff line number Diff line
@@ -78,11 +78,27 @@ define([ 


			lang.mixin(this, this.config, args);



			aspect.after(this, "_addData", lang.hitch(this, this._emitEvt, 'REFRESH_COMPLETE'));

			aspect.after(this, "_addItem", lang.hitch(this, this._emitEvt, 'DATA_ADDED'));

			aspect.after(this, "_removeItem", lang.hitch(this, this._emitEvt, 'DATA_REMOVED'));

			aspect.after(this, "_addData", lang.hitch(this, function(originalReturn, originalArgs) {



				this._emitEvt('REFRESH_COMPLETE', originalArgs[0]);

			}));



			aspect.after(this, "_addItem", lang.hitch(this, function(originalReturn, originalArgs) {



				this._emitEvt('DATA_ADDED', originalArgs[0]);

			}));



			aspect.after(this, "_removeItem", lang.hitch(this, function(originalReturn, originalArgs) {



				this._emitEvt('DATA_REMOVED', { idProperty: originalArgs[0] });

			}));



			aspect.after(this, "_clearData", lang.hitch(this, this._emitEvt, 'CLEARED'));

			aspect.after(this, "_updateTemplate", lang.hitch(this, this._emitEvt, 'TEMPLATE_UPDATED'));



			aspect.after(this, "_updateTemplate", lang.hitch(this, function(originalReturn, originalArgs) {



				this._emitEvt('TEMPLATE_UPDATED', originalArgs[0]);

			}));

		},



		_defineSubscriptions: function () {

templates @ b1d044a9

Compare 7ca95417 to b1d044a9
Original line number Diff line number Diff line 
Subproject commit 7ca954175cc09b81b0985f9547b66cb249fa9cdf
 
Subproject commit b1d044a9975009479da678cf5ade1b4e15352cb1