Attachment 4250 Details for Bug 26363

[patch] Labels for MultiObjectSelect

labels-for-multiobjectselect.patch (text/plain), 5.38 KB, created by Andreas Büsching on 2012-03-05 16:21 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Andreas Büsching

Created: 2012-03-05 16:21 CET

Size: 5.38 KB

patch

obsolete

>Index: umc/widgets/MultiObjectSelect.js
>===================================================================
>--- umc/widgets/MultiObjectSelect.js	(Revision 31217)
>+++ umc/widgets/MultiObjectSelect.js	(Arbeitskopie)
>@@ -40,6 +40,8 @@
> dojo.require("umc.widgets._FormWidgetMixin");
> dojo.require("umc.widgets._WidgetsInWidgetsMixin");
> 
>+dojo.require("dojo.store.DataStore");
>+
> dojo.declare("umc.widgets.MultiObjectSelect", [ umc.widgets.ContainerWidget, umc.i18n.Mixin, umc.widgets._FormWidgetMixin ], {
> 	// summary:
> 	//		???
>@@ -66,18 +68,19 @@
> 	// the widget's class name as CSS class
> 	'class': 'umcMultiObjectSelect',
> 
>-	// internal reference to all values
>-	_values: [],
>-
> 	// internal reference to the parsed formatter function
> 	_formatter: function(ids) { return ids; },
> 
>+	// object store adapter for the data store of the MultiSelect widget
>+	_objectStore: null,
>+
> 	// reference to the MultiSelect widget
> 	_multiSelect: null,
> 
> 	// reference to the detail dialog
> 	_detailDialog: null,
> 
>+	// encapsulate the data store fo the multi select widget
> 	postMixInProperties: function() {
> 		this.inherited(arguments);
> 
>@@ -90,11 +93,21 @@
> 		this._formatter = umc.tools.stringOrFunction(this.formatter);
> 	},
> 
>+	_attachObjectStore: function() {
>+		this._objectStore = new dojo.store.DataStore( {
>+			store: this._multiSelect.store
>+		} );
>+	},
>+
> 	buildRendering: function() {
> 		this.inherited(arguments);
> 
> 		// add the MultiSelect widget
> 		this._multiSelect = new umc.widgets.MultiSelect({});
>+		this._attachObjectStore();
>+		if ( 'setStore' in this._multiSelect ) {
>+			dojo.connect( this._multiSelect, 'setStore', this, '_attachObjectStore' );
>+		}
> 		var container = new umc.widgets.ContainerWidget({});
> 		container.addChild(this._multiSelect);
> 		this.addChild(container);
>@@ -138,14 +151,15 @@
> 			// callback handler
> 			this._multiSelect.set('staticValues', values);
> 		}));
>-
>-		// cache the specified values for any case
>-		this._values = _values;
> 	},
> 
> 	_getValueAttr: function() {
> 		// return a copy
>-		return dojo.clone(this._values);
>+		var values = [];
>+		this._objectStore.query( {} ).map( function( item ) {
>+			values.push( item.id );
>+		} );
>+		return values;
> 	},
> 
> 	getQueryWidget: function(name) {
>@@ -154,39 +168,28 @@
> 		return this._detailDialog._form.getWidget(name);
> 	},
> 
>-	_addElements: function(values) {
>-		// get all current entries
>-		var newValues = this._values;
>-		var map = {};
>-		dojo.forEach(newValues, function(iid) {
>-			map[iid] = true;
>-		});
>-
>+	_addElements: function( ids ) {
> 		// only add elements that do not exist already
>-		dojo.forEach(values, function(iid) {
>-			if (!(iid in map)) {
>-				newValues.push(iid);
>+		var dialog_store = dojo.store.DataStore( { store: this._detailDialog._multiSelect.store } );
>+		dojo.forEach( ids , dojo.hitch( this, function( id ) {
>+			var item = dialog_store.get( id );
>+			try {
>+				this._objectStore.get( id );
>+			} catch( e ) {
>+				// object does not exist ...
>+				this._objectStore.put( item );
> 			}
>-		});
>-
>-		// save the new values
>-		this.set('value', newValues);
>+		} ) );
>+		this._multiSelect.store.save();
> 	},
> 
> 	_removeSelectedElements: function() {
> 		// create a dict for all selected elements
>-		var selection = {};
>-		dojo.forEach(this._multiSelect.get('value'), function(iid) {
>-			selection[iid] = true;
>-		});
>-
>-		// get all items
>-		var newValues = dojo.filter(this.get('value'), function(iid) {
>-			return !(iid in selection);
>-		});
>-
>-		// set the new values
>-		this.set('value', newValues);
>+		dojo.forEach(this._multiSelect.getSelectedItems(), dojo.hitch( this, function( iid ) {
>+			this._objectStore.remove( iid.id );
>+		} ) );
>+		this._multiSelect.selection.clear();
>+		this._multiSelect.store.save();
> 	},
> 
> 	uninitialize: function() {
>Index: umc/widgets/_SelectMixin.js
>===================================================================
>--- umc/widgets/_SelectMixin.js	(Revision 31217)
>+++ umc/widgets/_SelectMixin.js	(Arbeitskopie)
>@@ -229,22 +229,14 @@
> 	},
> 
> 	_clearValues: function() {
>-		if ('setStore' in this) {
>-			// there is a method 'setStore' (data grids) which can be used to create a new store object
>-			var newStore = this._createStore();
>-			this.setStore(newStore, {});
>-		}
>-		else {
>-			// otherwise (combo box) clear the store as described in:
>-			//   http://mail.dojotoolkit.org/pipermail/dojo-interest/2011-January/052159.html
>-			this.store.save();
>-			this.store.data = {
>-				identifier: 'id',
>-				label: 'label',
>-				items: []
>-			};
>-			this.store.close();
>-		}
>+		this.store.fetch( { 
>+			onComplete: dojo.hitch( this, function( items ) {
>+				dojo.forEach( items, dojo.hitch( this, function( item ) {
>+					this.store.deleteItem( item );
>+				} ) )
>+			} )
>+		} );
>+		this.store.save();
> 
> 		//if (this._isAutoValue) {
> 		//	// reset the _initialValue in case we chose it automatically
>Index: umc/widgets/MultiSelect.js
>===================================================================
>--- umc/widgets/MultiSelect.js	(Revision 31217)
>+++ umc/widgets/MultiSelect.js	(Arbeitskopie)
>@@ -77,15 +77,15 @@
> 	height: '110px',
> 
> 	postMixInProperties: function() {
>+		// initiate a new Deferred object
>+		this._loadingDeferred = new dojo.Deferred();
>+
> 		this.inherited(arguments);
> 
> 		// in case 'value' is not specified, generate a new array
> 		if (!dojo.isArray(this.value)) {
> 			this.value = [];
> 		}
>-
>-		// initiate a new Deferred object
>-		this._loadingDeferred = new dojo.Deferred();
> 	},
> 
> 	postCreate: function() {

Actions: View | Diff

Attachments on bug 26363: 4250