From a7d82e309df2ea9088847e517c9a50044d5d0d8c Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Mon, 17 Dec 2018 14:13:45 +0800 Subject: [PATCH] Ticket.bjs Ticket.vala --- Ticket.bjs | 4 ++-- Ticket.vala | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/Ticket.bjs b/Ticket.bjs index 62a40bfc..dd3f75e8 100644 --- a/Ticket.bjs +++ b/Ticket.bjs @@ -161,7 +161,7 @@ "items" : [ { "id" : "primodel", - "| void loadPriorities" : " ( ) {\n\n var rt = RooTicket.singleton();\n // rt.loadProjects();\n \n _this.priority_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 priority --\");\n // if (id == \"\") {\n\t _this.priority_id.el.set_active_iter(iter);\n //}\n var projects = rt.priorities;\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.priority_id.el.set_active_iter(iter);\n\t } \n \n }\n \n _this.priority_id.loading = false;\n \n \n}\n", + "| void loadPriorities" : " ( ) {\n\n var rt = RooTicket.singleton();\n // rt.loadProjects();\n \n _this.priority_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 priority --\");\n // if (id == \"\") {\n\t _this.priority_id.el.set_active_iter(iter);\n //}\n var projects = rt.priorities;\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.priority_id.el.set_active_iter(iter);\n\t //} \n \n }\n \n _this.priority_id.loading = false;\n \n \n}\n", "* pack" : "set_model", "xtype" : "ListStore", "$ columns" : "typeof(string),typeof(string)", @@ -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.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 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", "id" : "sevmodel", "* pack" : "set_model", "xtype" : "ListStore", diff --git a/Ticket.vala b/Ticket.vala index d397cc5f..12e3ecec 100644 --- a/Ticket.vala +++ b/Ticket.vala @@ -752,9 +752,9 @@ public class Ticket : Object el.set_value(iter, 0, project.id); el.set_value(iter, 1, project.display_name ); - if (id == project.id) { + //if (id == project.id) { _this.priority_id.el.set_active_iter(iter); - } + //} } @@ -881,7 +881,7 @@ public class Ticket : Object 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.severity_id.el.set_active_iter(iter); //} -- 2.39.2