MergeBranch.bjs

MergeBranch.vala

diff --git a/MergeBranch.bjs b/MergeBranch.bjs
index 8748d65..5910697 100644 (file)
--- a/MergeBranch.bjs
+++ b/MergeBranch.bjs
@@ -89,7 +89,7 @@
         },
         {
          "listeners" : {
-          "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\tvar ticket_id = this.selectedTicketId();\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tif (ticket_id == \"\" || ticket_id == null) {\n\t\n\t\tvar dt = new  DateTime.now_local();\n\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,dt.format(\"%Y_%b_%d\")));\n\t\treturn;\n\t}\n\t \n\t_this.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}"
+          "changed" : "() => {\n\tif (this.loading) {\n\t\treturn;\n\t}\n\tvar ticket_id = this.selectedTicketId();\n\t\n\tvar name = RooTicket.singleton().usernameLocal();\n\t\n\tif (ticket_id == \"\" || ticket_id == null) {\n\t\n\t\tvar dt = new  DateTime.now_local();\n//\t\t_this.name.el.set_text(\"wip_%s_%s\".printf(name,dt.format(\"%Y_%b_%d\")));\n\t\treturn;\n\t}\n\t \n\t_this.ticket = RooTicket.singleton().getById(ticket_id);\n  \t_this.name.updateText();\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" : "ticketsel",
          "* init" : "this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );",

diff --git a/MergeBranch.vala b/MergeBranch.vala
index c108b0b..40170c5 100644 (file)
--- a/MergeBranch.vala
+++ b/MergeBranch.vala
@@ -420,12 +420,12 @@ public class MergeBranch : Object
                if (ticket_id == "" || ticket_id == null) {
                
                        var dt = new  DateTime.now_local();
-                       _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d")));
+            //         _this.name.el.set_text("wip_%s_%s".printf(name,dt.format("%Y_%b_%d")));
                        return;
                }
                 
                _this.ticket = RooTicket.singleton().getById(ticket_id);
-               
+               _this.name.updateText();
                //_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);