summaryrefslogtreecommitdiff
path: root/app/views/projects/environments
diff options
context:
space:
mode:
authorFilipa Lacerda <filipa@gitlab.com>2016-10-17 23:18:49 +0100
committerFilipa Lacerda <filipa@gitlab.com>2016-11-16 11:57:52 +0000
commit37a100c80f81c8948b1a6d36696ba0a588e070db (patch)
tree5b0d8267da503b19afd329c3cf544e44213b9ca6 /app/views/projects/environments
parentf716da652d857b26dd5e424c77ac0898ae85bdb5 (diff)
downloadgitlab-ce-37a100c80f81c8948b1a6d36696ba0a588e070db.tar.gz
Adds children rows
Diffstat (limited to 'app/views/projects/environments')
-rw-r--r--app/views/projects/environments/index.html.haml35
1 files changed, 26 insertions, 9 deletions
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml
index ec83399f480..f8e264ac6bf 100644
--- a/app/views/projects/environments/index.html.haml
+++ b/app/views/projects/environments/index.html.haml
@@ -42,15 +42,23 @@
New environment
.table-holder{ "v-if" => "!loading && state.environments.length" }
- %table.table
- %tr{"is"=>"environment-item",
- "inline-template" => true,
- "v-for" => "environment in state.environments",
- ":model" => "environment"}
+ %table.table.ci-table.environments
+ %thead
+ %th Environment
+ %th Last Deployment
+ %th Build
+ %th Commit
+ %th
+ %th.hidden-xs
+ %tbody
+ %tr{"is"=>"environment-item",
+ "inline-template" => true,
+ "v-for" => "environment in state.environments",
+ ":model" => "environment"}
%script#environment-item-template{"type"=> "text/x-template"}
- %tr
+ %tr.environment
%td.environment-folder-name{"@click" => "toggle"}
%span.icon-container{"v-if" => "isFolder"}
%i{"v-show" => "open"}
@@ -60,7 +68,16 @@
= icon("caret-right")
%span.name-container
{{model.name}}
- %tr{"v-show" => "open", "v-if"=>"isFolder"}
- %td{"v-for" => "child in model.children",
- ":model" => "child"}
+ %td
+ %a{{"v-if" => "model.last_deployment"}}
+ {{model.last_deployment.id}}
+ %tr.environment-children{"v-show" => "open",
+ "v-if"=>"isFolder",
+ "v-for" => "child in model.children",
+ ":model" => "child"}
+ %td
{{child.name}}
+ %td.deployment-column
+ %span{"v-if" => "child.last_deployment && child.last_deployment.iid"}
+ {{child.last_deployment.iid}}
+ \ No newline at end of file