NewBranch.bjs

NewBranch.vala

diff --git a/NewBranch.bjs b/NewBranch.bjs
index 8d39c37..2241063 100644 (file)
--- a/NewBranch.bjs
+++ b/NewBranch.bjs
@@ -49,7 +49,7 @@
         },
         {
          "listeners" : {
         },
         {
          "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 );",
          },
          "id" : "build_module",
          "* init" : "this.el.add_attribute(_this.dbcellrenderer.el , \"markup\", 1 );",

diff --git a/NewBranch.vala b/NewBranch.vala
index 83284d2..230fc6f 100644 (file)
--- a/NewBranch.vala
+++ b/NewBranch.vala
@@ -201,16 +201,18 @@ public class NewBranch : Object
             
                var ticket_id = (string) val1;
                
             
                var ticket_id = (string) val1;
                

+               var name = RooTicket.singleton().usernameLocal();
+               

                if (ticket_id == "") {
                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);
                
                        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);

             });
         }
 
             });
         }