Commit 2a40dec1 authored by Filipa Lacerda's avatar Filipa Lacerda

Serialize all needed data

parent 234c0415
......@@ -19,7 +19,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
respond_to do |format|
format.html
format.json do
render json: @environments
render json: serialize_as_json(@environments)
end
end
end
......@@ -69,4 +69,14 @@ class Projects::EnvironmentsController < Projects::ApplicationController
def environment
@environment ||= project.environments.find(params[:id])
end
def serialize_as_json(resource)
resource.as_json(
include: {
last_deployment: {
include: [:deployable, :user]
}
}
)
end
end
module EnvironmentsHelper
def environments_list_data
def environments_list_data()
{
endpoint: namespace_project_environments_path(@project.namespace, @project)
}
......
......@@ -12,23 +12,27 @@
%i{ "v-show" => "!open" }
= icon("caret-right")
{{model.name}}
%td.deployment-column
%span{ "v-if" => "model.last_deployment && model.last_deployment.iid" }
%span{ "v-if" => "!isFolder && model.last_deployment && model.last_deployment.iid" }
{{model.last_deployment.iid}}
by
%span{ "v-if" => "model.last_deployment.user" }
{{model.last_deployment.user}}
{{model.last_deployment.user.name}}
%td
column 3
%a{ "v-if" => "!isFolder" }
column 3
%td
column 4
%a{ "v-if" => "!isFolder" }
column 3
%td
column 5
%span{ "v-if" => "!isFolder && model.last_deployment" }
{{last_deployment.created_at}}
%td.hidden-xs
.pull-right
......@@ -55,7 +59,9 @@
/= user_avatar(user: "child.last_deployment.user", size: 20)
%td
column 3
%a.build-link{ "v-if" => "child.last_deployment && child.last_deployment.deployable",
":href" => "" }
{{child.last_deployment}}
%td
column 4
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment