You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by an...@apache.org on 2015/12/15 05:26:15 UTC
[1/2] ignite git commit: IGNITE-2147 fixed reload data in ui ace tabs
- Fixes #328.
Repository: ignite
Updated Branches:
refs/heads/ignite-843-rc2 969e2974b -> c8e5dd4ed
IGNITE-2147 fixed reload data in ui ace tabs - Fixes #328.
Signed-off-by: Andrey <an...@gridgain.com>
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab8d726d
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab8d726d
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab8d726d
Branch: refs/heads/ignite-843-rc2
Commit: ab8d726d46cbc272fae6e1a5fa0ab0f78f9f3054
Parents: 969e297
Author: Dmitriyff <dm...@gmail.com>
Authored: Tue Dec 15 11:21:50 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Dec 15 11:21:50 2015 +0700
----------------------------------------------------------------------
.../main/js/app/directives/ui-ace-docker/ui-ace-docker.jade | 2 +-
.../src/main/js/app/directives/ui-ace-java/ui-ace-java.jade | 2 +-
.../src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade | 2 +-
.../src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade | 2 +-
.../src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade | 2 +-
.../modules/states/configuration/summary/summary.controller.js | 6 +++++-
.../src/main/js/app/services/UiAceOnLoad/service.js | 2 +-
7 files changed, 11 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab8d726d/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade
index cc153d7..bc620ed 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade
@@ -32,4 +32,4 @@ div
label(for='os') Operation System:
.col-xs-5.col-sm-4
input#os.form-control(type='text' ng-model='type' placeholder='debian:8' data-min-length='0' data-html='1' data-auto-select='true' bs-typeahead retain-selection bs-options='os for os in types')
- div(ui-ace='{onLoad: onLoad, mode: "dockerfile"}' ng-model='ctrl.data')
+ div(ui-ace='{onLoad: onLoad, mode: "dockerfile"}' ng-if='ctrl.data' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab8d726d/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
index 866e12a..2e54353 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
@@ -25,4 +25,4 @@ div
data-sort='false'
ng-model='type'
)
- div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')
+ div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-if='ctrl.data' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab8d726d/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
index 70162e8..fa21d7f 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
@@ -31,4 +31,4 @@ div
label
input(type='checkbox' ng-model='ctrl.includeKeyFields')
| Include key fields
- div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')
+ div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-if='ctrl.data' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab8d726d/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade
index eb023d7..bbc58df 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-div(ui-ace='{onLoad: onLoad, mode: "xml"}' ng-model='ctrl.data')
\ No newline at end of file
+div(ui-ace='{onLoad: onLoad, mode: "xml"}' ng-if='ctrl.data' ng-model='ctrl.data')
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab8d726d/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade
index ba324ff..a7a9f4b 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-div(ui-ace='{onLoad: onLoad, mode: "xml"}' ng-model='ctrl.data')
+div(ui-ace='{onLoad: onLoad, mode: "xml"}' ng-if='ctrl.data' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab8d726d/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index 0aaebff..ea0a617 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -28,7 +28,8 @@ export default [
$loading.finish('loading');
- $scope.selectItem(_.first(clusters));
+ const idx = sessionStorage.summarySelectedId || 0;
+ $scope.selectItem(clusters[idx]);
});
$scope.panelExpanded = $common.panelExpanded;
@@ -68,6 +69,9 @@ export default [
ctrl.cluster = cluster;
$scope.cluster = cluster;
$scope.selectedItem = cluster;
+
+ let idx = $scope.clusters.indexOf(cluster);
+ sessionStorage.summarySelectedId = idx;
};
let updateTab = (cluster) => {
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab8d726d/modules/control-center-web/src/main/js/app/services/UiAceOnLoad/service.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/services/UiAceOnLoad/service.js b/modules/control-center-web/src/main/js/app/services/UiAceOnLoad/service.js
index e63992d..1beef0e 100644
--- a/modules/control-center-web/src/main/js/app/services/UiAceOnLoad/service.js
+++ b/modules/control-center-web/src/main/js/app/services/UiAceOnLoad/service.js
@@ -33,4 +33,4 @@ export default ['IgniteUiAceOnLoad', () => {
editor.setTheme('ace/theme/chrome');
}
-}]
\ No newline at end of file
+}]
[2/2] ignite git commit: IGNITE-2147 Review
Posted by an...@apache.org.
IGNITE-2147 Review
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/c8e5dd4e
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/c8e5dd4e
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/c8e5dd4e
Branch: refs/heads/ignite-843-rc2
Commit: c8e5dd4ed4bf30e0f36d779e11e856bc00a29747
Parents: ab8d726
Author: Andrey <an...@gridgain.com>
Authored: Tue Dec 15 11:26:06 2015 +0700
Committer: Andrey <an...@gridgain.com>
Committed: Tue Dec 15 11:26:06 2015 +0700
----------------------------------------------------------------------
.../src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade | 2 +-
.../src/main/js/app/directives/ui-ace-java/ui-ace-java.jade | 2 +-
.../src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade | 2 +-
.../src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade | 2 +-
.../src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade | 2 +-
.../modules/states/configuration/summary/summary.controller.js | 5 +++--
6 files changed, 8 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade
index bc620ed..b903027 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-docker/ui-ace-docker.jade
@@ -32,4 +32,4 @@ div
label(for='os') Operation System:
.col-xs-5.col-sm-4
input#os.form-control(type='text' ng-model='type' placeholder='debian:8' data-min-length='0' data-html='1' data-auto-select='true' bs-typeahead retain-selection bs-options='os for os in types')
- div(ui-ace='{onLoad: onLoad, mode: "dockerfile"}' ng-if='ctrl.data' ng-model='ctrl.data')
+ div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "dockerfile"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
index 2e54353..cd4f1bb 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-java/ui-ace-java.jade
@@ -25,4 +25,4 @@ div
data-sort='false'
ng-model='type'
)
- div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-if='ctrl.data' ng-model='ctrl.data')
+ div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
index fa21d7f..311ddcd 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pojos/ui-ace-pojos.jade
@@ -31,4 +31,4 @@ div
label
input(type='checkbox' ng-model='ctrl.includeKeyFields')
| Include key fields
- div(ui-ace='{onLoad: onLoad, mode: "java"}' ng-if='ctrl.data' ng-model='ctrl.data')
+ div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "java"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade
index bbc58df..8e263ab 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-pom/ui-ace-pom.jade
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-div(ui-ace='{onLoad: onLoad, mode: "xml"}' ng-if='ctrl.data' ng-model='ctrl.data')
\ No newline at end of file
+div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "xml"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade b/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade
index a7a9f4b..8e263ab 100644
--- a/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade
+++ b/modules/control-center-web/src/main/js/app/directives/ui-ace-xml/ui-ace-xml.jade
@@ -14,4 +14,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-div(ui-ace='{onLoad: onLoad, mode: "xml"}' ng-if='ctrl.data' ng-model='ctrl.data')
+div(ng-if='ctrl.data' ui-ace='{onLoad: onLoad, mode: "xml"}' ng-model='ctrl.data')
http://git-wip-us.apache.org/repos/asf/ignite/blob/c8e5dd4e/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
----------------------------------------------------------------------
diff --git a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
index ea0a617..efa8966 100644
--- a/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
+++ b/modules/control-center-web/src/main/js/app/modules/states/configuration/summary/summary.controller.js
@@ -29,6 +29,7 @@ export default [
$loading.finish('loading');
const idx = sessionStorage.summarySelectedId || 0;
+
$scope.selectItem(clusters[idx]);
});
@@ -67,11 +68,11 @@ export default [
return;
ctrl.cluster = cluster;
+
$scope.cluster = cluster;
$scope.selectedItem = cluster;
- let idx = $scope.clusters.indexOf(cluster);
- sessionStorage.summarySelectedId = idx;
+ sessionStorage.summarySelectedId = $scope.clusters.indexOf(cluster);
};
let updateTab = (cluster) => {