From 45f9b1a56e347c7b5a3c98166a8f40af32829a3e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 17 Dec 2018 16:25:41 +0800 Subject: [PATCH] Uncommited changes synced --- NewBranch.bjs | 2 +- NewBranch.vala | 2 +- RooTicket.vala | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/NewBranch.bjs b/NewBranch.bjs index 5faf1e0b..f1a90160 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -113,7 +113,7 @@ "id" : "dbmodel", "xtype" : "ListStore", "* pack" : "set_model", - "| void loadTickets" : "(string project_id , string tid = \"\") {\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.Who.ANYBODY : RooTicket.Who.ME,\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 (ticket.id == tid) {\n\t\t _this.ticketsel.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 , string tid = \"\") {\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.Who.ANYBODY : RooTicket.Who.ME,\n \t\t\t _this.btn_closed.el.active ? RooTicket.Status.ALL : 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 (ticket.id == tid) {\n\t\t _this.ticketsel.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 85eaa7bb..4342b5b2 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -544,7 +544,7 @@ public class NewBranch : Object RooTicket.singleton().loadTickets( project_id, _this.btn_not_me.el.active ? RooTicket.Who.ANYBODY : RooTicket.Who.ME, - _this.btn_closed.el.active ? RooTicket.Status.ANY : RooTicket.Status.ACTIVE + _this.btn_closed.el.active ? RooTicket.Status.ALL : RooTicket.Status.ACTIVE ); _this.ticketsel.loading = true; diff --git a/RooTicket.vala b/RooTicket.vala index 82beee1c..705ad9e8 100644 --- a/RooTicket.vala +++ b/RooTicket.vala @@ -56,7 +56,7 @@ public class RooTicket : Object ME } public enum Status { - ANY, + ALL, ACTIVE } -- 2.39.2