From 569ce0f3cae811c8f9e0396b66edda1155f8a6ca Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Thu, 21 Mar 2019 13:48:55 +0800 Subject: [PATCH] NewBranch.bjs NewBranch.vala --- NewBranch.bjs | 2 +- NewBranch.vala | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/NewBranch.bjs b/NewBranch.bjs index 64af0c37..09f3cacf 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -56,7 +56,7 @@ "bool homogeneous" : false, "* pack" : "append_page,_this.label_select_ticket.el", "xtype" : "Box", - "| void load_data" : "() {\n\n GLib.debug(\"Loading tickets\"); \n \n var curproj = RooProject.getProjectByRepo(this.repo);\n _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.branchbtn.updateState();\n \t\n\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n \tif (tid != \"\") { \n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t} else {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t}\n _this.view.loadTicket(tid);\n \n \n}\n", + "| void load_data" : "() {\n\n GLib.debug(\"Loading tickets\"); \n \n var curproj = RooProject.getProjectByRepo(_this.repo);\n _this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n \n \t_this.dbmodel.loadTickets(curproj == null ? \"\": curproj.id, tid);\n \t_this.branchbtn.updateState();\n \t\n\t_this.ticketsel.el.get_child().get_style_context().remove_class(\"warning\");\n \tif (tid != \"\") { \n\t \tvar name = RooTicket.singleton().usernameLocal();\n \t\tvar ticket = RooTicket.singleton().getById(tid);\n\t\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t} else {\n\t\t_this.ticketsel.el.get_child().get_style_context().add_class(\"warning\");\n\t}\n _this.view.loadTicket(tid);\n \n \n}\n", "$ xns" : "Gtk", "Gtk.Orientation orientation" : "Gtk.Orientation.VERTICAL", "items" : [ diff --git a/NewBranch.vala b/NewBranch.vala index 94fcc34a..9392f7cf 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -305,7 +305,7 @@ public class NewBranch : Object GLib.debug("Loading tickets"); - var curproj = RooProject.getProjectByRepo(this.repo); + var curproj = RooProject.getProjectByRepo(_this.repo); _this.prmodel.loadProjects(curproj == null ? "" : curproj.id); _this.dbmodel.loadTickets(curproj == null ? "": curproj.id, tid); -- 2.39.2