From: Alan Knowles <alan@roojs.com>
Date: Mon, 17 Dec 2018 07:55:56 +0000 (+0800)
Subject: Uncommited changes synced
X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=0f3fc898b3f425daec52bf023f8ba31f64b54d4c

Uncommited changes synced
---

diff --git a/Ticket.bjs b/Ticket.bjs
index d2c8a699..2b8009f7 100644
--- a/Ticket.bjs
+++ b/Ticket.bjs
@@ -17,7 +17,7 @@
    "title" : "Create a Ticket",
    "xtype" : "Dialog",
    "# GitRepo? repo" : "null",
-   "|   void show" : "( GitRepo? repo   ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) { // should not happen!!\n    \tGLib.error(\"new branch show called, when already being displayed?\");\n\t}\n \n\t\n\tthis.running  = true;\n\t//GitMonitor.gitmonitor.stop();\n\t\n    this.repo = repo;\n    \n    \n    \n    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n    GLib.debug(\"Loading tickets\"); \n     \n\n    this.el.show_all();\n    this.el.set_keep_above(true);\n   \n\n\tRooProject? curproj = null;\n    if (this.repo != null) {\n\t    curproj = RooTicket.singleton().getProjectByRepo(this.repo);\n    }\n\t_this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    \n \n \tthis.el.run();\n\n}",
+   "|   void show" : "( GitRepo? repo   ) \n{\n     // this.el.set_gravity(Gdk.Gravity.NORTH);\n    if (this.running) { // should not happen!!\n    \tGLib.error(\"new branch show called, when already being displayed?\");\n\t}\n \n\t\n\tthis.running  = true;\n\t//GitMonitor.gitmonitor.stop();\n\t\n    this.repo = repo;\n    \n    \n    \n    \n\tthis.el.move((Gdk.Screen.width() / 2)- 250 ,0);\n\tthis.el.set_default_size( 500,200); // not sure why it grows..\n    GLib.debug(\"Loading tickets\"); \n     \n\n    this.el.show_all();\n    this.el.set_keep_above(true);\n   \n\n\tRooProject? curproj = null;\n    if (this.repo != null) {\n\t    curproj = RooTicket.singleton().getProjectByRepo(this.repo);\n    }\n\t_this.prmodel.loadProjects(curproj == null ? \"\" : curproj.id);\n    if (curproj != null) {\n \n\t\t\n\t\tvar rt = RooTicket.singleton();\n\t\trt.loadProjectOptions(curproj.id);\n\t\t\n\t\t_this.msmodel.loadMilestones();\n\t\t_this.primodel.loadPriorities();\n\t\t_this.sevmodel.loadSeverities();\n\t\t_this.clmodel.loadClassifications();\t\n\t\t_this.devmodel.loadDevelopers();\t\n\t\t\n    }\n \n \tthis.el.run();\n\n}",
    "default_height" : 200,
    "$ xns" : "Gtk",
    "# bool running" : false,
diff --git a/Ticket.vala b/Ticket.vala
index 9857b7ff..49a0191d 100644
--- a/Ticket.vala
+++ b/Ticket.vala
@@ -120,7 +120,19 @@ public class Ticket : Object
     	    curproj = RooTicket.singleton().getProjectByRepo(this.repo);
         }
     	_this.prmodel.loadProjects(curproj == null ? "" : curproj.id);
-        
+        if (curproj != null) {
+     
+    		
+    		var rt = RooTicket.singleton();
+    		rt.loadProjectOptions(curproj.id);
+    		
+    		_this.msmodel.loadMilestones();
+    		_this.primodel.loadPriorities();
+    		_this.sevmodel.loadSeverities();
+    		_this.clmodel.loadClassifications();	
+    		_this.devmodel.loadDevelopers();	
+    		
+        }
      
      	this.el.run();