public Xcls_name name;
// my vars (def)
+ public GitRepo repo;
public RooTicket? ticket;
public bool running;
}
*/
- GitRepo.doMerges(
- _this.actionsel.selectedAction(),
- _this.ticketsel.selectedTicketId(),
- _this.name.el.get_text()
- );
+ if (this.repo != null) {
+ repo.doMerge(
+ _this.actionsel.selectedAction(),
+ _this.ticketsel.selectedTicketId(),
+ _this.name.el.get_text()
+ );
+ } else {
+ GitRepo.doMerges(
+ _this.actionsel.selectedAction(),
+ _this.ticketsel.selectedTicketId(),
+ _this.name.el.get_text()
+ );
+ }
this.running = false;
}
// user defined functions
- public void show ( RooTicket ticket )
+ public void show ( RooTicket ticket, GitRepo? repo )
{
// this.el.set_gravity(Gdk.Gravity.NORTH);
if (this.running) {
GitMonitor.gitmonitor.stop();
this.ticket = ticket;
+ this.repo = repo;
this.el.move((Gdk.Screen.width() / 2)- 250 ,0);
GLib.debug("Loading tickets");
// user defined functions
public void loadTickets () {
- RooTicket.singleton().loadTickets();
+ RooTicket.singleton().loadTickets("",RooTicket.Who.ME, RooTicket.Status.ACTIVE);
_this.ticketsel.loading = true;