From 8bef2c9cf0867605b4d654ec9ac739631e50a9d9 Mon Sep 17 00:00:00 2001 From: Julia Aranovich Date: Mon, 18 Jan 2016 15:45:46 +0300 Subject: [PATCH] Force no-script-url eslint rule Implements: blueprint converge-to-eslint-config-openstack Change-Id: I96b2e99c54ce032f7561e60f9b21970e8b0b44c6 --- .eslintrc | 1 - static/views/clusters_page.js | 13 ++++++++++--- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/.eslintrc b/.eslintrc index 96549653f..00f8a0f90 100644 --- a/.eslintrc +++ b/.eslintrc @@ -16,7 +16,6 @@ # to be fixed and enabled complexity: 0 eqeqeq: 0 - no-script-url: 0 max-len: [0, 120] # extra rules diff --git a/static/views/clusters_page.js b/static/views/clusters_page.js index 340a4f93f..cbb012d80 100644 --- a/static/views/clusters_page.js +++ b/static/views/clusters_page.js @@ -126,11 +126,18 @@ Cluster = React.createClass({ var cluster = this.props.cluster; var status = cluster.get('status'); var nodes = cluster.get('nodes'); - var deletionTask = cluster.task({name: 'cluster_deletion', active: true}) || cluster.task({name: 'cluster_deletion', status: 'ready'}); + var isClusterDeleting = !!cluster.task({name: 'cluster_deletion', active: true}) || !!cluster.task({name: 'cluster_deletion', status: 'ready'}); var deploymentTask = cluster.task({group: 'deployment', active: true}); + var Tag = isClusterDeleting ? 'div' : 'a'; return (
- +
{cluster.get('name')}
{i18n('clusters_page.cluster_hardware_nodes')}
@@ -164,7 +171,7 @@ Cluster = React.createClass({ }
-
+
); }