Fix #5611 - Fix ticket filters on create branch

[gitlive] / RooTicket.vala

diff --git a/RooTicket.vala b/RooTicket.vala
index 5d3c357..3d85401 100644 (file)
--- a/RooTicket.vala
+++ b/RooTicket.vala
@@ -50,13 +50,14 @@ static RooTicket  _RooTicket;
 
 public class RooTicket : Object
 {
-       public enum NotMe {
-               TRUE,
-               FALSE
+       
+        public enum Who {
+               ANYBODY,
+               ME
        }
-       public enum Closed {
-               TRUE,
-               FALSE
+       public enum Status {
+               ALL,
+               ACTIVE
        }
        
    //const string baseurl = "https://roojs.com/admin.php/Ro/mtrack_ticket"; 
@@ -270,24 +271,18 @@ public class RooTicket : Object
                   }
        }
 
-       public void loadTickets(string project_id, NotMe not_me, Closed closed)
+       public void loadTickets(string project_id, Who who, Status status)
        {
                RooTicket.singleton().tickets = new Gee.ArrayList<RooTicket>();
         
                
                var table = new GLib.HashTable<string, string>(str_hash, str_equal);
-               if (not_me  == NotMe.FALSE) {
-                       table.insert("query[viewtype]","me");
-               } else {
-               
-               }               
-               if (closed  == Closed.TRUE) {
-                       table.insert("query[viewtype]","me");
-               } else {
+
+               table.insert("_developer", who.to_string().down().substring(15));
                
-               }
+               table.insert("query[viewtype]", status.to_string().down().substring(18));
 
-               table.insert("limit","999");
+               table.insert("limit","200");
                table.insert("sort","summary");
                table.insert("dir","ASC");
                
@@ -318,9 +313,9 @@ public class RooTicket : Object
                        parser.load_from_data (data, -1);
 
                        var response = parser.get_root().get_object();
-                       var status = response.get_boolean_member("success");
+                       var success = response.get_boolean_member("success");
                
-                       if(!status){
+                       if(!success){
                                GLib.error(response.get_string_member("errorMsg"));
                                return;
                        }
@@ -349,7 +344,7 @@ public class RooTicket : Object
                var table = new GLib.HashTable<string, string>(str_hash, str_equal);
         
                table.insert("query[project_filter]","P,N,U");
-               table.insert("limit","999");
+               table.insert("limit","200");
                table.insert("sort","name");
                table.insert("dir","ASC");
 
@@ -404,7 +399,7 @@ public class RooTicket : Object
                var table = new GLib.HashTable<string, string>(str_hash, str_equal);
         
 
-               table.insert("limit","999");
+               table.insert("limit","200");
                table.insert("sort","shortname");
                table.insert("dir","ASC");