From a98f14046fab1ea28caf81998741ee7bfb26f58e Mon Sep 17 00:00:00 2001 From: Alan Knowles Date: Wed, 31 Oct 2018 13:34:25 +0800 Subject: [PATCH] NewBranch.bjs NewBranch.vala --- NewBranch.bjs | 2 +- NewBranch.vala | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/NewBranch.bjs b/NewBranch.bjs index 8d39c378..2241063a 100644 --- a/NewBranch.bjs +++ b/NewBranch.bjs @@ -49,7 +49,7 @@ }, { "listeners" : { - "changed" : "() => {\n\tGtk.TreeIter iter;\n\tValue val1;\n\tValue val2;\n \n\tthis.el.get_active_iter (out iter);\n\t_this.dbmodel.el.get_value (iter, 0, out val1);\n\t_this.dbmodel.el.get_value (iter, 1, out val2);\n\n\tvar ticket_id = (string) val1;\n\t\n\tif (ticket_id == \"\") {\n\t\t_this.name.el.set_text(\"wip_NAME_DATE\");\n\t\treturn;\n\t}\n\t\n\tvar ticket = RooTicket.singleton().getById(ticket_id);\n \n\t_this.name.el.set_text(\"wip_NAME_T%s_%s\".printf(ticket.id, ticket.summaryToBranchName()));\n\t\n\t//GLib.debug (\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}" + "changed" : "() => {\n\tGtk.TreeIter iter;\n\tValue val1;\n\tValue val2;\n \n\tthis.el.get_active_iter (out iter);\n\t_this.dbmodel.el.get_value (iter, 0, out val1);\n\t_this.dbmodel.el.get_value (iter, 1, out val2);\n\n\tvar ticket_id = (string) val1;\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tif (ticket_id == \"\") {\n\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,date));\n\t\treturn;\n\t}\n\t\n\tvar ticket = RooTicket.singleton().getById(ticket_id);\n \n\t_this.name.el.set_text(\"wip_%s_T%s_%s\".printf(name,ticket.id, ticket.summaryToBranchName()));\n\t\n\t//GLib.debug (//\"Selection: %s, %s\\n\", (string) val1, (string) val2);\n}" }, "id" : "build_module", "* init" : "this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );", diff --git a/NewBranch.vala b/NewBranch.vala index 83284d2a..230fc6fc 100644 --- a/NewBranch.vala +++ b/NewBranch.vala @@ -201,16 +201,18 @@ public class NewBranch : Object var ticket_id = (string) val1; + var name = RooTicket.singleton().usernameLocal(); + if (ticket_id == "") { - _this.name.el.set_text("wip_NAME_DATE"); + _this.name.el.set_text("wip_%s_%s".printf(name,date)); return; } var ticket = RooTicket.singleton().getById(ticket_id); - _this.name.el.set_text("wip_NAME_T%s_%s".printf(ticket.id, ticket.summaryToBranchName())); + _this.name.el.set_text("wip_%s_T%s_%s".printf(name,ticket.id, ticket.summaryToBranchName())); - //GLib.debug ("Selection: %s, %s\n", (string) val1, (string) val2); + //GLib.debug (//"Selection: %s, %s\n", (string) val1, (string) val2); }); } -- 2.39.2