You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sb...@apache.org on 2017/05/04 13:37:44 UTC
[40/67] [abbrv] ignite git commit: IGNITE-4995 Minor code cleanup.
IGNITE-4995 Minor code cleanup.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/eb6a1697
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/eb6a1697
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/eb6a1697
Branch: refs/heads/ignite-5075
Commit: eb6a1697f5b31827edb780e0cf001e9bb3acac9e
Parents: fcc41ac
Author: Alexey Kuznetsov <ak...@gridgain.com>
Authored: Sat Apr 29 20:27:33 2017 +0700
Committer: Alexey Kuznetsov <ak...@gridgain.com>
Committed: Sat Apr 29 20:27:33 2017 +0700
----------------------------------------------------------------------
modules/web-console/frontend/app/app.config.js | 4 +++-
.../app/components/cluster-select/cluster-select.pug | 3 ++-
modules/web-console/frontend/app/helpers/jade/mixins.pug | 8 +-------
.../web-console/frontend/app/modules/sql/sql.controller.js | 2 +-
4 files changed, 7 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb6a1697/modules/web-console/frontend/app/app.config.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/app.config.js b/modules/web-console/frontend/app/app.config.js
index cf527e6..1772453 100644
--- a/modules/web-console/frontend/app/app.config.js
+++ b/modules/web-console/frontend/app/app.config.js
@@ -20,10 +20,12 @@ import angular from 'angular';
const nonNil = _.negate(_.isNil);
const nonEmpty = _.negate(_.isEmpty);
+const id8 = (uuid) => uuid.substring(0, 8).toUpperCase();
_.mixin({
nonNil,
- nonEmpty
+ nonEmpty,
+ id8
});
import alertTemplateUrl from 'views/templates/alert.tpl.pug';
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb6a1697/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug b/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug
index 9c1ab75..c290838 100644
--- a/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug
+++ b/modules/web-console/frontend/app/components/cluster-select/cluster-select.pug
@@ -35,6 +35,7 @@ ul.nav.navbar-nav(ng-if='!IgniteDemoMode' ng-switch='ctrl.clusters.length' style
div(ng-click='item.click()')
i.icon-cluster.pull-left(style='margin: 0; padding-left: 10px;')
div: a {{item.name}}
-i.icon-help(bs-tooltip='' data-placement='bottom' data-html=true style='padding-right: 20px; line-height: 25px'
+i.icon-help(ng-if='!IgniteDemoMode' bs-tooltip='' data-placement='bottom' data-html=true style='line-height: 25px'
data-title='Multi-Cluster Support<br/>\
<a href="https://apacheignite-tools.readme.io/docs/multi-cluster-support" target="_blank">More info</a>')
+span(ng-if='!IgniteDemoMode' style='padding-right: 20px')
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb6a1697/modules/web-console/frontend/app/helpers/jade/mixins.pug
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/helpers/jade/mixins.pug b/modules/web-console/frontend/app/helpers/jade/mixins.pug
index 672b8f8..73aa7c5 100644
--- a/modules/web-console/frontend/app/helpers/jade/mixins.pug
+++ b/modules/web-console/frontend/app/helpers/jade/mixins.pug
@@ -15,10 +15,10 @@
limitations under the License.
include ./form
-include ../../primitives/tooltip/index
include ../../primitives/btn-group/index
include ../../primitives/datepicker/index
include ../../primitives/dropdown/index
+include ../../primitives/tooltip/index
include ../../primitives/ui-grid-settings/index
//- Mixin for advanced options toggle.
@@ -209,12 +209,6 @@ mixin url(lbl, model, name, required, placeholder, tip)
if block
block
-//- Mixin for text field.
-mixin url(lbl, model, name, required, placeholder, tip)
- +ignite-form-field-url(lbl, model, name, required, placeholder, tip)
- if block
- block
-
//- Mixin for password field.
mixin password(lbl, model, name, required, placeholder, tip)
+ignite-form-field-password(lbl, model, name, false, required, placeholder, tip)
http://git-wip-us.apache.org/repos/asf/ignite/blob/eb6a1697/modules/web-console/frontend/app/modules/sql/sql.controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/sql/sql.controller.js b/modules/web-console/frontend/app/modules/sql/sql.controller.js
index b3ca91b..c86ab6b 100644
--- a/modules/web-console/frontend/app/modules/sql/sql.controller.js
+++ b/modules/web-console/frontend/app/modules/sql/sql.controller.js
@@ -1478,8 +1478,8 @@ export default ['$rootScope', '$scope', '$http', '$q', '$timeout', '$interval',
$scope.scan = (paragraph, local = false) => {
const cacheName = paragraph.cacheName;
- const filter = paragraph.filter;
const caseSensitive = !!paragraph.caseSensitive;
+ const filter = paragraph.filter;
const pageSize = paragraph.pageSize;
$scope.actionAvailable(paragraph, false) && _chooseNode(cacheName, local)