diff options
| author | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 21:59:55 +0900 |
|---|---|---|
| committer | Shinya Maeda <shinya@gitlab.com> | 2017-11-07 21:59:55 +0900 |
| commit | a03b5d2291a11a23182576308897d2a8f909c970 (patch) | |
| tree | 5ff6cfa035debf92494ab7fb40f3b34b989147b7 /app/assets | |
| parent | 134e840d23ea08bfd578f9622ffec60c01ed665c (diff) | |
| parent | 67e12219bf6257568f91c1a9c883e4821337c80d (diff) | |
| download | gitlab-ce-a03b5d2291a11a23182576308897d2a8f909c970.tar.gz | |
Merge branch '38464-k8s-apps' of https://gitlab.com/gitlab-org/gitlab-ce into 38464-k8s-apps
Diffstat (limited to 'app/assets')
| -rw-r--r-- | app/assets/javascripts/clusters/clusters_bundle.js | 6 | ||||
| -rw-r--r-- | app/assets/javascripts/clusters/components/application_row.vue | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/app/assets/javascripts/clusters/clusters_bundle.js b/app/assets/javascripts/clusters/clusters_bundle.js index c486208175f..5f421ea58ba 100644 --- a/app/assets/javascripts/clusters/clusters_bundle.js +++ b/app/assets/javascripts/clusters/clusters_bundle.js @@ -163,12 +163,10 @@ export default class Clusters { .map(appId => newApplicationMap[appId].title); if (appTitles.length > 0) { - this.successApplicationContainer.textContent = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your cluster'), { + const text = sprintf(s__('ClusterIntegration|%{appList} was successfully installed on your cluster'), { appList: appTitles.join(', '), }); - this.successApplicationContainer.classList.remove('hidden'); - } else { - this.successApplicationContainer.classList.add('hidden'); + Flash(text, 'notice', this.successApplicationContainer); } } diff --git a/app/assets/javascripts/clusters/components/application_row.vue b/app/assets/javascripts/clusters/components/application_row.vue index b672111fda8..872abf03ef1 100644 --- a/app/assets/javascripts/clusters/components/application_row.vue +++ b/app/assets/javascripts/clusters/components/application_row.vue @@ -66,7 +66,7 @@ export default { // Avoid the potential for the real-time data to say APPLICATION_INSTALLABLE but // we already made a request to install and are just waiting for the real-time // to sync up. - return this.status !== APPLICATION_INSTALLABLE || + return (this.status !== APPLICATION_INSTALLABLE && this.status !== APPLICATION_ERROR) || this.requestStatus === REQUEST_LOADING || this.requestStatus === REQUEST_SUCCESS; }, |