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 2016/09/08 04:46:47 UTC
[30/50] [abbrv] ignite git commit: Minor fix.
Minor fix.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/ab9db26b
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/ab9db26b
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/ab9db26b
Branch: refs/heads/ignite-3629
Commit: ab9db26b5c23abe706dc372d3fe98da926c92881
Parents: 27176d5
Author: Andrey Novikov <an...@apache.org>
Authored: Tue Aug 30 14:37:20 2016 +0700
Committer: Andrey Novikov <an...@apache.org>
Committed: Tue Aug 30 14:37:20 2016 +0700
----------------------------------------------------------------------
.../frontend/app/modules/user/User.service.js | 18 +++++++++++-------
.../frontend/app/services/LegacyUtils.service.js | 16 ++++++----------
.../frontend/controllers/domains-controller.js | 18 ++++++++----------
3 files changed, 25 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab9db26b/modules/web-console/frontend/app/modules/user/User.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/modules/user/User.service.js b/modules/web-console/frontend/app/modules/user/User.service.js
index f95590a..8b9a1e7 100644
--- a/modules/web-console/frontend/app/modules/user/User.service.js
+++ b/modules/web-console/frontend/app/modules/user/User.service.js
@@ -16,23 +16,27 @@
*/
export default ['User', ['$q', '$injector', '$rootScope', '$state', '$http', function($q, $injector, $root, $state, $http) {
- let user = null;
+ let user;
return {
load() {
- return $http.post('/api/v1/user')
+ return user = $http.post('/api/v1/user')
.then(({data}) => {
- user = $root.user = data;
+ $root.user = data;
- $root.$broadcast('user', user);
+ $root.$broadcast('user', $root.user);
- return user;
+ return $root.user;
})
- .catch(({data}) => $q.reject(data));
+ .catch(({data}) => {
+ user = null;
+
+ return $q.reject(data);
+ });
},
read() {
if (user)
- return $q.resolve(user);
+ return user;
return this.load();
},
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab9db26b/modules/web-console/frontend/app/services/LegacyUtils.service.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/app/services/LegacyUtils.service.js b/modules/web-console/frontend/app/services/LegacyUtils.service.js
index 6328895..ed555a1 100644
--- a/modules/web-console/frontend/app/services/LegacyUtils.service.js
+++ b/modules/web-console/frontend/app/services/LegacyUtils.service.js
@@ -362,9 +362,7 @@ export default ['IgniteLegacyUtils', ['IgniteErrorPopover', (ErrorPopover) => {
isEmptyString,
SUPPORTED_JDBC_TYPES,
findJdbcType(jdbcType) {
- const res = _.find(ALL_JDBC_TYPES, function (item) {
- return item.dbType === jdbcType;
- });
+ const res = _.find(ALL_JDBC_TYPES, (item) => item.dbType === jdbcType);
return res ? res : {dbName: 'Unknown', javaType: 'Unknown'};
},
@@ -432,16 +430,14 @@ export default ['IgniteLegacyUtils', ['IgniteErrorPopover', (ErrorPopover) => {
},
cacheStoreJdbcDialects,
cacheStoreJdbcDialectsLabel(dialect) {
- const found = _.find(cacheStoreJdbcDialects, function (dialectVal) {
- return dialectVal.value === dialect;
- });
+ const found = _.find(cacheStoreJdbcDialects, (dialectVal) => dialectVal.value === dialect);
return found ? found.label : null;
},
checkDataSources(cluster, caches, checkCacheExt) {
let res = DS_CHECK_SUCCESS;
- _.find(caches, function (curCache, curIx) {
+ _.find(caches, (curCache, curIx) => {
res = compareDataSources(curCache, cluster);
if (!res.checked)
@@ -457,7 +453,7 @@ export default ['IgniteLegacyUtils', ['IgniteErrorPopover', (ErrorPopover) => {
return false;
}
- return _.find(caches, function (checkCache, checkIx) {
+ return _.find(caches, (checkCache, checkIx) => {
if (checkIx < curIx) {
res = compareDataSources(checkCache, curCache);
@@ -484,7 +480,7 @@ export default ['IgniteLegacyUtils', ['IgniteErrorPopover', (ErrorPopover) => {
return false;
}
- return _.find(caches, function (checkCache, checkIx) {
+ return _.find(caches, (checkCache, checkIx) => {
if (checkIx < curIx) {
res = compareSQLSchemaNames(checkCache, curCache);
@@ -551,7 +547,7 @@ export default ['IgniteLegacyUtils', ['IgniteErrorPopover', (ErrorPopover) => {
const errNameFull = actualError.$name;
const errNameShort = errNameFull.endsWith('TextInput') ? errNameFull.substring(0, errNameFull.length - 9) : errNameFull;
- const extractErrorMessage = function (errName) {
+ const extractErrorMessage = (errName) => {
try {
return errors[firstErrorKey][0].$errorMessages[errName][firstErrorKey];
}
http://git-wip-us.apache.org/repos/asf/ignite/blob/ab9db26b/modules/web-console/frontend/controllers/domains-controller.js
----------------------------------------------------------------------
diff --git a/modules/web-console/frontend/controllers/domains-controller.js b/modules/web-console/frontend/controllers/domains-controller.js
index ea53777..c1f6c91 100644
--- a/modules/web-console/frontend/controllers/domains-controller.js
+++ b/modules/web-console/frontend/controllers/domains-controller.js
@@ -397,9 +397,9 @@ export default ['domainsController', [
$scope.importDomain.loadingOptions = LOADING_JDBC_DRIVERS;
IgniteAgentMonitor.startWatch({text: 'Back to Domain models', goal: 'import domain model from database'})
- .then(function() {
- importDomainModal.$promise.then(importDomainModal.show);
-
+ .then(importDomainModal.$promise)
+ .then(importDomainModal.show)
+ .then(() => {
if (demo) {
$scope.ui.packageNameUserInput = $scope.ui.packageName;
$scope.ui.packageName = 'model';
@@ -420,7 +420,7 @@ export default ['domainsController', [
if (drivers && drivers.length > 0) {
drivers = _.sortBy(drivers, 'jdbcDriverJar');
- _.forEach(drivers, function(drv) {
+ _.forEach(drivers, (drv) => {
$scope.jdbcDriverJars.push({
label: drv.jdbcDriverJar,
value: {
@@ -432,13 +432,11 @@ export default ['domainsController', [
$scope.ui.selectedJdbcDriverJar = $scope.jdbcDriverJars[0].value;
- FormUtils.confirmUnsavedChanges($scope.ui.inputForm.$dirty, function() {
- importDomainModal.$promise.then(() => {
- $scope.importDomain.action = 'connect';
- $scope.importDomain.tables = [];
+ FormUtils.confirmUnsavedChanges($scope.ui.inputForm.$dirty, () => {
+ $scope.importDomain.action = 'connect';
+ $scope.importDomain.tables = [];
- Focus.move('jdbcUrl');
- });
+ Focus.move('jdbcUrl');
});
}
else {