Repository: syncope Updated Branches: refs/heads/master 50ecf0d80 -> d2f2b1ad1
[SYNCOPE-719] enduser clean up Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d2f2b1ad Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d2f2b1ad Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d2f2b1ad Branch: refs/heads/master Commit: d2f2b1ad1babe846fd963fd1d3177ff3d4493e8a Parents: 50ecf0d Author: giacomolm <giacom...@hotmail.it> Authored: Tue Dec 22 10:36:00 2015 +0100 Committer: giacomolm <giacom...@hotmail.it> Committed: Tue Dec 22 10:36:00 2015 +0100 ---------------------------------------------------------------------- .../main/resources/META-INF/resources/app/js/app.js | 16 ++++++++-------- .../resources/app/js/controllers/UserController.js | 9 +++++++-- .../META-INF/resources/app/views/editUser.html | 6 +++--- .../META-INF/resources/app/views/self.html | 6 +++--- .../resources/app/views/user-credentials.html | 4 ++-- .../META-INF/resources/app/views/user-groups.html | 4 ++-- .../resources/app/views/user-plain-schemas.html | 4 ++-- .../resources/app/views/user-resources.html | 4 ++-- 8 files changed, 29 insertions(+), 24 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/syncope/blob/d2f2b1ad/client/enduser/src/main/resources/META-INF/resources/app/js/app.js ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js index 1a53f00..d747689 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js +++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js @@ -73,23 +73,23 @@ app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'growlProvi url: '/credentials', templateUrl: 'views/user-credentials.html' }) + .state('create.groups', { + url: '/groups', + templateUrl: 'views/user-groups.html' + }) .state('create.plainSchemas', { url: '/plainSchemas', templateUrl: 'views/user-plain-schemas.html' }) - .state('create.derivedSchemas', { + /*.state('create.derivedSchemas', { url: '/derivedSchemas', templateUrl: 'views/user-derived-schemas.html' }) .state('create.virtualSchemas', { url: '/virtualSchemas', templateUrl: 'views/user-virtual-schemas.html' - }) + })*/ // url will be /self/create/schema - .state('create.groups', { - url: '/groups', - templateUrl: 'views/user-groups.html' - }) .state('create.resources', { url: '/resources', templateUrl: 'views/user-resources.html' @@ -124,7 +124,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'growlProvi } } }) - .state('update.derivedSchemas', { + /*.state('update.derivedSchemas', { url: '/derivedSchemas', templateUrl: 'views/user-derived-schemas.html', resolve: { @@ -141,7 +141,7 @@ app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider', 'growlProvi return AuthenticationHelper.authenticated(); } } - }) + })*/ // url will be /self/create/schema .state('update.groups', { url: '/groups', http://git-wip-us.apache.org/repos/asf/syncope/blob/d2f2b1ad/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js index 892de21..2cd3f77 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js +++ b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js @@ -192,8 +192,13 @@ angular.module("self").controller("UserController", ['$scope', '$rootScope', '$l UserSelfService.update(user).then(function (response) { console.log("Updated user: ", response); - growl.success("User " + $scope.user.username + " successfully updated", {referenceId: 1}); - $location.path('/self'); + AuthService.logout().then(function (response) { + console.log("LOGOUT SUCCESS: ", response); + $location.path('/self'); + growl.success("User " + $scope.user.username + " successfully updated", {referenceId: 1}); + }, function () { + console.log("LOGOUT FAILED"); + }); }, function (response) { console.log("Error during user update: ", response); growl.error("Error: " + response, {referenceId: 2}); http://git-wip-us.apache.org/repos/asf/syncope/blob/d2f2b1ad/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html index 9361cdf..398cbcf 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html +++ b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html @@ -39,10 +39,10 @@ under the License. <a href="#/self" class="btn btn-default"><i class="glyphicon glyphicon-home"></i></a> <!--add class breadcrumb-disabled-link to buttons to prevent click--> <a ui-sref-active="active" ui-sref=".credentials" class="btn btn-default">Credentials</a> - <a ui-sref-active="active" ui-sref=".plainSchemas" class="btn btn-default">Plain Schemas</a> - <a ui-sref-active="active" ui-sref=".derivedSchemas" class="btn btn-default">Derived Schemas</a> - <a ui-sref-active="active" ui-sref=".virtualSchemas" class="btn btn-default">Virtual Schemas</a> <a ui-sref-active="active" ui-sref=".groups" class="btn btn-default">Groups</a> + <a ui-sref-active="active" ui-sref=".plainSchemas" class="btn btn-default">Plain Schemas</a> + <!--<a ui-sref-active="active" ui-sref=".derivedSchemas" class="btn btn-default">Derived Schemas</a> + <a ui-sref-active="active" ui-sref=".virtualSchemas" class="btn btn-default">Virtual Schemas</a>--> <a ui-sref-active="active" ui-sref=".resources" class="btn btn-default">Resources</a> </div> </div> http://git-wip-us.apache.org/repos/asf/syncope/blob/d2f2b1ad/client/enduser/src/main/resources/META-INF/resources/app/views/self.html ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html index 0139697..fe7f00f 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/views/self.html +++ b/client/enduser/src/main/resources/META-INF/resources/app/views/self.html @@ -44,14 +44,14 @@ under the License. </a> </div> <div> - <div id="language" class="form-group" ng-controller="LanguageController" ng-init="init()"> + <!--<div id="language" class="form-group" ng-controller="LanguageController" ng-init="init()"> <div id="languageContainer" class="col-xs-2"> <select class="form-control" ng-options="language.name for language in languages.availableLanguages track by language.id" ng-model="languages.selectedLanguage" ></select> </div> - </div> + </div>--> <h3>Welcome to Apache Syncope Enduser</h3> <h5 ng-show="!isLogged()">please login to self update</h5> @@ -76,7 +76,7 @@ under the License. <button type="submit" id="login-btn" class="btn btn-default btn-signin login-btn" ng-click="login(credentials)">Login</button> <a href="javascript:void(0);" class="btn btn-link" ng-click="selfCreate()">Self Registration</a> - <a href="javascript:void(0);" class="btn btn-link" ng-click="passwordReset()">Password Reset</a> + <!--<a href="javascript:void(0);" class="btn btn-link" ng-click="passwordReset()">Password Reset</a>--> </div> </form> http://git-wip-us.apache.org/repos/asf/syncope/blob/d2f2b1ad/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html index cfd1ba6..b51a45a 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html +++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-credentials.html @@ -52,8 +52,8 @@ under the License. </div> <div class="form-group row"> - <navigation-buttons ng-show="createMode" next="create.plainSchemas" previous="none"></navigation-buttons> - <navigation-buttons ng-show="!createMode" next="update.plainSchemas" previous="none"></navigation-buttons> + <navigation-buttons ng-show="createMode" next="create.groups" previous="none"></navigation-buttons> + <navigation-buttons ng-show="!createMode" next="update.groups" previous="none"></navigation-buttons> <div class="col-xs-6 col-xs-offset-3"> <a id="cancel" href="#/self" class="btn btn-danger">Cancel</a> </div> http://git-wip-us.apache.org/repos/asf/syncope/blob/d2f2b1ad/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html index 58475bb..5413fc5 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html +++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-groups.html @@ -29,8 +29,8 @@ under the License. </div> <div class="form-group row"> - <navigation-buttons ng-show="createMode" next="create.resources" previous="create.virtualSchemas"></navigation-buttons> - <navigation-buttons ng-show="!createMode" next="update.resources" previous="update.virtualSchemas"></navigation-buttons> + <navigation-buttons ng-show="createMode" next="create.plainSchemas" previous="create.credentials"></navigation-buttons> + <navigation-buttons ng-show="!createMode" next="update.plainSchemas" previous="update.credentials"></navigation-buttons> <div class="col-xs-6 col-xs-offset-3"> <a id="cancel" href="#/self" class="btn btn-danger">Cancel</a> </div> http://git-wip-us.apache.org/repos/asf/syncope/blob/d2f2b1ad/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html index 2639197..211ab1e 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html +++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-schemas.html @@ -29,8 +29,8 @@ under the License. <!--</div>--> <div class="form-group row"> - <navigation-buttons ng-show="createMode" next="create.derivedSchemas" previous="create.credentials"></navigation-buttons> - <navigation-buttons ng-show="!createMode" next="update.derivedSchemas" previous="update.credentials"></navigation-buttons> + <navigation-buttons ng-show="createMode" next="create.resources" previous="create.groups"></navigation-buttons> + <navigation-buttons ng-show="!createMode" next="update.resources" previous="update.groups"></navigation-buttons> <div class="col-xs-6 col-xs-offset-3"> <a id="cancel" href="#/self" class="btn btn-danger">Cancel</a> </div> http://git-wip-us.apache.org/repos/asf/syncope/blob/d2f2b1ad/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html ---------------------------------------------------------------------- diff --git a/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html b/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html index 91a99f6..3ee2e78 100644 --- a/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html +++ b/client/enduser/src/main/resources/META-INF/resources/app/views/user-resources.html @@ -19,8 +19,8 @@ under the License. --> <div class="form-group row"> - <navigation-buttons ng-show="createMode" next="none" previous="create.groups"></navigation-buttons> - <navigation-buttons ng-show="!createMode" next="none" previous="update.groups"></navigation-buttons> + <navigation-buttons ng-show="createMode" next="none" previous="create.plainSchemas"></navigation-buttons> + <navigation-buttons ng-show="!createMode" next="none" previous="update.plainSchemas"></navigation-buttons> <div class="col-xs-6 col-xs-offset-3"> <a id="cancel" href="#/self" class="btn btn-danger">Cancel</a> <button id="save" type="submit" class="btn btn-success">Save</button>