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
1
Merge Requests
1
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
nexedi
gitlab-ce
Commits
3e60798e
Commit
3e60798e
authored
Jan 11, 2019
by
Scott Hampton
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Backporting environments helper
Allowing the EE to override a helper function to pass more data to vue
parent
1a319331
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
14 additions
and
8 deletions
+14
-8
app/assets/javascripts/environments/folder/environments_folder_bundle.js
...scripts/environments/folder/environments_folder_bundle.js
+4
-4
app/helpers/environments_helper.rb
app/helpers/environments_helper.rb
+9
-0
app/views/projects/environments/folder.html.haml
app/views/projects/environments/folder.html.haml
+1
-4
No files found.
app/assets/javascripts/environments/folder/environments_folder_bundle.js
View file @
3e60798e
...
...
@@ -15,11 +15,11 @@ export default () =>
const
environmentsData
=
document
.
querySelector
(
this
.
$options
.
el
).
dataset
;
return
{
endpoint
:
environmentsData
.
endpoint
,
folderName
:
environmentsData
.
f
olderName
,
endpoint
:
environmentsData
.
en
vironmentsDataEn
dpoint
,
folderName
:
environmentsData
.
environmentsDataF
olderName
,
cssContainerClass
:
environmentsData
.
cssClass
,
canCreateDeployment
:
parseBoolean
(
environmentsData
.
c
anCreateDeployment
),
canReadEnvironment
:
parseBoolean
(
environmentsData
.
c
anReadEnvironment
),
canCreateDeployment
:
parseBoolean
(
environmentsData
.
environmentsDataC
anCreateDeployment
),
canReadEnvironment
:
parseBoolean
(
environmentsData
.
environmentsDataC
anReadEnvironment
),
};
},
render
(
createElement
)
{
...
...
app/helpers/environments_helper.rb
View file @
3e60798e
...
...
@@ -7,6 +7,15 @@ module EnvironmentsHelper
}
end
def
environments_folder_list_view_data
{
"endpoint"
=>
folder_project_environments_path
(
@project
,
@folder
,
format: :json
),
"folder-name"
=>
@folder
,
"can-create-deployment"
=>
can?
(
current_user
,
:create_deployment
,
@project
).
to_s
,
"can-read-environment"
=>
can?
(
current_user
,
:read_environment
,
@project
).
to_s
,
}
end
def
metrics_data
(
project
,
environment
)
{
"settings-path"
=>
edit_project_service_path
(
project
,
'prometheus'
),
...
...
app/views/projects/environments/folder.html.haml
View file @
3e60798e
-
@no_container
=
true
-
page_title
_
(
"Environments"
)
#environments-folder-list-view
{
data:
{
endpoint:
folder_project_environments_path
(
@project
,
@folder
,
format: :json
),
"folder-name"
=>
@folder
,
"can-create-deployment"
=>
can?
(
current_user
,
:create_deployment
,
@project
).
to_s
,
"can-read-environment"
=>
can?
(
current_user
,
:read_environment
,
@project
).
to_s
,
#environments-folder-list-view
{
data:
{
environments_data:
environments_folder_list_view_data
,
"css-class"
=>
container_class
}
}
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