diff --git a/app/assets/javascripts/environments/components/environment_item.js.es6 b/app/assets/javascripts/environments/components/environment_item.js.es6 index 4476e7689cd..7ffc289719e 100644 --- a/app/assets/javascripts/environments/components/environment_item.js.es6 +++ b/app/assets/javascripts/environments/components/environment_item.js.es6 @@ -24,9 +24,7 @@ 'actions-component': window.gl.environmentsList.ActionsComponent, }, - props: { - model: Object, - }, + props: ['model', 'can-create-deployment', 'can-create-deployment', 'can-read-environment'], data() { return { @@ -247,6 +245,14 @@ return undefined; }, + + canReadEnvironmentParsed() { + return convertToBoolean(this.canReadEnvironment); + }, + + canCreateDeploymentParsed() { + return convertToBoolean(this.canCreateDeployment); + }, }, /** @@ -261,6 +267,19 @@ return {}.hasOwnProperty.call(obj, key); }, + /** + * Converts permission provided as strings to booleans. + * @param {String} string + * @returns {Boolean} + */ + convertPermissionToBoolean(string) { + if (string === 'true') { + return true; + } + + return false; + }, + methods: { /** * Toggles the visibility of a folders' children. @@ -272,6 +291,10 @@ }, }, + ready() { + debugger; + }, + template: ` @@ -340,7 +363,7 @@
-
+
diff --git a/app/views/projects/environments/index.html.haml b/app/views/projects/environments/index.html.haml index 050c87b8ab0..391dc8cdce2 100644 --- a/app/views/projects/environments/index.html.haml +++ b/app/views/projects/environments/index.html.haml @@ -5,7 +5,7 @@ - content_for :page_specific_javascripts do = page_specific_javascript_tag("environments/environments_bundle.js") -#environments-list-view{ data: { environments_data: environments_list_data, "can-create-deployment" => can?(current_user, :create_deployment, @environment), "can_read_environment" => can?(current_user, :read_environment, @project)}, class: container_class } +#environments-list-view{ data: { environments_data: environments_list_data, "can-create-deployment" => can?(current_user, :create_deployment, @environment), "can-read-environment" => can?(current_user, :read_environment, @project)}, class: container_class } .top-area %ul.nav-links{ "v-if" => "!loading" } %li{class: ('active' if @scope.nil?)} @@ -56,5 +56,9 @@ %th %th.hidden-xs %tbody - %tr{"is" => "environment-item", "v-for" => "model in filteredEnvironments", ":model" => "model"} + %tr{"is" => "environment-item", + "v-for" => "model in filteredEnvironments", + ":model" => "model", + "can-create-deployment" => can?(current_user, :create_deployment, @environment), + "can-read-environment" => can?(current_user, :read_environment, @project)}