From fceef211fe79b7ffb914bd5b4b1c687f655f3db8 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 17 Dec 2018 14:10:30 +0800 Subject: [PATCH] Ticket.bjs Ticket.vala --- Ticket.bjs | 2 +- Ticket.vala | 13 +++++-------- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Ticket.bjs b/Ticket.bjs index 0408e115..d6f7ab1b 100644 --- a/Ticket.bjs +++ b/Ticket.bjs @@ -118,7 +118,7 @@ "id" : "msmodel", "* pack" : "set_model", "xtype" : "ListStore", - "| void loadMilestones" : " (string id) {\n\n var rt = RooTicket.singleton();\n // rt.loadProjects();\n \n _this.milestone_id.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 milestone --\");\n\t _this.milestone_id.el.set_active_iter(iter); \n /*\n if (id == \"\") {\n\n }\n var projects = rt.projects;\n foreach(var project in projects) {\n \n el.append(out iter);\n \n el.set_value(iter, 0, project.id);\n el.set_value(iter, 1, project.name );\n if (id == project.id) {\n\t \t _this.milestone.el.set_active_iter(iter);\n\t } \n \n }\n */\n \n _this.milestone_id.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", + "| void loadMilestones" : " ( ) {\n\n var rt = RooTicket.singleton();\n // rt.loadProjects();\n \n _this.milestone_id.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 milestone --\");\n _this.milestone_id.el.set_active_iter(iter); \n \n var projects = rt.milestones;\n foreach(var project in projects) {\n \n el.append(out iter);\n \n el.set_value(iter, 0, project.id);\n el.set_value(iter, 1, project.display_name );\n if (id == project.id) {\n\t \t _this.milestone.el.set_active_iter(iter);\n\t } \n \n }\n */\n \n _this.milestone_id.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/Ticket.vala b/Ticket.vala index f60c295c..77e13435 100644 --- a/Ticket.vala +++ b/Ticket.vala @@ -549,7 +549,7 @@ public class Ticket : Object } // user defined functions - public void loadMilestones (string id) { + public void loadMilestones ( ) { var rt = RooTicket.singleton(); // rt.loadProjects(); @@ -565,18 +565,15 @@ public class Ticket : Object el.set_value(iter, 0, ""); el.set_value(iter, 1, "-- select a milestone --"); - _this.milestone_id.el.set_active_iter(iter); - /* - if (id == "") { - - } - var projects = rt.projects; + _this.milestone_id.el.set_active_iter(iter); + + var projects = rt.milestones; foreach(var project in projects) { el.append(out iter); el.set_value(iter, 0, project.id); - el.set_value(iter, 1, project.name ); + el.set_value(iter, 1, project.display_name ); if (id == project.id) { _this.milestone.el.set_active_iter(iter); } -- 2.39.2