Repository: ignite Updated Branches: refs/heads/ignite-843-rc2 873b939b0 -> 4abd9a9be
IGNITE-843 Minor. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/4abd9a9b Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/4abd9a9b Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/4abd9a9b Branch: refs/heads/ignite-843-rc2 Commit: 4abd9a9bea701e3920f338ac56f52e0fba3a8011 Parents: 873b939 Author: Alexey Kuznetsov <[email protected]> Authored: Wed Jan 20 10:17:09 2016 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Wed Jan 20 10:17:09 2016 +0700 ---------------------------------------------------------------------- .../ignite/console/agent/handlers/RestExecutor.java | 2 +- .../ignite/console/agent/remote/RemoteHandler.java | 3 --- .../src/main/js/agents/agent-manager.js | 2 +- .../main/js/views/configuration/domains-import.jade | 14 +++++++------- 4 files changed, 9 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/4abd9a9b/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java b/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java index aed1508..2f87726 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/handlers/RestExecutor.java @@ -172,7 +172,7 @@ public class RestExecutor { * Request result. */ public static class RestResult { - /** REST http code */ + /** REST http code. */ private int restCode; /** The field contains description of error if server could not handle the request. */ http://git-wip-us.apache.org/repos/asf/ignite/blob/4abd9a9b/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/remote/RemoteHandler.java ---------------------------------------------------------------------- diff --git a/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/remote/RemoteHandler.java b/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/remote/RemoteHandler.java index e681b15..ac28a96 100644 --- a/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/remote/RemoteHandler.java +++ b/modules/control-center-agent/src/main/java/org/apache/ignite/console/agent/remote/RemoteHandler.java @@ -174,9 +174,7 @@ public class RemoteHandler implements AutoCloseable { JsonObject res = new JsonObject(); res.addProperty("type", "CallRes"); - res.addProperty("reqId", reqId); - res.addProperty("error", exType + ": " + exMsg); snd.send(res); @@ -194,7 +192,6 @@ public class RemoteHandler implements AutoCloseable { JsonObject resp = new JsonObject(); resp.addProperty("type", "CallRes"); - resp.addProperty("reqId", reqId); JsonElement resJson = type == void.class ? JsonNull.INSTANCE : GSON.toJsonTree(res, type); http://git-wip-us.apache.org/repos/asf/ignite/blob/4abd9a9b/modules/control-center-web/src/main/js/agents/agent-manager.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/agents/agent-manager.js b/modules/control-center-web/src/main/js/agents/agent-manager.js index d0ae33a..eeb2cae 100644 --- a/modules/control-center-web/src/main/js/agents/agent-manager.js +++ b/modules/control-center-web/src/main/js/agents/agent-manager.js @@ -249,7 +249,7 @@ Client.prototype._invokeRmtMethod = function(method, args, callback) { if (callback) callback('org.apache.ignite.agent.AgentException: Connection is closed'); - return + return; } var msg = { http://git-wip-us.apache.org/repos/asf/ignite/blob/4abd9a9b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade index 3e5666e..fb99045 100644 --- a/modules/control-center-web/src/main/js/views/configuration/domains-import.jade +++ b/modules/control-center-web/src/main/js/views/configuration/domains-import.jade @@ -138,18 +138,18 @@ mixin td-ellipses-lbl(w, lbl) table.table-modal-striped(id='importTableData') tbody tr(ng-repeat='table in importDomain.displayedTables track by $index') - td(width='30px') + td(width='30px' style='min-width: 30px; max-width: 30px') input(type='checkbox' ng-model='table.use' ng-change='selectTable()') +td-ellipses-lbl('130px', '{{::table.schema}}') +td-ellipses-lbl('160px', '{{::table.tbl}}') - td.td-ellipsis(width='160px') - div(ng-show='ui.generateCaches') - button.select-toggle.form-control(ng-if='table.editCache' bs-select ng-model='table.cache' data-container='false' bs-options='item.value as item.label for item in importCaches') + td(width='160px' style='min-width: 160px; max-width: 160px') + div.td-ellipsis(ng-show='ui.generateCaches') a(ng-if='!table.editCache' ng-click='startEditDbTableCache(table)') {{dbTableCache(table)}} - td.td-ellipsis(width='128px') - div(ng-show='ui.generateCaches') - button.select-toggle.form-control(ng-if='table.editTemplate' bs-select ng-model='table.template' style='max-width: 110px' data-container='false' bs-options='item.value as item.label for item in importCacheTemplates') + button.select-toggle.form-control(ng-if='table.editCache' bs-select ng-model='table.cache' data-container='false' bs-options='item.value as item.label for item in importCaches') + td(width='128px' style='min-width: 128px; max-width: 128px') + div.td-ellipsis(ng-show='ui.generateCaches') a(ng-if='!table.editTemplate' ng-click='startEditDbTableTemplate(table)') {{dbTableTemplate(table)}} + button.select-toggle.form-control(ng-if='table.editTemplate' bs-select ng-model='table.template' style='max-width: 110px' data-container='false' bs-options='item.value as item.label for item in importCacheTemplates') td .settings-row .checkbox
