RepoStatusPopover.bjs

RepoStatusPopover.vala

diff --git a/RepoStatusPopover.bjs b/RepoStatusPopover.bjs
index deadfc2..0b27a28 100644 (file)
--- a/RepoStatusPopover.bjs
+++ b/RepoStatusPopover.bjs
@@ -148,7 +148,7 @@
         },
         {
          "listeners" : {
         },
         {
          "listeners" : {

-          "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   MergeBranch.singleton().show(this.ticket, null);   \n    return false;\n}"
+          "button_press_event" : "() => {\n\n   _this.el.hide();\n   Clones.singleton().el.response(-1);\n   MergeBranch.singleton().show(this.repo.activeTicket, null);   \n    return false;\n}"

          },
          "label" : "Merge branch/  ticket",
          "xtype" : "Button",
          },
          "label" : "Merge branch/  ticket",
          "xtype" : "Button",

diff --git a/RepoStatusPopover.vala b/RepoStatusPopover.vala
index b4621d1..1e6a3c6 100644 (file)
--- a/RepoStatusPopover.vala
+++ b/RepoStatusPopover.vala
@@ -588,7 +588,7 @@ public class RepoStatusPopover : Object
             
                _this.el.hide();
                Clones.singleton().el.response(-1);
             
                _this.el.hide();
                Clones.singleton().el.response(-1);

-               MergeBranch.singleton().show(this.ticket, null);   
+               MergeBranch.singleton().show(this.repo.activeTicket, null);   

                 return false;
             });
         }
                 return false;
             });
         }