Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Jérome Perrin
gitlab-ce
Commits
2a40dec1
Commit
2a40dec1
authored
Oct 19, 2016
by
Filipa Lacerda
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Serialize all needed data
parent
234c0415
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
25 additions
and
9 deletions
+25
-9
app/controllers/projects/environments_controller.rb
app/controllers/projects/environments_controller.rb
+11
-1
app/helpers/environments_helper.rb
app/helpers/environments_helper.rb
+1
-1
app/views/projects/environments/components/_environment.html.haml
...s/projects/environments/components/_environment.html.haml
+13
-7
No files found.
app/controllers/projects/environments_controller.rb
View file @
2a40dec1
...
@@ -19,7 +19,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -19,7 +19,7 @@ class Projects::EnvironmentsController < Projects::ApplicationController
respond_to
do
|
format
|
respond_to
do
|
format
|
format
.
html
format
.
html
format
.
json
do
format
.
json
do
render
json:
@environments
render
json:
serialize_as_json
(
@environments
)
end
end
end
end
end
end
...
@@ -69,4 +69,14 @@ class Projects::EnvironmentsController < Projects::ApplicationController
...
@@ -69,4 +69,14 @@ class Projects::EnvironmentsController < Projects::ApplicationController
def
environment
def
environment
@environment
||=
project
.
environments
.
find
(
params
[
:id
])
@environment
||=
project
.
environments
.
find
(
params
[
:id
])
end
end
def
serialize_as_json
(
resource
)
resource
.
as_json
(
include:
{
last_deployment:
{
include:
[
:deployable
,
:user
]
}
}
)
end
end
end
app/helpers/environments_helper.rb
View file @
2a40dec1
module
EnvironmentsHelper
module
EnvironmentsHelper
def
environments_list_data
def
environments_list_data
()
{
{
endpoint:
namespace_project_environments_path
(
@project
.
namespace
,
@project
)
endpoint:
namespace_project_environments_path
(
@project
.
namespace
,
@project
)
}
}
...
...
app/views/projects/environments/components/_environment.html.haml
View file @
2a40dec1
...
@@ -12,23 +12,27 @@
...
@@ -12,23 +12,27 @@
%i
{
"v-show"
=>
"!open"
}
%i
{
"v-show"
=>
"!open"
}
=
icon
(
"caret-right"
)
=
icon
(
"caret-right"
)
{{model.name}}
%td
.deployment-column
%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}}
{{model.last_deployment.iid}}
by
by
%span
{
"v-if"
=>
"model.last_deployment.user"
}
%span
{
"v-if"
=>
"model.last_deployment.user"
}
{{model.last_deployment.user}}
{{model.last_deployment.user
.name
}}
%td
%td
%a
{
"v-if"
=>
"!isFolder"
}
column 3
column 3
%td
%td
column 4
%a
{
"v-if"
=>
"!isFolder"
}
column 3
%td
%td
column 5
%span
{
"v-if"
=>
"!isFolder && model.last_deployment"
}
{{last_deployment.created_at}}
%td
.hidden-xs
%td
.hidden-xs
.pull-right
.pull-right
...
@@ -55,7 +59,9 @@
...
@@ -55,7 +59,9 @@
/= user_avatar(user: "child.last_deployment.user", size: 20)
/= user_avatar(user: "child.last_deployment.user", size: 20)
%td
%td
column 3
%a
.build-link
{
"v-if"
=>
"child.last_deployment && child.last_deployment.deployable"
,
":href"
=>
""
}
{{child.last_deployment}}
%td
%td
column 4
column 4
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment