[yt-svn] commit/yt: MatthewTurk: Fixing up pending request dialog.

[Bitbucket]

1 new commit in yt:


https://bitbucket.org/yt_analysis/yt/changeset/d7a50cabd927/
changeset:   d7a50cabd927
branch:      yt
user:        MatthewTurk
date:        2012-06-28 12:41:04
summary:     Fixing up pending request dialog.
affected #:  3 files

diff -r 08085707319e370ca65caf0ebded46b0d20e1c95 -r d7a50cabd927973502663659d0a99920026a9da6 yt/gui/reason/html/app/controller/Notebook.js
--- a/yt/gui/reason/html/app/controller/Notebook.js
+++ b/yt/gui/reason/html/app/controller/Notebook.js
@@ -72,9 +72,10 @@
         this.callParent(arguments);
     },
 
-    addRequest: function(request_id) {
+    addRequest: function(request_id, command) {
+        console.log("Adding request " + request_id);
         this.getRequestsStore().add({
-            request_id: request_id, pending: true,
+            request_id: request_id, command: command,
         });
     },
 
@@ -82,11 +83,11 @@
         this.application.fireEvent("wipeinput");
         this.application.fireEvent("allowinput");
         if (cell['result_id'] != null) {
+            console.log("Turning off result_id " + cell['result_id']);
             var ind = this.getRequestsStore().find(
                 'request_id', cell['result_id']);
             if (ind != -1) {
-                var rec = this.getRequestsStore().getAt(ind);
-                rec.data.pending = false;
+                var rec = this.getRequestsStore().removeAt(ind);
             }
             reason.pending.update([this.getRequestsStore().count()]);
         }


diff -r 08085707319e370ca65caf0ebded46b0d20e1c95 -r d7a50cabd927973502663659d0a99920026a9da6 yt/gui/reason/html/app/controller/ServerCommunication.js
--- a/yt/gui/reason/html/app/controller/ServerCommunication.js
+++ b/yt/gui/reason/html/app/controller/ServerCommunication.js
@@ -107,7 +107,7 @@
         result_id = reason.numberOfRequests + 1;
         reason.numberOfRequests += 1;
         console.log("Number of requests: " + reason.numberOfRequests);
-        reason.getController("Notebook").addRequest(result_id);
+        reason.getController("Notebook").addRequest(result_id, code);
         yt_rpc.ExtDirectREPL.execute({
             code: code,
             hide:hide,


diff -r 08085707319e370ca65caf0ebded46b0d20e1c95 -r d7a50cabd927973502663659d0a99920026a9da6 yt/gui/reason/html/app/store/Requests.js
--- a/yt/gui/reason/html/app/store/Requests.js
+++ b/yt/gui/reason/html/app/store/Requests.js
@@ -32,10 +32,7 @@
 Ext.define('Reason.store.Requests', {
     extend: 'Ext.data.Store',
     id: 'requestsstore',
-    fields: ['request_id',
-             { name: 'pending', type: 'bool' }
-    ],
-    filters: [ { property: 'pending', value: true, } ],
+    fields: ['request_id', 'command'],
     data: [],
 });

Repository URL: https://bitbucket.org/yt_analysis/yt/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.