From b7e49d8042629dd0e5b9feade78e058a737f96b2 Mon Sep 17 00:00:00 2001
From: Valery Sizov <vsv2711@gmail.com>
Date: Thu, 17 Sep 2015 13:41:06 +0300
Subject: Fix: ci projects order

---
 app/views/ci/projects/_project.html.haml | 58 ++++++++++++++++++++------------
 1 file changed, 36 insertions(+), 22 deletions(-)

(limited to 'app/views/ci/projects/_project.html.haml')

diff --git a/app/views/ci/projects/_project.html.haml b/app/views/ci/projects/_project.html.haml
index e4a811119e1..869747b6eb1 100644
--- a/app/views/ci/projects/_project.html.haml
+++ b/app/views/ci/projects/_project.html.haml
@@ -1,22 +1,36 @@
-- last_commit = project.last_commit
-%tr.alert{class: commit_status_alert_class(last_commit) }
-  %td
-    = link_to [:ci, project] do
-      = project.name
-  %td
-    - if last_commit
-      #{last_commit.status} (#{commit_link(last_commit)})
-      - if project.last_commit_date
-        = time_ago_in_words project.last_commit_date
-        ago
-    - else
-      No builds yet
-  %td
-    - if project.public
-      %i.fa.fa-globe
-      Public
-    - else
-      %i.fa.fa-lock
-      Private
-  %td
-    = project.commits.count
+- if project.gitlab_ci_project
+  - ci_project = project.gitlab_ci_project
+  - last_commit = ci_project.last_commit
+  %tr.alert{class: commit_status_alert_class(last_commit) }
+    %td
+      = link_to [:ci, ci_project] do
+        = ci_project.name
+    %td
+      - if last_commit
+        #{last_commit.status} (#{commit_link(last_commit)})
+        - if ci_project.last_commit_date
+          = time_ago_in_words ci_project.last_commit_date
+          ago
+      - else
+        No builds yet
+    %td
+      - if ci_project.public
+        %i.fa.fa-globe
+        Public
+      - else
+        %i.fa.fa-lock
+        Private
+    %td
+      = ci_project.commits.count
+- else
+  %tr.light
+    %td
+      = project.name_with_namespace
+    %td
+      %small Not added to CI
+    %td
+    %td
+      = form_tag ci_projects_path do
+        = hidden_field_tag :project, project.to_json(methods: [:name_with_namespace, :path_with_namespace, :ssh_url_to_repo])
+        = submit_tag 'Add project to CI', class: 'btn btn-default btn-sm'
+    
\ No newline at end of file
-- 
cgit v1.2.1