diff --git a/assets/docker-manager-app.js b/assets/docker-manager-app.js index 0197092..7707904 100644 --- a/assets/docker-manager-app.js +++ b/assets/docker-manager-app.js @@ -19,7 +19,11 @@ define("docker-manager/components/progress-bar", function(__exports__) { "use strict"; __exports__["default"] = Em.Component.extend({ - classNameBindings: [':progress'], + classNameBindings: [':progress', ':progress-striped', 'active'], + + active: function() { + return parseInt(this.get('percent'), 10) !== 100; + }.property('percent'), barStyle: function() { var percent = parseInt(this.get('percent'), 10); @@ -295,8 +299,8 @@ define("docker-manager/models/repo", var Repo = Em.Object.extend({ upToDate: function() { - return this.get('version') === this.get('latest.version'); - }.property('version', 'latest.version'), + return !this.get('upgrading') & (this.get('version') === this.get('latest.version')); + }.property('upgrading', 'version', 'latest.version'), shouldCheck: function() { if (Em.isNone(this.get('version'))) { return false; } diff --git a/lib/docker_manager/upgrader.rb b/lib/docker_manager/upgrader.rb index b528d64..3de486b 100644 --- a/lib/docker_manager/upgrader.rb +++ b/lib/docker_manager/upgrader.rb @@ -15,6 +15,7 @@ class DockerManager::Upgrader def upgrade return unless @repo.start_upgrading + percent(0) clear_logs # HEAD@{upstream} is just a fancy way how to say origin/master (in normal case) diff --git a/manager-client/app/components/progress-bar.js b/manager-client/app/components/progress-bar.js index 4f5bb06..8e5517e 100644 --- a/manager-client/app/components/progress-bar.js +++ b/manager-client/app/components/progress-bar.js @@ -1,5 +1,9 @@ export default Em.Component.extend({ - classNameBindings: [':progress'], + classNameBindings: [':progress', ':progress-striped', 'active'], + + active: function() { + return parseInt(this.get('percent'), 10) !== 100; + }.property('percent'), barStyle: function() { var percent = parseInt(this.get('percent'), 10); diff --git a/manager-client/app/models/repo.js b/manager-client/app/models/repo.js index 8ee73ff..c447236 100644 --- a/manager-client/app/models/repo.js +++ b/manager-client/app/models/repo.js @@ -5,8 +5,8 @@ var loaded = []; var Repo = Em.Object.extend({ upToDate: function() { - return this.get('version') === this.get('latest.version'); - }.property('version', 'latest.version'), + return !this.get('upgrading') & (this.get('version') === this.get('latest.version')); + }.property('upgrading', 'version', 'latest.version'), shouldCheck: function() { if (Em.isNone(this.get('version'))) { return false; }