Ticket.bjs

[gitlive] / RooTicket.vala

diff --git a/RooTicket.vala b/RooTicket.vala
index a2fc14e..2cf43f8 100644 (file)
--- a/RooTicket.vala
+++ b/RooTicket.vala
@@ -1,4 +1,4 @@
-/**
+/** 
 
 code to fetch ticket info...
 
@@ -21,9 +21,10 @@ public class RooOption : Object
 {
        
        public string id; // not really important that they are numbers..
+       public string name;     
        public string display_name;
  
-       public RooOption (string id, string name)
+       public RooOption (string id, string name, string display_name)
        {
                this.id = id;
                this.display_name = name;
@@ -73,6 +74,14 @@ public class RooTicket : Object
        public Gee.ArrayList<RooTicket> tickets; // only available for singletonn.
        public Gee.ArrayList<RooProject> projects; // only available for singletonn.    
        public Gee.ArrayList<RooRepo> repos; // only available for singletonn.          
+       
+       public Gee.ArrayList<RooOption> milestones;
+       public Gee.ArrayList<RooOption> priorities;
+       public Gee.ArrayList<RooOption> serverities;
+       public Gee.ArrayList<RooOption> classifications;
+       public Gee.ArrayList<RooOption> developers;
+                
+       
        public string username = ""; // only available for singletonn.
        public string password = ""; // only available for singletonn.
 
@@ -111,6 +120,7 @@ public class RooTicket : Object
                        var t = a.get_object_element(i);
                        ret.add(new RooOption(
                                t.get_string_member("id"),
+                               t.get_string_member("name"),                            
                                t.get_string_member("display_name")
                        ));
                }
@@ -442,9 +452,9 @@ public class RooTicket : Object
        }
        public void loadProjectOptions(string pid)
        {
-               RooTicket.singleton().repos = new Gee.ArrayList<RooRepo>();
-        
-               
+
+               var rt = RooTicket.singleton();
+
                var table = new GLib.HashTable<string, string>(str_hash, str_equal);
         
                table.insert("_options_for",pid);
@@ -477,22 +487,18 @@ public class RooTicket : Object
                                GLib.error(response.get_string_member("errorMsg"));
                                return;
                        }
-                       var rd = response.get_array_member ("data");
+                       var rd = response.get_object_member ("data");
                        
-                       this.milestones = this.readJsonArray( rd.get_array_member("milestone"));
-                       this.priorities = this.readJsonArray( rd.get_array_member("priority"));
-                       this.serverities = this.readJsonArray( rd.get_array_member("severity"));
-                       this.classifications  = this.readJsonArray( rd.get_array_member("classification"));
-                       this.developers = this.readJsonArray( rd.get_array_member("developer"));
+                       rt.milestones = this.readJsonArray( rd.get_array_member("milestone"));
+                       rt.priorities = this.readJsonArray( rd.get_array_member("priority"));
+                       rt.serverities = this.readJsonArray( rd.get_array_member("severity"));
+                       rt.classifications  = this.readJsonArray( rd.get_array_member("classification"));
+                       rt.developers = this.readJsonArray( rd.get_array_member("developer"));
  
                        
                        
                        
                        // got a valid result...
-                       var _this = RooTicket.singleton();
-                       for(var i = 0; i < rd.get_length(); i++) {
-                               _this.addRepo(rd.get_object_element(i));
-                       }
                         
                
                } catch (Error e) {