fixed issues #237 #255 #252

MeYoung · Aug 28, 2013 · 57c8083 · 57c8083
1 parent 6e13adf
commit 57c8083
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 14 deletions.
diff --git a/appWrapper.js b/appWrapper.js
@@ -42,15 +42,15 @@ common.parseConfig(function(){
         killTree: true,
         'outFile': logPath+'/app.out.log',
         'errFile': logPath+'/app.err.log',
-        pidFile: "app.pid"
+        //pidFile: "app.pid"
     });
 
     var dbChild = forever.start([ dbPath,"--port",common.Config.DBPort,"--dbpath",dataPath,"--journal"], {
         max : 1,
         silent : false,
         'outFile': logPath+'/db.out.log',
         'errFile': logPath+'/db.err.log',
-        pidFile: "db.pid"
+        //pidFile: "db.pid"
     });
 
     var dbStarted = false;
@@ -85,17 +85,17 @@ common.parseConfig(function(){
 
     });
 
-    /*
+
     setTimeout(function(){
-        console.log(process.pid);
         console.log(dbChild.child.pid);
         console.log(appChild.child.pid);
 
         storedPids.push(dbChild.child.pid);
         storedPids.push(appChild.child.pid);
-        fs.writeFileSync(__dirname+"/app.pid",process.pid+"\r\n"+dbChild.child.pid +"\r\n"+appChild.child.pid);
+        fs.writeFileSync(__dirname+"/app.pid",appChild.child.pid);
+        fs.writeFileSync(__dirname+"/db.pid",dbChild.child.pid);
     },40000);
-    */
+
 });
 
 

diff --git a/public/view/ActionCollection.js b/public/view/ActionCollection.js
@@ -335,14 +335,16 @@ Ext.define('Redwood.view.ActionCollection', {
 
             }],
             listeners:{
-                datachanged:function(){
+                update:function( tree, record, operation, modifiedFieldNames){
+                    if ((modifiedFieldNames == null) ||(modifiedFieldNames == [])) return;
                     if ((me.markDirty)&&(me.loadingData == false)){
-                        me.markDirty()
-                    }
-                },
-                update:function(){
-                    if ((me.markDirty)&&(me.loadingData == false)){
-                        me.markDirty()
+                        var dontModify = false;
+                        modifiedFieldNames.forEach(function(field){
+                            if((field == "loaded") ||(field == "expanded")) dontModify = true;
+                        });
+                        if(dontModify == false){
+                            me.markDirty()
+                        }
                     }
                 }
             },

diff --git a/public/view/AggregateReport.js b/public/view/AggregateReport.js
@@ -255,7 +255,7 @@ Ext.define('Redwood.view.AggregateReport', {
                 var result = record.get(id.executionID);
                 if(result != null){
                     if (result == ""){
-                        didNotNotRun = true;
+                        //didNotNotRun = true;
                         //didNotFail = true;
                         //didNotPass = true;
                     }

diff --git a/public/view/ResultsView.js b/public/view/ResultsView.js
@@ -22,6 +22,9 @@ Ext.define('Redwood.view.ResultsView', {
     },
 
     refreshResult: function(result){
+        this.resultsStore.getRootNode().cascadeBy(function(node){
+
+        });
         this.resultsStore.setRootNode({"text":".","children":result.children});
         this.down("#status").setValue(result.status);
         this.down("#result").setValue(result.result);