From b168eb2fc2d5fc9c6eb42c4603e85d8888d90fce Mon Sep 17 00:00:00 2001 From: Sam Date: Tue, 23 Dec 2014 15:01:59 +1100 Subject: [PATCH] Correct banner detection --- app/controllers/docker_manager/admin_controller.rb | 2 +- dev_server.js | 4 ++++ manager-client/app/controllers/application.js | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100755 dev_server.js diff --git a/app/controllers/docker_manager/admin_controller.rb b/app/controllers/docker_manager/admin_controller.rb index 8aab065..4779095 100644 --- a/app/controllers/docker_manager/admin_controller.rb +++ b/app/controllers/docker_manager/admin_controller.rb @@ -39,7 +39,7 @@ module DockerManager def latest repo = DockerManager::GitRepo.new(params[:path]) - repo.update! + repo.update! if Rails.env == 'production' render json: {latest: {version: repo.latest_origin_commit, commits_behind: repo.commits_behind, diff --git a/dev_server.js b/dev_server.js new file mode 100755 index 0000000..6bd3f6a --- /dev/null +++ b/dev_server.js @@ -0,0 +1,4 @@ +#!/bin/bash + +(cd manager-client && ember serve --proxy "http://localhost:3000") + diff --git a/manager-client/app/controllers/application.js b/manager-client/app/controllers/application.js index 8391331..01bc311 100644 --- a/manager-client/app/controllers/application.js +++ b/manager-client/app/controllers/application.js @@ -13,7 +13,7 @@ export default Ember.ObjectController.extend({ appendBannerHtml: function(html){ var banner = this.get("banner") || []; if(banner.indexOf(html) === -1){ - banner.push(html); + banner.pushObject(html); } this.set("banner", banner); },