Welcome to mirror list, hosted at ThFree Co, Russian Federation.

gitlab.com/gitlab-org/gitlab-foss.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/assets/javascripts/clusters.js13
-rw-r--r--app/views/projects/clusters/show.html.haml2
2 files changed, 4 insertions, 11 deletions
diff --git a/app/assets/javascripts/clusters.js b/app/assets/javascripts/clusters.js
index 5a381a5322a..8bd4de92e6f 100644
--- a/app/assets/javascripts/clusters.js
+++ b/app/assets/javascripts/clusters.js
@@ -11,7 +11,6 @@ import './flash';
*
* - Polling status while creating or scheduled
* -- Update status area with the response result
- *
*/
class ClusterService {
@@ -23,7 +22,7 @@ class ClusterService {
}
}
-export default class ClusterEdit {
+export default class Clusters {
constructor() {
const dataset = document.querySelector('.js-edit-cluster-form').dataset;
@@ -54,12 +53,7 @@ export default class ClusterEdit {
toggle() {
this.toggleButton.classList.toggle('checked');
- this.state.toggleStatus = this.toggleButton.classList.contains('checked').toString();
- this.toggleInput.setAttribute('value', this.state.toggleStatus);
- }
-
- updateData() {
- this.service.updateData(this.state.toggleStatus);
+ this.toggleInput.setAttribute('value', this.toggleButton.classList.contains('checked').toString());
}
initPoling() {
@@ -104,7 +98,7 @@ export default class ClusterEdit {
break;
case 'errored':
this.errorContainer.classList.remove('hidden');
- this.errorContainer.querySelector('.js-error-reason').textContent = error.status_reason;
+ this.errorContainer.querySelector('.js-error-reason').textContent = error;
break;
case 'scheduled':
case 'creating':
@@ -114,5 +108,4 @@ export default class ClusterEdit {
this.hideAll();
}
}
-
}
diff --git a/app/views/projects/clusters/show.html.haml b/app/views/projects/clusters/show.html.haml
index 9746df76365..f160ce98b55 100644
--- a/app/views/projects/clusters/show.html.haml
+++ b/app/views/projects/clusters/show.html.haml
@@ -41,7 +41,7 @@
.hidden.js-cluster-error.alert.alert-danger{ role: 'alert' }
= s_('ClusterIntegration|Something went wrong while creating your cluster on Google Container Engine.')
- %code.js-error-reason
+ %p.js-error-reason
.hidden.js-cluster-creating.alert.alert-info{ role: 'alert' }
= s_('ClusterIntegration|Cluster is being created on Google Container Engine...')