projects
/
gitlive
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Partial Fix #5560 - Gitlive - branching wip
[gitlive]
/
MergeBranch.vala
diff --git
a/MergeBranch.vala
b/MergeBranch.vala
index
43820cc
..
a0aa781
100644
(file)
--- a/
MergeBranch.vala
+++ b/
MergeBranch.vala
@@
-499,12
+499,21
@@
public class MergeBranch : Object
var el = this.el;
el.append(out iter);
var el = this.el;
el.append(out iter);
-
-
el.set_value(iter, 0, "");
el.set_value(iter, 1, "-- select a ticket --");
_this.ticketsel.el.set_active_iter(iter);
el.set_value(iter, 0, "");
el.set_value(iter, 1, "-- select a ticket --");
_this.ticketsel.el.set_active_iter(iter);
+
+ if (_this.ticket != null && _this.ticket.id == "-1") {
+ el.append(out iter);
+ el.set_value(iter, 0, "-1");
+ el.set_value(iter, 1, "Temporary Branch - No ticket specified/relivant");
+ _this.ticketsel.el.set_active_iter(iter);
+ }
+
+
+
+
var tickets = RooTicket.singleton().tickets;
foreach(var ticket in tickets) {
var tickets = RooTicket.singleton().tickets;
foreach(var ticket in tickets) {
@@
-512,7
+521,7
@@
public class MergeBranch : Object
el.set_value(iter, 0, ticket.id);
el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary));
el.set_value(iter, 0, ticket.id);
el.set_value(iter, 1, "#%s [%s] %s".printf( ticket.id, ticket.project_id_name , ticket.summary));
- if (_this.ticket.id == ticket.id) {
+ if (_this.ticket
!= null && _this.ticket
.id == ticket.id) {
_this.ticketsel.el.set_active_iter(iter);
}
_this.ticketsel.el.set_active_iter(iter);
}