From 15280f7e9ebda99f188b3f9c9b9dcec690bacefb Mon Sep 17 00:00:00 2001 From: Francesco Uliana Date: Tue, 26 Sep 2017 17:34:03 +0200 Subject: [PATCH] fix compose registry --- main.py | 6 +++--- static/scripts/controllers/create.js | 8 ++++++-- static/views/create.html | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/main.py b/main.py index 8a1d2de..a03c576 100644 --- a/main.py +++ b/main.py @@ -21,7 +21,7 @@ # Flask Application API_V1 = '/api/v1/' YML_PATH = os.getenv('DOCKER_COMPOSE_UI_YML_PATH') or '.' -COMPOSE_REGISTRY = os.getenv('DOCKER_COMPOSE_REGISTRY') or 'https://www.composeregistry.com' +COMPOSE_REGISTRY = os.getenv('DOCKER_COMPOSE_REGISTRY') logging.basicConfig(level=logging.INFO) app = Flask(__name__, static_url_path='') @@ -285,7 +285,7 @@ def remove_project(name): @app.route(API_V1 + "search", methods=['POST']) def search(): """ - search for a project on a docker-compose registry (e.g. www.composeregistry.com) + search for a project on a docker-compose registry """ query = loads(request.data)['query'] response = requests.get(COMPOSE_REGISTRY + '/api/v1/search', \ @@ -299,7 +299,7 @@ def search(): @app.route(API_V1 + "yml", methods=['POST']) def yml(): """ - get yml content from a docker-compose registry (e.g. www.composeregistry.com) + get yml content from a docker-compose registry """ item_id = loads(request.data)['id'] response = requests.get(COMPOSE_REGISTRY + '/api/v1/yml', \ diff --git a/static/scripts/controllers/create.js b/static/scripts/controllers/create.js index 970e22f..9b9d6b4 100644 --- a/static/scripts/controllers/create.js +++ b/static/scripts/controllers/create.js @@ -27,7 +27,11 @@ angular.module('composeUiApp') var ComposeRegistry = $resource('api/v1/compose-registry'); ComposeRegistry.get(function (data) { - $scope.composeRegistry = data.url; + var url = data.url; + $scope.composeRegistry = url; + if (url) { + $scope.search('yml'); + } }); $scope.createProject = function (name, yml, env) { @@ -82,7 +86,7 @@ angular.module('composeUiApp') }; - $scope.search('yml'); + $scope.load = function (name, id) { diff --git a/static/views/create.html b/static/views/create.html index 95292db..c663101 100644 --- a/static/views/create.html +++ b/static/views/create.html @@ -4,7 +4,7 @@

Create new project

-
+
create project from template