From 79c54b42ce4c95393538339a8a2456bf5c31865d Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 17 Dec 2018 14:35:13 +0800 Subject: [PATCH] Ticket.bjs Ticket.vala --- Ticket.bjs | 2 +- Ticket.vala | 14 ++++---------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/Ticket.bjs b/Ticket.bjs index 0537b557..a8239d32 100644 --- a/Ticket.bjs +++ b/Ticket.bjs @@ -219,7 +219,7 @@ "items" : [ { "id" : "clmodel", - "| void loadClassifications" : " ( ) {\n\n var rt = RooTicket.singleton();\n // rt.loadProjects();\n \n _this.classification_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 classification --\");\n // if (id == \"\") {\n\t _this.classification_id.el.set_active_iter(iter);\n// }\n \n var projects = rt.classifications;\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.classification_id.el.set_active_iter(iter);\n\t// } \n \n }\n \n _this.classification_id.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", + "| void loadClassifications" : " ( ) {\n\n var rt = RooTicket.singleton();\n // rt.loadProjects();\n \n _this.classification_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 var projects = rt.classifications;\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 (\"bug\" == project.name) {\n\t \t _this.classification_id.el.set_active_iter(iter);\n\t } \n \n }\n \n _this.classification_id.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", "* pack" : "set_model", "xtype" : "ListStore", "$ columns" : "typeof(string),typeof(string)", diff --git a/Ticket.vala b/Ticket.vala index daf2fc15..fbe63433 100644 --- a/Ticket.vala +++ b/Ticket.vala @@ -982,13 +982,7 @@ public class Ticket : Object el.append(out iter); - - el.set_value(iter, 0, ""); - el.set_value(iter, 1, "-- select classification --"); - // if (id == "") { - _this.classification_id.el.set_active_iter(iter); - // } - + var projects = rt.classifications; foreach(var project in projects) { @@ -996,9 +990,9 @@ public class Ticket : Object el.set_value(iter, 0, project.id); el.set_value(iter, 1, project.display_name ); - // if (id == project.id) { - // _this.classification_id.el.set_active_iter(iter); - // } + if ("bug" == project.name) { + _this.classification_id.el.set_active_iter(iter); + } } -- 2.39.2