From: Alan Knowles <alan@roojs.com>
Date: Mon, 17 Dec 2018 08:06:52 +0000 (+0800)
Subject: NewBranch.bjs
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=c64d27e906a3987a4789fcc33a1f56bf1330a94f

NewBranch.bjs
NewBranch.vala
---

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 7be4bfbc..3989ec49 100644
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -113,7 +113,7 @@
            "id" : "dbmodel",
            "* pack" : "set_model",
            "xtype" : "ListStore",
-           "| void loadTickets" : "(string project_id) {\n\n\n    \n    // fixme .. get project id from selection..\n    \n     RooTicket.singleton().loadTickets(\n \t\t\tproject_id,\n \t\t\t_this.btn_not_me.el.active ? RooTicket.NotMe.TRUE :  RooTicket.NotMe.FALSE,\n \t\t\t _this.btn_closed.el.active ? RooTicket.AnyStatus.TRUE :  RooTicket.AnyStatus.FALSE\n\t\t );\n        \n    _this.ticketsel.loading = true;\n\n    this.el.clear();                                    \n    Gtk.TreeIter iter;\n    var el = this.el;\n    \n    el.append(out iter);\n\n    \n    el.set_value(iter, 0, \"\");\n    el.set_value(iter, 1, \"-- select a ticket --\");\n    \n    _this.ticketsel.el.set_active_iter(iter);\n    var tickets = RooTicket.singleton().tickets;\n    foreach(var ticket in tickets) {\n    \n        el.append(out iter);\n        \n        el.set_value(iter, 0, ticket.id);\n        el.set_value(iter, 1, \"#%s [%s] %s\".printf( ticket.id, ticket.project_id_name , ticket.summary));\n        \n        //if (data.get(i) == cur) {\n         //   _this.build_module.el.set_active_iter(iter);\n       // }\n        \n    }\n    \n    _this.ticketsel.loading = false;\n     //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n",
+           "| void loadTickets" : "(string project_id) {\n\n\n    \n    // fixme .. get project id from selection..\n    \n     RooTicket.singleton().loadTickets(\n \t\t\tproject_id,\n \t\t\t_this.btn_not_me.el.active ? RooTicket.NotMe.TRUE :  RooTicket.NotMe.FALSE,\n \t\t\t _this.btn_closed.el.active ? RooTicket.Status.ANY :  RooTicket.Status.ACTIVE\n\t\t );\n        \n    _this.ticketsel.loading = true;\n\n    this.el.clear();                                    \n    Gtk.TreeIter iter;\n    var el = this.el;\n    \n    el.append(out iter);\n\n    \n    el.set_value(iter, 0, \"\");\n    el.set_value(iter, 1, \"-- select a ticket --\");\n    \n    _this.ticketsel.el.set_active_iter(iter);\n    var tickets = RooTicket.singleton().tickets;\n    foreach(var ticket in tickets) {\n    \n        el.append(out iter);\n        \n        el.set_value(iter, 0, ticket.id);\n        el.set_value(iter, 1, \"#%s [%s] %s\".printf( ticket.id, ticket.project_id_name , ticket.summary));\n        \n        //if (data.get(i) == cur) {\n         //   _this.build_module.el.set_active_iter(iter);\n       // }\n        \n    }\n    \n    _this.ticketsel.loading = false;\n     //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING);          \n                                     \n}\n",
            "$ columns" : "typeof(string),typeof(string)",
            "n_columns" : 2,
            "$ xns" : "Gtk"
diff --git a/NewBranch.vala b/NewBranch.vala
index b5d64b3b..d31ca8bb 100644
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -545,7 +545,7 @@ public class NewBranch : Object
              RooTicket.singleton().loadTickets(
          			project_id,
          			_this.btn_not_me.el.active ? RooTicket.NotMe.TRUE :  RooTicket.NotMe.FALSE,
-         			 _this.btn_closed.el.active ? RooTicket.AnyStatus.TRUE :  RooTicket.AnyStatus.FALSE
+         			 _this.btn_closed.el.active ? RooTicket.Status.ANY :  RooTicket.Status.ACTIVE
         		 );
                 
             _this.ticketsel.loading = true;