From c09c45be7a12215b014f65db90ce070ba258b260 Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 17 Dec 2018 14:34:23 +0800 Subject: [PATCH] Ticket.bjs Ticket.vala --- Ticket.bjs | 2 +- Ticket.vala | 17 ++++------------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/Ticket.bjs b/Ticket.bjs index 13dee38f..0537b557 100644 --- a/Ticket.bjs +++ b/Ticket.bjs @@ -189,7 +189,7 @@ "| string selectedSeverityId" : "() {\n\tGtk.TreeIter iter;\n\tValue val1;\n \n \n\tthis.el.get_active_iter (out iter);\n\t_this.sevmodel.el.get_value (iter, 0, out val1);\n \n\n\treturn (string) val1;\n\t\n\t\n\t\n\t\n}\n", "items" : [ { - "| void loadSeverities" : " () {\n\n var rt = RooTicket.singleton();\n //rt.loadProjects();\n \n _this.severity_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 severity --\");\n // if (id == \"\") {\n\t _this.severity_id.el.set_active_iter(iter);\n // }\n \n var projects = rt.serverities;\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.severity_id.el.set_active_iter(iter);\n\t //} \n \n }\n \n _this.severity_id.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", + "| void loadSeverities" : " () {\n\n var rt = RooTicket.singleton();\n //rt.loadProjects();\n \n _this.severity_id.loading = true;\n\n this.el.clear(); \n Gtk.TreeIter iter;\n var el = this.el;\n \n var projects = rt.serverities;\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 (\"normal\" == project.name) {\n\t \t _this.severity_id.el.set_active_iter(iter);\n\t } \n \n }\n \n _this.severity_id.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", "id" : "sevmodel", "* pack" : "set_model", "xtype" : "ListStore", diff --git a/Ticket.vala b/Ticket.vala index 3a81d2ab..daf2fc15 100644 --- a/Ticket.vala +++ b/Ticket.vala @@ -858,16 +858,7 @@ public class Ticket : Object this.el.clear(); Gtk.TreeIter iter; var el = this.el; - - el.append(out iter); - - - el.set_value(iter, 0, ""); - el.set_value(iter, 1, "-- select severity --"); - // if (id == "") { - _this.severity_id.el.set_active_iter(iter); - // } - + var projects = rt.serverities; foreach(var project in projects) { @@ -875,9 +866,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.severity_id.el.set_active_iter(iter); - //} + if ("normal" == project.name) { + _this.severity_id.el.set_active_iter(iter); + } } -- 2.39.2