From e509a49735c2083c49f6849a9391b20a456280c7 Mon Sep 17 00:00:00 2001 From: AvengerWeb Date: Sun, 17 Jul 2016 21:12:19 +0300 Subject: [PATCH 1/2] Start supporting for new API version. Add branch information --- .gitignore | 3 ++- js/app/info.js | 10 +++++----- partials/info.html | 2 +- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 24623e9..7f01194 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store -/config.js +config.js +.idea \ No newline at end of file diff --git a/js/app/info.js b/js/app/info.js index 8bd53df..7f41e59 100644 --- a/js/app/info.js +++ b/js/app/info.js @@ -16,7 +16,7 @@ $scope.keiraTag = "v" + $scope.keiraVersion; // API min required version - $scope.apiRequiredVersion = 0.6; + $scope.apiRequiredVersion = 0.8; // API version $http.get(app.api + "api") @@ -35,10 +35,10 @@ // Database world version $http.get(app.api + "version") - .success(function (data, status, header, config) { - $scope.databaseVersion = data[0].db_version; - $scope.coreVersion = data[0].core_version; - $scope.coreRevision = data[0].core_revision; + .success(function (response, status, header, config) { + $scope.databaseVersion = response.db_version; + $scope.coreVersion = response.core_version; + $scope.coreRevision = response.core_revision; }) .error(function (data, status, header, config) { console.log("[ERROR] /version/ $http.get request failed"); diff --git a/partials/info.html b/partials/info.html index dcdad0a..8004a5d 100644 --- a/partials/info.html +++ b/partials/info.html @@ -9,7 +9,7 @@ API version: - {{ apiVersion }} + {{ apiVersion }} ({{ apiBranch }}) DB version: From a846d488e417e40f5b121e002cde1057e037de33 Mon Sep 17 00:00:00 2001 From: Vadim Date: Mon, 18 Jul 2016 09:41:57 +0300 Subject: [PATCH 2/2] Add new line --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 7f01194..a12b985 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,3 @@ .DS_Store config.js -.idea \ No newline at end of file +.idea