Repository: ignite Updated Branches: refs/heads/ignite-843 44906e5d3 -> 7c6ef2d0d
IGNITE-843 Minor UI fixes. Project: http://git-wip-us.apache.org/repos/asf/ignite/repo Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/7c6ef2d0 Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/7c6ef2d0 Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/7c6ef2d0 Branch: refs/heads/ignite-843 Commit: 7c6ef2d0d08768b31353c4943d7cb74b24637d2e Parents: 44906e5 Author: Alexey Kuznetsov <[email protected]> Authored: Mon Aug 31 16:15:30 2015 +0700 Committer: Alexey Kuznetsov <[email protected]> Committed: Mon Aug 31 16:15:30 2015 +0700 ---------------------------------------------------------------------- .../src/main/js/controllers/common-module.js | 9 ++++++++- .../src/main/js/controllers/metadata-controller.js | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6ef2d0/modules/control-center-web/src/main/js/controllers/common-module.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/common-module.js b/modules/control-center-web/src/main/js/controllers/common-module.js index 36c4a94..5e4d2da 100644 --- a/modules/control-center-web/src/main/js/controllers/common-module.js +++ b/modules/control-center-web/src/main/js/controllers/common-module.js @@ -495,7 +495,14 @@ controlCenterModule.service('$common', [ var marginTop = parent.css('marginTop'); - var parentHeight = Math.max(right.attr('min-height').replace('px', ''), 75, left.height() - 2 * (isDefined(marginTop) ? marginTop.replace('px', '') : 0)); + var minHeight = right.attr('min-height'); + + if (isDefined(minHeight) && minHeight.length > 0) + minHeight = minHeight.replace('px', ''); + else + minHeight = 0; + + var parentHeight = Math.max(minHeight, 75, left.height() - 2 * (isDefined(marginTop) ? marginTop.replace('px', '') : 0)); parent.outerHeight(parentHeight); http://git-wip-us.apache.org/repos/asf/ignite/blob/7c6ef2d0/modules/control-center-web/src/main/js/controllers/metadata-controller.js ---------------------------------------------------------------------- diff --git a/modules/control-center-web/src/main/js/controllers/metadata-controller.js b/modules/control-center-web/src/main/js/controllers/metadata-controller.js index e406d29..2179c32 100644 --- a/modules/control-center-web/src/main/js/controllers/metadata-controller.js +++ b/modules/control-center-web/src/main/js/controllers/metadata-controller.js @@ -867,7 +867,7 @@ controlCenterModule.controller('metadataController', [ var model = item[field.model]; if (!$common.isValidJavaIdentifier(dbFieldTable.msg + ' java name', dbFieldValue.javaName, $table.tableFieldId(index, 'JavaName' + dbFieldTable.id))) - return $table.tableFocusInvalidField(index, 'JavaName' + dbFieldTable.id); + return false; if ($common.isDefined(model)) { var idx = _.findIndex(model, function (dbMeta) {
