From: Alan Knowles Date: Fri, 14 Dec 2018 07:26:08 +0000 (+0800) Subject: Clone.bjs X-Git-Url: http://git.roojs.org/?p=gitlive;a=commitdiff_plain;h=48b7b65497d6c0f5c9b74a45a74dea37cf2c5306 Clone.bjs Clone.vala --- diff --git a/Clone.bjs b/Clone.bjs index 0c459dee..54598efb 100644 --- a/Clone.bjs +++ b/Clone.bjs @@ -42,7 +42,7 @@ "$ xns" : "Gtk" }, { - "| void loadProjects" : " (string id) {\n\n var rt = RooTicket.singleton();\n var gr = GitRepo.singleton();\n _this.reposel.loading = true;\n\n this.el.clear(); \n Gtk.TreeIter iter;\n var el = this.el;\n \n el.append(out iter);\n\n \n el.set_value(iter, 0, \"\");\n el.set_value(iter, 1, \"-- select a repo --\");\n \n\t_this.reposel.el.set_active_iter(iter);\n \n var projects = rt.projects;\n foreach(var project in rt.repos) {\n \n \tforeach(\n \n el.append(out iter);\n \n el.set_value(iter, 0, project.id);\n el.set_value(iter, 1, project.name );\n if (id == project.id) {\n\t \t _this.projectsel.el.set_active_iter(iter);\n\t } \n \n }\n \n _this.reposel.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", + "| void loadProjects" : " (string id) {\n\n var rt = RooTicket.singleton();\n var gr = GitRepo.singleton();\n _this.reposel.loading = true;\n\n this.el.clear(); \n Gtk.TreeIter iter;\n var el = this.el;\n \n el.append(out iter);\n\n \n el.set_value(iter, 0, \"\");\n el.set_value(iter, 1, \"-- select a repo --\");\n \n\t_this.reposel.el.set_active_iter(iter);\n \n var projects = rt.projects;\n foreach(var newrepo in rt.repos) {\n \tvar has_repo = false;\n \tforeach(var repo in gr.cache.values) {\n \t\tif (newrepo.name == repo.name) {\n \t\t\thas_repo = true;\n \t}\n \tif (has_repo) {\n \t\tcontinue;\n\t\t}\n el.append(out iter);\n \n el.set_value(iter, 0, project.id);\n el.set_value(iter, 1, project.name );\n if (id == project.id) {\n\t \t _this.projectsel.el.set_active_iter(iter);\n\t } \n \n }\n \n _this.reposel.loading = false;\n //this.el.set_sort_column_id(0, Gtk.SortType.ASCENDING); \n \n}\n", "id" : "prmodel", "* pack" : "set_model", "xtype" : "ListStore", diff --git a/Clone.vala b/Clone.vala index fb7db8d7..382695f9 100644 --- a/Clone.vala +++ b/Clone.vala @@ -192,10 +192,15 @@ public class Clone : Object _this.reposel.el.set_active_iter(iter); var projects = rt.projects; - foreach(var project in rt.repos) { - - foreach( - + foreach(var newrepo in rt.repos) { + var has_repo = false; + foreach(var repo in gr.cache.values) { + if (newrepo.name == repo.name) { + has_repo = true; + } + if (has_repo) { + continue; + } el.append(out iter); el.set_value(iter, 0, project.id);