Changeset 13008

Timestamp:

03/10/08 15:07:23 (10 months ago)

Author:

jaredj

Message:

Adding in patch for getLabel provided by wolfram. refs #5257 \!strict

Location:

dojox/trunk/data

Files:

• QueryReadStore.js (modified) (4 diffs)
• tests/stores/QueryReadStore.js (modified) (2 diffs)

dojox/trunk/data/QueryReadStore.js

@@ -83 +83 @@
 
         _features: {'dojo.data.api.Read':true, 'dojo.data.api.Identity':true},
+
+        _labelAttr: "label",
         
         constructor: function(/* Object */ params){
@@ -107 +109 @@
         
         getValues: function(/* item */ item, /* attribute-name-string */ attribute){
+                this._assertIsItem(item);
                 var ret = [];
                 if(this.hasAttribute(item, attribute)){
@@ -255 +258 @@
 
         getLabel: function(/* item */ item){
-                // Override it to return whatever the label shall be, see Read-API.
-                return undefined;
+                //      summary:
+                //              See dojo.data.api.Read.getLabel()
+                if(this._labelAttr && this.isItem(item)){
+                        return this.getValue(item, this._labelAttr); //String
+                }
+                return undefined; //undefined
         },
 
         getLabelAttributes: function(/* item */ item){
-                return null;
-        },
+                //      summary:
+                //              See dojo.data.api.Read.getLabelAttributes()
+                if(this._labelAttr){
+                        return [this._labelAttr]; //array
+                }
+                return null; //null
+        },
         
         _fetchItems: function(request, fetchHandler, errorHandler){
@@ -311 +323 @@
                         var xhrHandler = xhrFunc({url:this.url, handleAs:"json-comment-optional", content:serverQuery});
                         xhrHandler.addCallback(dojo.hitch(this, function(data){
-                                data=this._filterResponse(data);
+                                data = this._filterResponse(data);
+                                if (data.label){
+                                        this._labelAttr = data.label;
+                                }
                                 var numRows = data.numRows || -1;
 

dojox/trunk/data/tests/stores/QueryReadStore.js

@@ -70 +70 @@
                                 // Test for not-existing attributes without defaultValues and invalid items.
                                 // TODO
-                                t.assertEqual([], store, "getValues", [item, "NOT THERE"]);
-                                t.assertEqual([], store, "getValues", ["not an item", "NOT THERE"]);
-                                
+                                t.assertEqual([], store.getValues(item, "NOT THERE"));
+                                var errThrown = false;
+                                try{
+                                        //Should throw an exception.
+                                        var values = store.getValues("not an item", "NOT THERE");
+                                }catch (e){
+                                        errThrown = true;
+                                }
+                                t.assertTrue(errThrown);
                                 d.callback(true);
                         }
@@ -88 +94 @@
                                 var item = items[0];
                                 // The good case(s).
-                                t.assertEqual(['name', 'label', 'abbreviation'], store.getAttributes(item));
+                                t.assertEqual(['id', 'name', 'label', 'abbreviation'], store.getAttributes(item));
                                 t.assertError(Error, store, "getAttributes", [{}]);
                                 
+                                d.callback(true);
+                        }
+                        store.fetch({query:{q:"Alabama"}, onComplete: onComplete});
+                        return d; //Object
+                },
+
+                function testReadApi_getLabel(t){
+                        var store = dojox.data.tests.stores.QueryReadStore.getStore();
+                        var d = new doh.Deferred();
+                        function onComplete(items, request){
+                                var item = items[0];
+                                // The good cases.
+                                t.assertEqual(["<img src='images/Alabama.jpg'/>Alabama"], store.getLabel(item));
                                 d.callback(true);
                         }