syncope git commit: [SYNCOPE-854] show file preview for binary attributes
Repository: syncope
Updated Branches:
refs/heads/master 715820744 -> 451f89bf7
[SYNCOPE-854] show file preview for binary attributes
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/451f89bf
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/451f89bf
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/451f89bf
Branch: refs/heads/master
Commit: 451f89bf761c39a174e1899963d433c27d5fb6ae
Parents: 7158207
Author: Matteo Di Carlo
Authored: Mon Aug 29 17:32:00 2016 +0200
Committer: Matteo Di Carlo
Committed: Mon Aug 29 17:32:00 2016 +0200
--
client/enduser/pom.xml | 4 ++
.../resources/META-INF/resources/app/index.html | 3 ++
.../app/js/directives/dynamicPlainAttribute.js | 19 ---
.../resources/app/js/directives/fileInput.js| 55
.../app/views/dynamicPlainAttribute.html| 23
pom.xml | 8 +++
6 files changed, 89 insertions(+), 23 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/451f89bf/client/enduser/pom.xml
--
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index 2ce8aa7..9b655f0 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -99,6 +99,10 @@ under the License.
org.webjars.bower
+ bootstrap-fileinput
+
+
+ org.webjars.bower
ng-password-strength
http://git-wip-us.apache.org/repos/asf/syncope/blob/451f89bf/client/enduser/src/main/resources/META-INF/resources/app/index.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 7f0271f..457cb76 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -80,6 +80,8 @@ under the License.
+
+
@@ -113,6 +115,7 @@ under the License.
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/451f89bf/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttribute.js
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttribute.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttribute.js
index 0b9526c..40d9fad 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttribute.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicPlainAttribute.js
@@ -18,7 +18,6 @@
*/
'use strict';
-
angular.module('self')
.directive('dynamicPlainAttribute', function ($filter) {
return {
@@ -39,8 +38,9 @@ angular.module('self')
break;
case "Enum":
$scope.enumerationValues = [];
+
//SYNCOPE-911 empty value option on non required
attributes
-if(schema.mandatoryCondition != "true"){
+if (schema.mandatoryCondition !== "true") {
$scope.enumerationValues.push("");
}
var enumerationValuesSplitted =
schema.enumerationValues.toString().split(";");
@@ -50,6 +50,7 @@ angular.module('self')
$scope.user.plainAttrs[schema.key].values[index] =
$scope.user.plainAttrs[schema.key].values[index]
|| $scope.enumerationValues[0];
break;
+
case "Binary":
$scope.userFile = $scope.userFile || '';
$element.bind("change", function (changeEvent) {
@@ -67,22 +68,20 @@ angular.module('self')
$scope.download = function () {
var byteString =
atob($scope.user.plainAttrs[schema.key].values[index]);
-
var ab = new ArrayBuffer(byteString.length);
var ia = new Uint8Array(ab);
for (var i = 0; i < byteString.length; i++) {
ia[i] = byteString.charCodeAt(i);
}
-
var blob = new Blob([ia], {type: schema.mimeType});
-
saveAs(blob, schema.key);
};
-$scope.remove = function () {
+
+//file upload and preview
+$('#fileInput').on('fileclear', function () {
$scope.user.plai
[1/3] syncope git commit: [SYNCOPE-853] add test for group with type extensions in edit user test for enduser
Repository: syncope
Updated Branches:
refs/heads/master aa90d8408 -> ef5784b1e
[SYNCOPE-853] add test for group with type extensions in edit user test for
enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/de5e9f1a
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/de5e9f1a
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/de5e9f1a
Branch: refs/heads/master
Commit: de5e9f1aff72eb8d7a14642c392c32c1351e1254
Parents: ac5be58
Author: Matteo Di Carlo
Authored: Tue Sep 6 12:11:34 2016 +0200
Committer: Matteo Di Carlo
Committed: Wed Sep 7 09:31:17 2016 +0200
--
.../client/enduser/protractor/tests/edituser.js | 32 +---
1 file changed, 21 insertions(+), 11 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/de5e9f1a/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
--
diff --git
a/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
b/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
index 8bae5a1..04e888d 100644
---
a/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
+++
b/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
@@ -32,7 +32,7 @@ describe('syncope enduser user edit', function () {
it('should edit user credentials', function () {
browser.get('http://localhost:9080/syncope-enduser/app/');
-//login
+//login
element(by.model('credentials.username')).sendKeys('bellini');
element(by.model('credentials.password')).sendKeys('password');
element.all(by.options('language.name for language in
languages.availableLanguages track by language.id')).
@@ -43,34 +43,39 @@ describe('syncope enduser user edit', function () {
get(0).click();
element(by.id('login-btn')).click();
-//credential
+//credential
element(by.model('user.username')).clear();
element(by.model('user.username')).sendKeys('bellini');
element(by.model('user.password')).clear();
element(by.model('user.password')).sendKeys('password');
element(by.model('confirmPassword.value')).sendKeys('password');
var secQuestion = element(by.model('user.securityQuestion'));
-var selectedSecQuestion = secQuestion.all(by.options('securityQuestion.key
as securityQuestion.content for securityQuestion in
availableSecurityQuestions')).last();
+var selectedSecQuestion = secQuestion.all(by.options
+('securityQuestion.key as securityQuestion.content for
securityQuestion in availableSecurityQuestions'))
+.last();
selectedSecQuestion.click();
element(by.model('user.securityAnswer')).sendKeys('Agata Ferlito');
-browser.driver.sleep(1000);
+//browser.driver.sleep(1000);
next();
-//groups
+//groups
var group = element(by.model('dynamicForm.selectedGroups'));
var selectedGroup = group.element(by.css('.ui-select-search'));
group.click();
-
+
+// add "additional", a group with type extensions, and "root".
selectedGroup.sendKeys('additional');
element.all(by.css('.ui-select-choices-row-inner span')).first().click();
selectedGroup.sendKeys('root');
element.all(by.css('.ui-select-choices-row-inner span')).first().click();
-browser.driver.sleep(1500);
-
next();
-//plainSchemas
-
+//plainSchemas
+// count groups in plainschemas: "own" and "additional".
+element.all(by.repeater('groupSchema in
dynamicForm.groupSchemas')).then(function (groupSchema) {
+ expect(groupSchema.length).toBe(2);
+})
+// fills own fields
element(by.css('[name="fullname"]')).clear();
element(by.css('[name="fullname"]')).sendKeys('Vincenzo Bellini');
element(by.css('[name="userId"]')).clear();
@@ -84,7 +89,12 @@ describe('syncope enduser user edit', function () {
element(by.css('[name="surname"]')).sendKeys('Bellini');
element(by.css('[name="ctype"]')).clear();
element(by.css('[name="ctype"]')).sendKeys('bellinictype');
-
+next();
+//derSchemas
+next();
+//virSchemas
+next();
+//Resources
next();
});
[2/3] syncope git commit: [SYNCOPE-853] add angularjs tests for edit-user in enduser component
[SYNCOPE-853] add angularjs tests for edit-user in enduser component
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ac5be588
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ac5be588
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ac5be588
Branch: refs/heads/master
Commit: ac5be5889c26e41f39dc8d660bdd6b4813ead47d
Parents: aa90d84
Author: Matteo Di Carlo
Authored: Tue Sep 6 11:31:04 2016 +0200
Committer: Matteo Di Carlo
Committed: Wed Sep 7 09:31:17 2016 +0200
--
.../META-INF/resources/app/views/groups.html| 2 +-
.../client/enduser/protractor/tests/edituser.js | 74 ++--
2 files changed, 55 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/ac5be588/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
index 03f728f..2f00a9a 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/views/groups.html
@@ -25,7 +25,7 @@ under the License.
-
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/ac5be588/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
--
diff --git
a/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
b/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
index 7096736..8bae5a1 100644
---
a/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
+++
b/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
@@ -17,45 +17,79 @@
* under the License.
*/
-
describe('syncope enduser user edit', function () {
function next() {
element.all(by.id('next')).last().click();
- };
-
-
- function fillDropDownMenu(modelId, option) {
-this.item = element(by.model(modelId));
-this.item.click();
-element.all(by.id(option)).first().click();
-browser.driver.sleep(1500);
}
;
+ function cancel() {
+element.all(by.id('cancel')).last().click();
+ }
+ ;
it('should edit user credentials', function () {
browser.get('http://localhost:9080/syncope-enduser/app/');
-//login
+//login
element(by.model('credentials.username')).sendKeys('bellini');
element(by.model('credentials.password')).sendKeys('password');
-element.all(by.options('language.name for language in
languages.availableLanguages track by language.id')).then(function (language) {
- expect(language.length).toBe(3);
-});
-element.all(by.options('language.name for language in
languages.availableLanguages track by language.id')).get(0).click();
+element.all(by.options('language.name for language in
languages.availableLanguages track by language.id')).
+then(function (language) {
+ expect(language.length).toBe(3);
+});
+element.all(by.options('language.name for language in
languages.availableLanguages track by language.id')).
+get(0).click();
element(by.id('login-btn')).click();
-//credential
-//element(by.model('user.username')).sendKeys('bellini123');
-//element(by.model('user.password')).sendKeys('password123');
-//element(by.model('confirmPassword.value')).sendKeys('password123');
+//credential
+element(by.model('user.username')).clear();
+element(by.model('user.username')).sendKeys('bellini');
+element(by.model('user.password')).clear();
+element(by.model('user.password')).sendKeys('password');
+element(by.model('confirmPassword.value')).sendKeys('password');
+var secQuestion = element(by.model('user.securityQuestion'));
+var selectedSecQuestion = secQuestion.all(by.options('securityQuestion.key
as securityQuestion.content for securityQuestion in
availableSecurityQuestions')).last();
+selectedSecQuestion.click();
+element(by.model('user.securityAnswer')).sendKeys('Agata Ferlito');
+browser.driver.sleep(1000);
+next();
+
+//groups
+var group = element(by.model('dynamicForm.selectedGroups'));
+var selectedGroup = group.element(by.css('.ui-select-search'));
+group.click();
+
+selectedGroup.sendKeys('additional');
+element.all(by.css('.ui-select-choices-row-inner span')).first().click();
+selectedGroup.sendKeys('root');
+element.all(by.css('.ui-select-choices-r
[3/3] syncope git commit: [SYNCOPE-853] making all tests work togheter
[SYNCOPE-853] making all tests work togheter
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ef5784b1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ef5784b1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ef5784b1
Branch: refs/heads/master
Commit: ef5784b1ede2fd33de430cf2764cc669f79106d9
Parents: de5e9f1
Author: Matteo Di Carlo
Authored: Wed Sep 7 09:34:26 2016 +0200
Committer: Matteo Di Carlo
Committed: Wed Sep 7 09:35:15 2016 +0200
--
.../client/enduser/protractor/tests/edituser.js | 105 --
.../client/enduser/protractor/tests/abstract.js | 4 +-
.../client/enduser/protractor/tests/create.js | 2 +-
.../client/enduser/protractor/tests/edituser.js | 108 +++
.../client/enduser/protractor/tests/login.js| 22 +++-
5 files changed, 131 insertions(+), 110 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/ef5784b1/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
--
diff --git
a/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
b/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
deleted file mode 100644
index 04e888d..000
---
a/client/enduser/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/edituser.js
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-describe('syncope enduser user edit', function () {
-
- function next() {
-element.all(by.id('next')).last().click();
- }
- ;
-
- function cancel() {
-element.all(by.id('cancel')).last().click();
- }
- ;
-
- it('should edit user credentials', function () {
-browser.get('http://localhost:9080/syncope-enduser/app/');
-
-//login
-element(by.model('credentials.username')).sendKeys('bellini');
-element(by.model('credentials.password')).sendKeys('password');
-element.all(by.options('language.name for language in
languages.availableLanguages track by language.id')).
-then(function (language) {
- expect(language.length).toBe(3);
-});
-element.all(by.options('language.name for language in
languages.availableLanguages track by language.id')).
-get(0).click();
-element(by.id('login-btn')).click();
-
-//credential
-element(by.model('user.username')).clear();
-element(by.model('user.username')).sendKeys('bellini');
-element(by.model('user.password')).clear();
-element(by.model('user.password')).sendKeys('password');
-element(by.model('confirmPassword.value')).sendKeys('password');
-var secQuestion = element(by.model('user.securityQuestion'));
-var selectedSecQuestion = secQuestion.all(by.options
-('securityQuestion.key as securityQuestion.content for
securityQuestion in availableSecurityQuestions'))
-.last();
-selectedSecQuestion.click();
-element(by.model('user.securityAnswer')).sendKeys('Agata Ferlito');
-//browser.driver.sleep(1000);
-next();
-
-//groups
-var group = element(by.model('dynamicForm.selectedGroups'));
-var selectedGroup = group.element(by.css('.ui-select-search'));
-group.click();
-
-// add "additional", a group with type extensions, and "root".
-selectedGroup.sendKeys('additional');
-element.all(by.css('.ui-select-choices-row-inner span')).first().click();
-selectedGroup.sendKeys('root');
-element.all(by.css('.ui-select-choices-row-inner span')).first().click();
-next();
-
-//plainSchemas
-// count groups in plainschemas: "own" and "additional".
-element.all(by.repeater('groupSchema in
dynamicForm.groupSchemas')).then(function (groupSchema) {
- expect(groupSchema.length).toBe(2);
-})
-// fills own fields
-element(by.css('[name="fullname"]')).clear();
-element(by.css('[name="fullname"]')).sendK
[1/3] syncope git commit: [SYNCOPE-853] fix jasmine timeout error
Repository: syncope
Updated Branches:
refs/heads/master 7a7d415cd -> 0d97f4515
[SYNCOPE-853] fix jasmine timeout error
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1e5f620c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1e5f620c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1e5f620c
Branch: refs/heads/master
Commit: 1e5f620cfe8249f779ae51add8a8fcc35931dd7a
Parents: ef5784b
Author: Matteo Di Carlo
Authored: Wed Sep 7 15:13:31 2016 +0200
Committer: Matteo Di Carlo
Committed: Wed Sep 7 15:13:31 2016 +0200
--
.../enduser/protractor/protractor-conf.js | 30 +-
.../client/enduser/protractor/tests/abstract.js | 21 +--
.../client/enduser/protractor/tests/create.js | 4 +-
.../client/enduser/protractor/tests/edituser.js | 60 +++-
.../client/enduser/protractor/tests/login.js| 9 ++-
5 files changed, 69 insertions(+), 55 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e5f620c/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
index 1a063c7..52b5977 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
@@ -17,18 +17,20 @@
* under the License.
*/
exports.config = {
-directConnect: false,
-
-capabilities: {
- 'browserName': 'phantomjs',
- 'phantomjs.binary.path': '@phantomjs.binary.path@',
- 'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG']
-},
-
-allScriptsTimeout: 241000,
-
-// Spec patterns are relative to the current working directly when
protractor is called.
-specs: ['tests/*.js'],
-
-exclude: ['tests/abstract.js'],
+ directConnect: false,
+ capabilities: {
+'browserName': 'phantomjs',
+'phantomjs.binary.path': '@phantomjs.binary.path@',
+'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG']
+ },
+
+ allScriptsTimeout: 241000,
+
+ jasmineNodeOpts: {
+defaultTimeoutInterval: 250
+ },
+
+ // Spec patterns are relative to the current working directly when
protractor is called.
+ specs: ['tests/*.js'],
+ exclude: ['tests/abstract.js']
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e5f620c/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
index b1f06f0..6c306ea 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
@@ -17,13 +17,11 @@
* under the License.
*/
-var home = 'http://localhost:9080/syncope-enduser/app/';
exports.doCreate = function () {
describe('doCreate', function () {
it('create donizetti', function () {
- browser.get(home);
browser.wait(element(by.id('register')).isPresent());
element(by.id('register')).click();
@@ -49,8 +47,9 @@ exports.doCreate = function () {
element.all(by.id('next')).first().click();
- element(by.id('save')).click();
-
+ element.all(by.id('cancel')).last().click();
+
+
});
});
};
@@ -67,9 +66,19 @@ exports.doLogin = function (username, password) {
expect(element(by.model('user.username')).getAttribute('value')).toEqual(username);
-// element(by.id('logout')).click();
});
});
-}
+};
+exports.goHome = function () {
+ var home = 'http://localhost:9080/syncope-enduser/app/';
+ browser.get(home);
+};
+
+exports.doNext = function () {
+ element.all(by.id('next')).last().click();
+};
+exports.doCancel = function () {
+ element.all(by.id('cancel')).last().click();
+};
http://git-wip-us.apache.org/repos/asf/syncope/blob/1e5f620c/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/
[3/3] syncope git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0d97f451 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0d97f451 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0d97f451 Branch: refs/heads/master Commit: 0d97f451542c42665a10c8e5ec2a07212d3163e8 Parents: 4715ef1 7a7d415 Author: Matteo Di Carlo Authored: Wed Sep 7 15:15:31 2016 +0200 Committer: Matteo Di Carlo Committed: Wed Sep 7 15:15:31 2016 +0200 -- .../syncope/core/logic/CamelRouteLogic.java | 14 +- .../camel/AbstractCamelProvisioningManager.java | 14 +++--- .../core/provisioning/camel/CamelException.java | 32 + .../provisioning/camel/SyncopeCamelContext.java | 47 +--- pom.xml | 4 ++ 5 files changed, 85 insertions(+), 26 deletions(-) --
[2/3] syncope git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/4715ef1e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/4715ef1e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/4715ef1e Branch: refs/heads/master Commit: 4715ef1ea909a932b3cf3d4874404480e8bdc889 Parents: 1e5f620 bbee3af Author: Matteo Di Carlo Authored: Wed Sep 7 15:14:02 2016 +0200 Committer: Matteo Di Carlo Committed: Wed Sep 7 15:14:02 2016 +0200 -- .../common/lib/search/SearchableFields.java | 2 +- .../persistence/jpa/dao/JPAAnySearchDAO.java| 35 +--- 2 files changed, 17 insertions(+), 20 deletions(-) --
syncope git commit: [SYNCOPE-937] adds password reset test
Repository: syncope
Updated Branches:
refs/heads/2_0_X a6be418b2 -> c67c98102
[SYNCOPE-937] adds password reset test
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c67c9810
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c67c9810
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c67c9810
Branch: refs/heads/2_0_X
Commit: c67c98102965b4b4b270d6b64f463eb6a15d2c2c
Parents: a6be418
Author: Matteo Di Carlo
Authored: Fri Sep 23 16:46:04 2016 +0200
Committer: Matteo Di Carlo
Committed: Fri Sep 23 16:46:04 2016 +0200
--
.../META-INF/resources/app/views/self.html | 2 +-
.../enduser/protractor/protractor-conf.js | 2 +-
.../client/enduser/protractor/tests/abstract.js | 67
.../client/enduser/protractor/tests/create.js | 36 +--
.../client/enduser/protractor/tests/edituser.js | 37 +++
.../client/enduser/protractor/tests/login.js| 40
.../enduser/protractor/tests/passwordreset.js | 37 +++
7 files changed, 90 insertions(+), 131 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/c67c9810/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 12835d2..818af7c 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
@@ -60,7 +60,7 @@ under the License.
- Password Reset
+ Password Reset
http://git-wip-us.apache.org/repos/asf/syncope/blob/c67c9810/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
index 52b5977..540b0eb 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
@@ -19,7 +19,7 @@
exports.config = {
directConnect: false,
capabilities: {
-'browserName': 'phantomjs',
+'browserName': 'chrome',
'phantomjs.binary.path': '@phantomjs.binary.path@',
'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG']
},
http://git-wip-us.apache.org/repos/asf/syncope/blob/c67c9810/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
index 6c306ea..1f1b2ec 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
@@ -16,60 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-
-exports.doCreate = function () {
- describe('doCreate', function () {
-
-it('create donizetti', function () {
-
- browser.wait(element(by.id('register')).isPresent());
- element(by.id('register')).click();
-
- element(by.model('user.username')).sendKeys('donizetti');
- element(by.model('user.password')).sendKeys('Password123');
- element(by.model('confirmPassword.value')).sendKeys('Password123');
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('next')).first().click();
-
- element.all(by.name('fullname')).first().sendKeys('Gaetano Donizetti');
- element.all(by.name('userId')).first().sendKeys('donize...@apache.org');
- element.all(by.name('firstname')).first().sendKeys('Gaetano');
- element.all(by.name('surname')).first().sendKeys('Donizetti');
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('cancel')).last().click();
-
-
-});
- });
-};
-
-exports.doLogin = function (username, password) {
- describe('doLogin', function (
syncope git commit: [SYNCOPE-937] adds password reset test
Repository: syncope
Updated Branches:
refs/heads/master 02a4685a1 -> e821d5fd4
[SYNCOPE-937] adds password reset test
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e821d5fd
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e821d5fd
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e821d5fd
Branch: refs/heads/master
Commit: e821d5fd4d83f81bb5912e9b52bf90eb815f69ad
Parents: 02a4685
Author: Matteo Di Carlo
Authored: Fri Sep 23 16:46:04 2016 +0200
Committer: Matteo Di Carlo
Committed: Fri Sep 23 16:46:31 2016 +0200
--
.../META-INF/resources/app/views/self.html | 2 +-
.../enduser/protractor/protractor-conf.js | 2 +-
.../client/enduser/protractor/tests/abstract.js | 67
.../client/enduser/protractor/tests/create.js | 36 +--
.../client/enduser/protractor/tests/edituser.js | 37 +++
.../client/enduser/protractor/tests/login.js| 40
.../enduser/protractor/tests/passwordreset.js | 37 +++
7 files changed, 90 insertions(+), 131 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/e821d5fd/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 12835d2..818af7c 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
@@ -60,7 +60,7 @@ under the License.
- Password Reset
+ Password Reset
http://git-wip-us.apache.org/repos/asf/syncope/blob/e821d5fd/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
index 52b5977..540b0eb 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
@@ -19,7 +19,7 @@
exports.config = {
directConnect: false,
capabilities: {
-'browserName': 'phantomjs',
+'browserName': 'chrome',
'phantomjs.binary.path': '@phantomjs.binary.path@',
'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG']
},
http://git-wip-us.apache.org/repos/asf/syncope/blob/e821d5fd/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
index 6c306ea..1f1b2ec 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/abstract.js
@@ -16,60 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-
-
-exports.doCreate = function () {
- describe('doCreate', function () {
-
-it('create donizetti', function () {
-
- browser.wait(element(by.id('register')).isPresent());
- element(by.id('register')).click();
-
- element(by.model('user.username')).sendKeys('donizetti');
- element(by.model('user.password')).sendKeys('Password123');
- element(by.model('confirmPassword.value')).sendKeys('Password123');
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('next')).first().click();
-
- element.all(by.name('fullname')).first().sendKeys('Gaetano Donizetti');
- element.all(by.name('userId')).first().sendKeys('donize...@apache.org');
- element.all(by.name('firstname')).first().sendKeys('Gaetano');
- element.all(by.name('surname')).first().sendKeys('Donizetti');
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('next')).first().click();
-
- element.all(by.id('cancel')).last().click();
-
-
-});
- });
-};
-
-exports.doLogin = function (username, password) {
- describe('doLogin', function
[2/2] syncope git commit: [SYNCOPE-937] updates protractor configuration file
[SYNCOPE-937] updates protractor configuration file Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d247b1dd Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d247b1dd Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d247b1dd Branch: refs/heads/2_0_X Commit: d247b1dd4d8255d9fa7476cd7f4c289f2525e086 Parents: b7c03fc Author: Matteo Di Carlo Authored: Fri Sep 23 17:32:53 2016 +0200 Committer: Matteo Di Carlo Committed: Fri Sep 23 17:32:53 2016 +0200 -- .../syncope/client/enduser/protractor/.LCKprotractor-conf.js~ | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/d247b1dd/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~ -- diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~ new file mode 100644 index 000..912d2e1 --- /dev/null +++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~ @@ -0,0 +1 @@ +/home/matt3o/WORKINGDIR/SYNCOPE/Syncope_Source/syncope/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js \ No newline at end of file
[1/2] syncope git commit: [SYNCOPE-937] updates protractor configuration file
Repository: syncope
Updated Branches:
refs/heads/2_0_X c67c98102 -> d247b1dd4
[SYNCOPE-937] updates protractor configuration file
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b7c03fcf
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b7c03fcf
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b7c03fcf
Branch: refs/heads/2_0_X
Commit: b7c03fcf908e5b8651fea9e6a9b56aa5b6611edc
Parents: c67c981
Author: Matteo Di Carlo
Authored: Fri Sep 23 17:31:21 2016 +0200
Committer: Matteo Di Carlo
Committed: Fri Sep 23 17:31:21 2016 +0200
--
.../apache/syncope/client/enduser/protractor/protractor-conf.js| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/b7c03fcf/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
index 540b0eb..52b5977 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
@@ -19,7 +19,7 @@
exports.config = {
directConnect: false,
capabilities: {
-'browserName': 'chrome',
+'browserName': 'phantomjs',
'phantomjs.binary.path': '@phantomjs.binary.path@',
'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG']
},
syncope git commit: [SYNCOPE-937] updates protractor configuration file
Repository: syncope
Updated Branches:
refs/heads/master e821d5fd4 -> 8e7db68e1
[SYNCOPE-937] updates protractor configuration file
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8e7db68e
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8e7db68e
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8e7db68e
Branch: refs/heads/master
Commit: 8e7db68e141b276e0ad5b41be113cea5b66452e4
Parents: e821d5f
Author: Matteo Di Carlo
Authored: Fri Sep 23 17:31:21 2016 +0200
Committer: Matteo Di Carlo
Committed: Fri Sep 23 17:32:07 2016 +0200
--
.../apache/syncope/client/enduser/protractor/protractor-conf.js| 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/8e7db68e/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
index 540b0eb..52b5977 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
@@ -19,7 +19,7 @@
exports.config = {
directConnect: false,
capabilities: {
-'browserName': 'chrome',
+'browserName': 'phantomjs',
'phantomjs.binary.path': '@phantomjs.binary.path@',
'phantomjs.ghostdriver.cli.args': ['--loglevel=DEBUG']
},
syncope git commit: [SYNCOPE-973] updates tests
Repository: syncope
Updated Branches:
refs/heads/2_0_X d247b1dd4 -> 496028e82
[SYNCOPE-973] updates tests
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/496028e8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/496028e8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/496028e8
Branch: refs/heads/2_0_X
Commit: 496028e821d0b279c2777aeba680f97f0bb04378
Parents: d247b1d
Author: Matteo Di Carlo
Authored: Tue Sep 27 15:27:29 2016 +0200
Committer: Matteo Di Carlo
Committed: Tue Sep 27 15:27:29 2016 +0200
--
.../resources/app/views/passwordreset.html | 6 ++--
.../enduser/protractor/.LCKprotractor-conf.js~ | 1 -
.../client/enduser/protractor/tests/create.js | 28
.../client/enduser/protractor/tests/edituser.js | 17 ++
.../enduser/protractor/tests/passwordreset.js | 35 +++-
5 files changed, 62 insertions(+), 25 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/496028e8/client/enduser/src/main/resources/META-INF/resources/app/views/passwordreset.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/passwordreset.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/passwordreset.html
index 693d3f7..47abae5 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/passwordreset.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/passwordreset.html
@@ -52,9 +52,9 @@ under the License.
disabled="disabled">
- {{'SECURITYANSWER'|
translate}}
-
+ {{'SECURITYANSWER'|
translate}}
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/496028e8/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~
deleted file mode 100644
index 912d2e1..000
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~
+++ /dev/null
@@ -1 +0,0 @@
-/home/matt3o/WORKINGDIR/SYNCOPE/Syncope_Source/syncope/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/496028e8/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
--
diff --git
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
index cdd9dae..52674c7 100644
---
a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
+++
b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/tests/create.js
@@ -20,12 +20,15 @@
var abstract = require('./abstract.js');
describe('syncope enduser user create', function () {
-
it('should create user donizetti', function () {
-console.log("create user test");
+console.log("");
+console.log("user create");
abstract.goHome();
-
+abstract.waitSpinner();
+browser.wait(element(by.id('register')).isPresent());
element(by.id('register')).click();
+
+browser.wait(element(by.id('user.username')).isPresent());
element(by.model('user.username')).sendKeys('donizetti');
element(by.model('user.password')).sendKeys('password123');
element(by.model('confirmPassword.value')).sendKeys('password123');
@@ -33,20 +36,33 @@ describe('syncope enduser user create', function () {
element(by.cssContainingText('option', 'What\'s your mother\'s maiden
name?')).click();
browser.wait(element(by.id('user.securityAnswer')).isPresent());
-element(by.model('user.securityAnswer')).sendKeys('Agata Ferlito');
-
+element(by.model('user.securityAnswer')).sendKeys('Domenica Oliva Nava');
element.all(by.id('next')).first().click();
+
+//groups
+var group = element(by.model('dynamicForm.selectedGroups'));
+var selectedGroup = group.element(by.css('.ui-select-search'));
+group.click();
+//adds group root
+selectedGroup.sendKeys('root');
+element.
syncope git commit: [SYNCOPE-937] updates protractor configuration file
Repository: syncope Updated Branches: refs/heads/master 8e7db68e1 -> f8c0d7162 [SYNCOPE-937] updates protractor configuration file Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f8c0d716 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f8c0d716 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f8c0d716 Branch: refs/heads/master Commit: f8c0d716220eb01b08f56c3277bc60f34b51f9a2 Parents: 8e7db68 Author: Matteo Di Carlo Authored: Fri Sep 23 17:32:53 2016 +0200 Committer: Matteo Di Carlo Committed: Tue Sep 27 15:28:36 2016 +0200 -- .../syncope/client/enduser/protractor/.LCKprotractor-conf.js~ | 1 + 1 file changed, 1 insertion(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/f8c0d716/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~ -- diff --git a/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~ new file mode 100644 index 000..912d2e1 --- /dev/null +++ b/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/.LCKprotractor-conf.js~ @@ -0,0 +1 @@ +/home/matt3o/WORKINGDIR/SYNCOPE/Syncope_Source/syncope/fit/enduser-reference/src/test/resources/org/apache/syncope/client/enduser/protractor/protractor-conf.js \ No newline at end of file
syncope git commit: [SYNCOPE-942] fixes bug in changing security answer in enduser
Repository: syncope
Updated Branches:
refs/heads/2_0_X 459cb2e4e -> 77407a43a
[SYNCOPE-942] fixes bug in changing security answer in enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/77407a43
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/77407a43
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/77407a43
Branch: refs/heads/2_0_X
Commit: 77407a43ad1af88c4d39aa4ef6b4b3ecfb7c4adf
Parents: 459cb2e
Author: Matteo Di Carlo
Authored: Mon Oct 3 09:16:33 2016 +0200
Committer: Matteo Di Carlo
Committed: Mon Oct 3 09:19:31 2016 +0200
--
.../resources/app/js/controllers/UserController.js | 16 +---
.../resources/app/js/services/groupService.js | 2 --
.../resources/app/js/services/schemaService.js | 4 ++--
.../resources/app/views/dynamicPlainAttributes.html | 3 ++-
.../resources/app/views/user-credentials.html | 2 +-
5 files changed, 14 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/77407a43/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 c6b0b4e..5e38b82 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
@@ -37,7 +37,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.availableRealms = [];
$scope.availableSecurityQuestions = [];
-$scope.initialSecurityQuestion = undefined;
+$scope.initialSecurityQuestion = '';
$scope.captchaInput = {
value: ""
};
@@ -198,7 +198,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
return x < y ? -1 : x > y ? 1 : 0;
});
}, function (e) {
- $scope.showError("An error occur during retrieving groups " + e,
$scope.notification)
+ $scope.showError("An error occur during retrieving groups " + e,
$scope.notification);
});
};
@@ -243,9 +243,11 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
UserSelfService.read().then(function (response) {
$scope.user = UserUtil.getUnwrappedUser(response);
$scope.user.password = undefined;
+
$scope.initialSecurityQuestion = $scope.user.securityQuestion;
// initialize already assigned resources
$scope.dynamicForm.selectedResources = $scope.user.resources;
+
// initialize already assigned groups -- keeping the same structure
of groups
for (var index in $scope.user.memberships) {
$scope.dynamicForm.selectedGroups.push(
@@ -296,9 +298,8 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
//removing derived schemas
for (var i = 0; i < $scope.dynamicForm.derSchemas.length; i++) {
- if ((anyTypeClass && $scope.dynamicForm.derSchemas[i].anyTypeClass
== anyTypeClass)
+ if ((anyTypeClass && $scope.dynamicForm.derSchemas[i].anyTypeClass
=== anyTypeClass)
|| (group &&
$scope.dynamicForm.derSchemas[i].key.includes(group + '#'))) {
-
//cleaning both form and user model
delete $scope.user.derAttrs[$scope.dynamicForm.derSchemas[i].key];
$scope.dynamicForm.derSchemas.splice(i, 1);
@@ -307,9 +308,8 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
}
//removing virtual schemas
for (var i = 0; i < $scope.dynamicForm.virSchemas.length; i++) {
- if ((anyTypeClass && $scope.dynamicForm.virSchemas[i].anyTypeClass
== anyTypeClass)
+ if ((anyTypeClass && $scope.dynamicForm.virSchemas[i].anyTypeClass
=== anyTypeClass)
|| (group &&
$scope.dynamicForm.virSchemas[i].key.includes(group + '#'))) {
-
//cleaning both form and user model
delete $scope.user.virAttrs[$scope.dynamicForm.virSchemas[i].key];
$scope.dynamicForm.virSchemas.splice(i, 1);
@@ -344,7 +344,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
username: '',
password: '',
realm: '/',
- securityQuestion: undefined,
+ securityQuestion: '',
securityAnswer: '',
plainAttrs: {},
derAttrs: {},
@@ -410,6 +410,7 @@ angular.module("self").con
syncope git commit: [SYNCOPE-942] fixes bug in changing security answer in enduser
Repository: syncope
Updated Branches:
refs/heads/master b85e14b85 -> 8d55cbe43
[SYNCOPE-942] fixes bug in changing security answer in enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8d55cbe4
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8d55cbe4
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8d55cbe4
Branch: refs/heads/master
Commit: 8d55cbe430f2a272f6838bd1a1a7edfad87e3ab2
Parents: b85e14b
Author: Matteo Di Carlo
Authored: Mon Oct 3 09:16:33 2016 +0200
Committer: Matteo Di Carlo
Committed: Mon Oct 3 09:26:42 2016 +0200
--
.../resources/app/js/controllers/UserController.js | 16 +---
.../resources/app/js/services/groupService.js | 2 --
.../resources/app/js/services/schemaService.js | 4 ++--
.../resources/app/views/dynamicPlainAttributes.html | 3 ++-
.../resources/app/views/user-credentials.html | 2 +-
5 files changed, 14 insertions(+), 13 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/8d55cbe4/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 c6b0b4e..5e38b82 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
@@ -37,7 +37,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.availableRealms = [];
$scope.availableSecurityQuestions = [];
-$scope.initialSecurityQuestion = undefined;
+$scope.initialSecurityQuestion = '';
$scope.captchaInput = {
value: ""
};
@@ -198,7 +198,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
return x < y ? -1 : x > y ? 1 : 0;
});
}, function (e) {
- $scope.showError("An error occur during retrieving groups " + e,
$scope.notification)
+ $scope.showError("An error occur during retrieving groups " + e,
$scope.notification);
});
};
@@ -243,9 +243,11 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
UserSelfService.read().then(function (response) {
$scope.user = UserUtil.getUnwrappedUser(response);
$scope.user.password = undefined;
+
$scope.initialSecurityQuestion = $scope.user.securityQuestion;
// initialize already assigned resources
$scope.dynamicForm.selectedResources = $scope.user.resources;
+
// initialize already assigned groups -- keeping the same structure
of groups
for (var index in $scope.user.memberships) {
$scope.dynamicForm.selectedGroups.push(
@@ -296,9 +298,8 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
//removing derived schemas
for (var i = 0; i < $scope.dynamicForm.derSchemas.length; i++) {
- if ((anyTypeClass && $scope.dynamicForm.derSchemas[i].anyTypeClass
== anyTypeClass)
+ if ((anyTypeClass && $scope.dynamicForm.derSchemas[i].anyTypeClass
=== anyTypeClass)
|| (group &&
$scope.dynamicForm.derSchemas[i].key.includes(group + '#'))) {
-
//cleaning both form and user model
delete $scope.user.derAttrs[$scope.dynamicForm.derSchemas[i].key];
$scope.dynamicForm.derSchemas.splice(i, 1);
@@ -307,9 +308,8 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
}
//removing virtual schemas
for (var i = 0; i < $scope.dynamicForm.virSchemas.length; i++) {
- if ((anyTypeClass && $scope.dynamicForm.virSchemas[i].anyTypeClass
== anyTypeClass)
+ if ((anyTypeClass && $scope.dynamicForm.virSchemas[i].anyTypeClass
=== anyTypeClass)
|| (group &&
$scope.dynamicForm.virSchemas[i].key.includes(group + '#'))) {
-
//cleaning both form and user model
delete $scope.user.virAttrs[$scope.dynamicForm.virSchemas[i].key];
$scope.dynamicForm.virSchemas.splice(i, 1);
@@ -344,7 +344,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
username: '',
password: '',
realm: '/',
- securityQuestion: undefined,
+ securityQuestion: '',
securityAnswer: '',
plainAttrs: {},
derAttrs: {},
@@ -410,6 +410,7 @@ angular.module("self").c
syncope git commit: [SYNCOPE-941] adds dynamic configuration screens to enduser
Repository: syncope
Updated Branches:
refs/heads/2_0_X 6e6deae5f -> 6ba24ed07
[SYNCOPE-941] adds dynamic configuration screens to enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6ba24ed0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6ba24ed0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6ba24ed0
Branch: refs/heads/2_0_X
Commit: 6ba24ed077746fe4f69595f782e1358ab23cb37c
Parents: 6e6deae
Author: Matteo Di Carlo
Authored: Wed Oct 5 17:20:24 2016 +0200
Committer: Matteo Di Carlo
Committed: Wed Oct 5 17:20:47 2016 +0200
--
.../resources/META-INF/resources/app/js/app.js | 15 ++--
.../app/js/controllers/UserController.js| 41 --
.../app/js/directives/navigationButtons.js | 84 ++--
3 files changed, 83 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/6ba24ed0/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 5bffed2..5984f21 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
@@ -256,6 +256,7 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
};
});
}]);
+
app.run(['$rootScope', '$location', '$state', 'AuthService',
function ($rootScope, $location, $state, AuthService) {
// main program
@@ -420,16 +421,12 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', 'InfoService',
$scope.$on('hideErrorMessage', function (event, popupMessage) {
$scope.hideError(popupMessage, $scope.notification);
});
- //wizard active element
- $scope.wizard = {
-"credentials": {url: "/credentials"},
-"groups": {url: "/groups"},
-"plainSchemas": {url: "/plainSchemas"},
-"derivedSchemas": {url: "/derivedSchemas"},
-"virtualSchemas": {url: "/virtualSchemas"},
-"resources": {url: "/resources"},
-"finish": {url: "/finish"}
+
+ $rootScope.wizard = {
+"credentials": "/credentials",
+"groups": "/groups"
};
+
$scope.clearCache = function () {
$templateCache.removeAll();
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/6ba24ed0/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 ebf5c81..5047c06 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
@@ -17,7 +17,7 @@
* under the License.
*/
-/* global message, component, $state, rootScope */
+/* global message, component, $state, rootScope, $q */
'use strict';
@@ -73,6 +73,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.dynamicForm.groupSchemas.push(group);
//initializing user schemas values
initSchemaValues(schemas);
+ initWizard();
}, function (response) {
var errorMessage;
// parse error response
@@ -84,6 +85,26 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
});
};
+ var initWizard = function () {
+$rootScope.wizard = {
+ "credentials": "/credentials",
+ "groups": "/groups"
+};
+if ($scope.dynamicForm.plainSchemas.length > 0) {
+ $rootScope.wizard["plainSchemas"] = "/plainSchemas";
+}
+if ($scope.dynamicForm.derSchemas.length > 0) {
+ $rootScope.wizard["derivedSchemas"] = "/derivedSchemas";
+}
+if ($scope.dynamicForm.virSchemas.length > 0) {
+ $rootScope.wizard["virtualSchemas"] = "/virtualSchemas";
+}
+if ($scope.dynamicForm.resources.length > 0) {
+ $rootScope.wizard["resources"] = "/resources";
+}
+$rootScope.wizard["finish"] = "/finish";
+ };
+
var initSchemaValues = function (schemas) {
// initialize plain attributes
for (var i = 0; i < schemas.plainSchemas.length; i++) {
@@ -182,6 +203,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.dynamicForm
syncope git commit: [SYNCOPE-941] adds dynamic configuration screens to enduser
Repository: syncope
Updated Branches:
refs/heads/master a6ad0608d -> 0e621242b
[SYNCOPE-941] adds dynamic configuration screens to enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/0e621242
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/0e621242
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/0e621242
Branch: refs/heads/master
Commit: 0e621242be705bb048a14bcb96740564a6a7461f
Parents: a6ad060
Author: Matteo Di Carlo
Authored: Wed Oct 5 17:20:24 2016 +0200
Committer: Matteo Di Carlo
Committed: Wed Oct 5 17:21:59 2016 +0200
--
.../resources/META-INF/resources/app/js/app.js | 15 ++--
.../app/js/controllers/UserController.js| 41 --
.../app/js/directives/navigationButtons.js | 84 ++--
3 files changed, 83 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e621242/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 5bffed2..5984f21 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
@@ -256,6 +256,7 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
};
});
}]);
+
app.run(['$rootScope', '$location', '$state', 'AuthService',
function ($rootScope, $location, $state, AuthService) {
// main program
@@ -420,16 +421,12 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', 'InfoService',
$scope.$on('hideErrorMessage', function (event, popupMessage) {
$scope.hideError(popupMessage, $scope.notification);
});
- //wizard active element
- $scope.wizard = {
-"credentials": {url: "/credentials"},
-"groups": {url: "/groups"},
-"plainSchemas": {url: "/plainSchemas"},
-"derivedSchemas": {url: "/derivedSchemas"},
-"virtualSchemas": {url: "/virtualSchemas"},
-"resources": {url: "/resources"},
-"finish": {url: "/finish"}
+
+ $rootScope.wizard = {
+"credentials": "/credentials",
+"groups": "/groups"
};
+
$scope.clearCache = function () {
$templateCache.removeAll();
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/0e621242/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 ebf5c81..5047c06 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
@@ -17,7 +17,7 @@
* under the License.
*/
-/* global message, component, $state, rootScope */
+/* global message, component, $state, rootScope, $q */
'use strict';
@@ -73,6 +73,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.dynamicForm.groupSchemas.push(group);
//initializing user schemas values
initSchemaValues(schemas);
+ initWizard();
}, function (response) {
var errorMessage;
// parse error response
@@ -84,6 +85,26 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
});
};
+ var initWizard = function () {
+$rootScope.wizard = {
+ "credentials": "/credentials",
+ "groups": "/groups"
+};
+if ($scope.dynamicForm.plainSchemas.length > 0) {
+ $rootScope.wizard["plainSchemas"] = "/plainSchemas";
+}
+if ($scope.dynamicForm.derSchemas.length > 0) {
+ $rootScope.wizard["derivedSchemas"] = "/derivedSchemas";
+}
+if ($scope.dynamicForm.virSchemas.length > 0) {
+ $rootScope.wizard["virtualSchemas"] = "/virtualSchemas";
+}
+if ($scope.dynamicForm.resources.length > 0) {
+ $rootScope.wizard["resources"] = "/resources";
+}
+$rootScope.wizard["finish"] = "/finish";
+ };
+
var initSchemaValues = function (schemas) {
// initialize plain attributes
for (var i = 0; i < schemas.plainSchemas.length; i++) {
@@ -182,6 +203,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.dynamicFo
syncope git commit: Revert "[SYNCOPE-941] adds dynamic configuration screens to enduser"
Repository: syncope
Updated Branches:
refs/heads/2_0_X d7d1f8245 -> ef1d815da
Revert "[SYNCOPE-941] adds dynamic configuration screens to enduser"
This reverts commit 6ba24ed077746fe4f69595f782e1358ab23cb37c.
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ef1d815d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ef1d815d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ef1d815d
Branch: refs/heads/2_0_X
Commit: ef1d815dadd4831fe1a2834354849252a348f9ca
Parents: d7d1f82
Author: Matteo Di Carlo
Authored: Fri Oct 7 15:58:53 2016 +0200
Committer: Matteo Di Carlo
Committed: Fri Oct 7 15:58:53 2016 +0200
--
.../resources/META-INF/resources/app/js/app.js | 15 ++--
.../app/js/controllers/UserController.js| 41 ++
.../app/js/directives/navigationButtons.js | 84 ++--
3 files changed, 57 insertions(+), 83 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/ef1d815d/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 5984f21..5bffed2 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
@@ -256,7 +256,6 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
};
});
}]);
-
app.run(['$rootScope', '$location', '$state', 'AuthService',
function ($rootScope, $location, $state, AuthService) {
// main program
@@ -421,12 +420,16 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', 'InfoService',
$scope.$on('hideErrorMessage', function (event, popupMessage) {
$scope.hideError(popupMessage, $scope.notification);
});
-
- $rootScope.wizard = {
-"credentials": "/credentials",
-"groups": "/groups"
+ //wizard active element
+ $scope.wizard = {
+"credentials": {url: "/credentials"},
+"groups": {url: "/groups"},
+"plainSchemas": {url: "/plainSchemas"},
+"derivedSchemas": {url: "/derivedSchemas"},
+"virtualSchemas": {url: "/virtualSchemas"},
+"resources": {url: "/resources"},
+"finish": {url: "/finish"}
};
-
$scope.clearCache = function () {
$templateCache.removeAll();
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/ef1d815d/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 5047c06..ebf5c81 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
@@ -17,7 +17,7 @@
* under the License.
*/
-/* global message, component, $state, rootScope, $q */
+/* global message, component, $state, rootScope */
'use strict';
@@ -73,7 +73,6 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.dynamicForm.groupSchemas.push(group);
//initializing user schemas values
initSchemaValues(schemas);
- initWizard();
}, function (response) {
var errorMessage;
// parse error response
@@ -85,26 +84,6 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
});
};
- var initWizard = function () {
-$rootScope.wizard = {
- "credentials": "/credentials",
- "groups": "/groups"
-};
-if ($scope.dynamicForm.plainSchemas.length > 0) {
- $rootScope.wizard["plainSchemas"] = "/plainSchemas";
-}
-if ($scope.dynamicForm.derSchemas.length > 0) {
- $rootScope.wizard["derivedSchemas"] = "/derivedSchemas";
-}
-if ($scope.dynamicForm.virSchemas.length > 0) {
- $rootScope.wizard["virtualSchemas"] = "/virtualSchemas";
-}
-if ($scope.dynamicForm.resources.length > 0) {
- $rootScope.wizard["resources"] = "/resources";
-}
-$rootScope.wizard["finish"] = "/finish";
- };
-
var initSchemaValues = function (schemas) {
// initialize plain attributes
for (var i = 0; i < schemas.plainSchemas.length; i++) {
@@ -203,7 +182,6 @@ angular.module("self").controller("UserCo
syncope git commit: Revert "[SYNCOPE-941] adds dynamic configuration screens to enduser"
Repository: syncope
Updated Branches:
refs/heads/master ce81f693b -> e2a17b0f9
Revert "[SYNCOPE-941] adds dynamic configuration screens to enduser"
This reverts commit 0e621242be705bb048a14bcb96740564a6a7461f.
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e2a17b0f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e2a17b0f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e2a17b0f
Branch: refs/heads/master
Commit: e2a17b0f9bb4f7873064921fbc7c92e8ae1d27e9
Parents: ce81f69
Author: Matteo Di Carlo
Authored: Fri Oct 7 15:57:53 2016 +0200
Committer: Matteo Di Carlo
Committed: Fri Oct 7 15:57:53 2016 +0200
--
.../resources/META-INF/resources/app/js/app.js | 15 ++--
.../app/js/controllers/UserController.js| 41 ++
.../app/js/directives/navigationButtons.js | 84 ++--
3 files changed, 57 insertions(+), 83 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/e2a17b0f/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 5984f21..5bffed2 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
@@ -256,7 +256,6 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
};
});
}]);
-
app.run(['$rootScope', '$location', '$state', 'AuthService',
function ($rootScope, $location, $state, AuthService) {
// main program
@@ -421,12 +420,16 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', 'InfoService',
$scope.$on('hideErrorMessage', function (event, popupMessage) {
$scope.hideError(popupMessage, $scope.notification);
});
-
- $rootScope.wizard = {
-"credentials": "/credentials",
-"groups": "/groups"
+ //wizard active element
+ $scope.wizard = {
+"credentials": {url: "/credentials"},
+"groups": {url: "/groups"},
+"plainSchemas": {url: "/plainSchemas"},
+"derivedSchemas": {url: "/derivedSchemas"},
+"virtualSchemas": {url: "/virtualSchemas"},
+"resources": {url: "/resources"},
+"finish": {url: "/finish"}
};
-
$scope.clearCache = function () {
$templateCache.removeAll();
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/e2a17b0f/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 5047c06..ebf5c81 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
@@ -17,7 +17,7 @@
* under the License.
*/
-/* global message, component, $state, rootScope, $q */
+/* global message, component, $state, rootScope */
'use strict';
@@ -73,7 +73,6 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.dynamicForm.groupSchemas.push(group);
//initializing user schemas values
initSchemaValues(schemas);
- initWizard();
}, function (response) {
var errorMessage;
// parse error response
@@ -85,26 +84,6 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
});
};
- var initWizard = function () {
-$rootScope.wizard = {
- "credentials": "/credentials",
- "groups": "/groups"
-};
-if ($scope.dynamicForm.plainSchemas.length > 0) {
- $rootScope.wizard["plainSchemas"] = "/plainSchemas";
-}
-if ($scope.dynamicForm.derSchemas.length > 0) {
- $rootScope.wizard["derivedSchemas"] = "/derivedSchemas";
-}
-if ($scope.dynamicForm.virSchemas.length > 0) {
- $rootScope.wizard["virtualSchemas"] = "/virtualSchemas";
-}
-if ($scope.dynamicForm.resources.length > 0) {
- $rootScope.wizard["resources"] = "/resources";
-}
-$rootScope.wizard["finish"] = "/finish";
- };
-
var initSchemaValues = function (schemas) {
// initialize plain attributes
for (var i = 0; i < schemas.plainSchemas.length; i++) {
@@ -203,7 +182,6 @@ angular.module("self").controller("User
syncope git commit: [SYNCOPE-958] adds enduser improvements
Repository: syncope
Updated Branches:
refs/heads/2_0_X 45db7fc65 -> 2416b8d1b
[SYNCOPE-958] adds enduser improvements
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/2416b8d1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/2416b8d1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/2416b8d1
Branch: refs/heads/2_0_X
Commit: 2416b8d1b851f06bc12c3aae2bc29da7a3fe03fb
Parents: 45db7fc
Author: Matteo Di Carlo
Authored: Tue Oct 11 16:35:47 2016 +0200
Committer: Matteo Di Carlo
Committed: Thu Oct 13 12:10:11 2016 +0200
--
.../META-INF/resources/app/css/editUser.css | 20 +++
.../resources/META-INF/resources/app/index.html | 1 -
.../resources/META-INF/resources/app/js/app.js | 6 +++
.../app/js/controllers/LanguageController.js| 57
.../app/js/controllers/LoginController.js | 1 -
.../app/js/controllers/UserController.js| 24 ++---
.../resources/app/js/directives/captcha.js | 1 -
.../app/js/directives/dynamicPlainAttribute.js | 5 +-
.../js/directives/dynamicVirtualAttributes.js | 4 --
.../app/js/directives/navigationButtons.js | 5 +-
.../resources/app/js/services/authService.js| 2 +-
.../resources/app/languages/de/dynamic.json | 2 +-
.../resources/app/languages/de/static.json | 13 -
.../resources/app/languages/en/dynamic.json | 2 +-
.../resources/app/languages/en/static.json | 13 -
.../resources/app/languages/it/dynamic.json | 2 +-
.../resources/app/languages/it/static.json | 12 -
.../resources/app/views/auxClasses.html | 2 +-
.../META-INF/resources/app/views/editUser.html | 3 +-
.../META-INF/resources/app/views/groups.html| 2 +-
.../resources/app/views/passwordreset.html | 4 +-
.../META-INF/resources/app/views/resources.html | 2 +-
.../META-INF/resources/app/views/self.html | 8 +--
.../resources/app/views/user-credentials.html | 26 -
.../app/views/user-derived-schemas.html | 4 +-
.../resources/app/views/user-form-finish.html | 2 +-
.../resources/app/views/user-groups.html| 3 ++
.../resources/app/views/user-plain-schemas.html | 4 +-
.../resources/app/views/user-resources.html | 2 +
.../app/views/user-virtual-schemas.html | 4 +-
30 files changed, 114 insertions(+), 122 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/2416b8d1/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index 7617856..10d1105 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -139,13 +139,14 @@ under the License.
/*width: 15%;*/
}
-#form-views { width:auto; }
+#form-views { width:100%; }
/* basic styling for entering and leaving */
/* left and right to add to ensure full width: position:absolute; left:30px;
right:30px; */
#form-views.ng-enter,
#form-views.ng-leave {
- transition:0.5s all ease; -moz-transition:0.5s all ease;
-webkit-transition:0.5s all ease;
+position: absolute;
+ transition:0.5s all ease-in; -moz-transition:0.5s all ease-in;
-webkit-transition:0.5s all ease;
}
/* enter animation */
@@ -157,6 +158,7 @@ under the License.
/* leave animation */
#form-views.ng-leave{
+ position:absolute;
-webkit-animation:slideOutLeft 0.5s both ease;
-moz-animation:slideOutLeft 0.5s both ease;
animation:slideOutLeft 0.5s both ease;
@@ -260,30 +262,30 @@ under the License.
=
*/
/* slide out to the left */
@keyframes slideOutLeft {
- to { transform: translateX(-200%); }
+ to { transform: translateX(-300%); }
}
@-moz-keyframes slideOutLeft {
- to { -moz-transform: translateX(-200%); }
+ to { -moz-transform: translateX(-300%); }
}
@-webkit-keyframes slideOutLeft {
- to { -webkit-transform: translateX(-200%); }
+ to { -webkit-transform: translateX(-300%); }
}
/* slide in from the right */
@keyframes slideInRight {
- from{ transform:translateX(200%); }
+ from{ transform:translateX(300%); }
to { transform: translateX(0); }
}
@-moz-keyframes slideInRight {
- from{ -moz-transform:translateX(200%); }
+ from{ -moz-transform:translateX(300%); }
to { -moz-transform: translateX(0); }
}
@-webkit-keyframes slideInRight {
- from{ -webkit-transform:translateX(200%); }
+ from{ -
syncope git commit: [SYNCOPE-958] adds enduser improvements
Repository: syncope
Updated Branches:
refs/heads/master 1d8b5081f -> d7199f2c7
[SYNCOPE-958] adds enduser improvements
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/d7199f2c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/d7199f2c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/d7199f2c
Branch: refs/heads/master
Commit: d7199f2c728ae8ca5645c5e922f465d2ca8f1dc2
Parents: 1d8b508
Author: Matteo Di Carlo
Authored: Tue Oct 11 16:35:47 2016 +0200
Committer: Matteo Di Carlo
Committed: Thu Oct 13 12:08:53 2016 +0200
--
.../META-INF/resources/app/css/editUser.css | 20 +++
.../resources/META-INF/resources/app/index.html | 1 -
.../resources/META-INF/resources/app/js/app.js | 6 +++
.../app/js/controllers/LanguageController.js| 57
.../app/js/controllers/LoginController.js | 1 -
.../app/js/controllers/UserController.js| 24 ++---
.../resources/app/js/directives/captcha.js | 1 -
.../app/js/directives/dynamicPlainAttribute.js | 5 +-
.../js/directives/dynamicVirtualAttributes.js | 4 --
.../app/js/directives/navigationButtons.js | 5 +-
.../resources/app/js/services/authService.js| 2 +-
.../resources/app/languages/de/dynamic.json | 2 +-
.../resources/app/languages/de/static.json | 13 -
.../resources/app/languages/en/dynamic.json | 2 +-
.../resources/app/languages/en/static.json | 13 -
.../resources/app/languages/it/dynamic.json | 2 +-
.../resources/app/languages/it/static.json | 12 -
.../resources/app/views/auxClasses.html | 2 +-
.../META-INF/resources/app/views/editUser.html | 3 +-
.../META-INF/resources/app/views/groups.html| 2 +-
.../resources/app/views/passwordreset.html | 4 +-
.../META-INF/resources/app/views/resources.html | 2 +-
.../META-INF/resources/app/views/self.html | 8 +--
.../resources/app/views/user-credentials.html | 26 -
.../app/views/user-derived-schemas.html | 4 +-
.../resources/app/views/user-form-finish.html | 2 +-
.../resources/app/views/user-groups.html| 3 ++
.../resources/app/views/user-plain-schemas.html | 4 +-
.../resources/app/views/user-resources.html | 2 +
.../app/views/user-virtual-schemas.html | 4 +-
30 files changed, 114 insertions(+), 122 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/d7199f2c/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index 7617856..10d1105 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -139,13 +139,14 @@ under the License.
/*width: 15%;*/
}
-#form-views { width:auto; }
+#form-views { width:100%; }
/* basic styling for entering and leaving */
/* left and right to add to ensure full width: position:absolute; left:30px;
right:30px; */
#form-views.ng-enter,
#form-views.ng-leave {
- transition:0.5s all ease; -moz-transition:0.5s all ease;
-webkit-transition:0.5s all ease;
+position: absolute;
+ transition:0.5s all ease-in; -moz-transition:0.5s all ease-in;
-webkit-transition:0.5s all ease;
}
/* enter animation */
@@ -157,6 +158,7 @@ under the License.
/* leave animation */
#form-views.ng-leave{
+ position:absolute;
-webkit-animation:slideOutLeft 0.5s both ease;
-moz-animation:slideOutLeft 0.5s both ease;
animation:slideOutLeft 0.5s both ease;
@@ -260,30 +262,30 @@ under the License.
=
*/
/* slide out to the left */
@keyframes slideOutLeft {
- to { transform: translateX(-200%); }
+ to { transform: translateX(-300%); }
}
@-moz-keyframes slideOutLeft {
- to { -moz-transform: translateX(-200%); }
+ to { -moz-transform: translateX(-300%); }
}
@-webkit-keyframes slideOutLeft {
- to { -webkit-transform: translateX(-200%); }
+ to { -webkit-transform: translateX(-300%); }
}
/* slide in from the right */
@keyframes slideInRight {
- from{ transform:translateX(200%); }
+ from{ transform:translateX(300%); }
to { transform: translateX(0); }
}
@-moz-keyframes slideInRight {
- from{ -moz-transform:translateX(200%); }
+ from{ -moz-transform:translateX(300%); }
to { -moz-transform: translateX(0); }
}
@-webkit-keyframes slideInRight {
- from{ -webkit-transform:translateX(200%); }
+ from{
syncope git commit: [SYNCOPE-960] turns the breadcrumb navigable once arrived in the last page in self creation
Repository: syncope
Updated Branches:
refs/heads/2_0_X 6bb3673ab -> f9fcde0d3
[SYNCOPE-960] turns the breadcrumb navigable once arrived in the last page in
self creation
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f9fcde0d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f9fcde0d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f9fcde0d
Branch: refs/heads/2_0_X
Commit: f9fcde0d3f49259a7148061af996cb222eff6898
Parents: 6bb3673
Author: Matteo Di Carlo
Authored: Thu Oct 13 15:15:23 2016 +0200
Committer: Matteo Di Carlo
Committed: Thu Oct 13 16:36:51 2016 +0200
--
.../app/js/controllers/TailController.js| 7 ++--
.../app/js/controllers/UserController.js| 1 +
.../resources/app/languages/de/dynamic.json | 26 +++---
.../resources/app/languages/de/static.json | 36 ++--
.../META-INF/resources/app/views/editUser.html | 2 +-
.../resources/app/views/user-resources.html | 1 -
6 files changed, 37 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
index 69de101..fe880a3 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
@@ -20,9 +20,10 @@
'use strict';
angular.module("self")
-.controller("TailController",
-function ($scope, $location) {
+.controller("TailController", ['$scope', '$rootScope', '$location',
+function ($scope, $rootScope, $location) {
$scope.redirect = function () {
$location.path('/self');
+$rootScope.endReached = false;
};
-});
+}]);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/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 7e84c17..2366311 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
@@ -513,6 +513,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.logout = function (message) {
AuthService.logout().then(function (response) {
console.info("Logout successfully");
+$rootScope.endReached = false;
$location.path('/self');
if (message) {
$scope.showSuccess(message, $scope.notification);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9fcde0d/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
index aacf5ac..e4f50d3 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
+++
b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
@@ -1,26 +1,26 @@
{
- "credentials": "Details",
+ "credentials": "Anmeldedaten",
"groups": "Gruppen",
"plainSchemas": "PlainSchemas",
"derivedSchemas": "DerivedSchemas",
"virtualSchemas": "VirtualSchemas",
"resources": "Ressourcen",
- "finish": "Finish",
+ "finish": "Ende",
"fullname": "vollständiger Name",
- "userId": "benutzer Id",
- "loginDate": "login Datum",
- "firstname": "name",
- "surname": "familien-oder nachname",
+ "userId": "Benutzer-ID",
+ "loginDate": "Login-Datum",
+ "firstname": "Vorname",
+ "surname": "Familien- oder Nachname",
"ctype": "ctype",
"email": "email",
- "activationDate": "aktivierungsdatum ",
- "uselessReadonly": "uselessReadonly",
+ "activationDate": "Aktivierungsdatum ",
+ "uselessReadonly": "unnötig, nur zum lesen",
"cool": "cool",
- "gender": "geschlecht",
+ "gender": "Geschlecht",
"aLong": "aLong",
- "makeItDouble": "makeItDouble",
- "obscure": "obscure",
-
[1/2] syncope git commit: [SYNCOPE-960] turns the breadcrumb navigable once arrived in the last page in self creation
Repository: syncope
Updated Branches:
refs/heads/master adfdaa000 -> 58378e13f
[SYNCOPE-960] turns the breadcrumb navigable once arrived in the last page in
self creation
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/94cb1607
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/94cb1607
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/94cb1607
Branch: refs/heads/master
Commit: 94cb160764ea367bdcfb7f06b5e0cebf0b4673a5
Parents: d7199f2
Author: Matteo Di Carlo
Authored: Thu Oct 13 15:15:23 2016 +0200
Committer: Matteo Di Carlo
Committed: Thu Oct 13 16:46:16 2016 +0200
--
.../app/js/controllers/TailController.js| 7 ++--
.../app/js/controllers/UserController.js| 1 +
.../resources/app/languages/de/dynamic.json | 26 +++---
.../resources/app/languages/de/static.json | 36 ++--
.../META-INF/resources/app/views/editUser.html | 2 +-
.../resources/app/views/user-resources.html | 1 -
6 files changed, 37 insertions(+), 36 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/94cb1607/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
index 69de101..fe880a3 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
@@ -20,9 +20,10 @@
'use strict';
angular.module("self")
-.controller("TailController",
-function ($scope, $location) {
+.controller("TailController", ['$scope', '$rootScope', '$location',
+function ($scope, $rootScope, $location) {
$scope.redirect = function () {
$location.path('/self');
+$rootScope.endReached = false;
};
-});
+}]);
http://git-wip-us.apache.org/repos/asf/syncope/blob/94cb1607/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 7e84c17..2366311 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
@@ -513,6 +513,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.logout = function (message) {
AuthService.logout().then(function (response) {
console.info("Logout successfully");
+$rootScope.endReached = false;
$location.path('/self');
if (message) {
$scope.showSuccess(message, $scope.notification);
http://git-wip-us.apache.org/repos/asf/syncope/blob/94cb1607/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
index aacf5ac..e4f50d3 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
+++
b/client/enduser/src/main/resources/META-INF/resources/app/languages/de/dynamic.json
@@ -1,26 +1,26 @@
{
- "credentials": "Details",
+ "credentials": "Anmeldedaten",
"groups": "Gruppen",
"plainSchemas": "PlainSchemas",
"derivedSchemas": "DerivedSchemas",
"virtualSchemas": "VirtualSchemas",
"resources": "Ressourcen",
- "finish": "Finish",
+ "finish": "Ende",
"fullname": "vollständiger Name",
- "userId": "benutzer Id",
- "loginDate": "login Datum",
- "firstname": "name",
- "surname": "familien-oder nachname",
+ "userId": "Benutzer-ID",
+ "loginDate": "Login-Datum",
+ "firstname": "Vorname",
+ "surname": "Familien- oder Nachname",
"ctype": "ctype",
"email": "email",
- "activationDate": "aktivierungsdatum ",
- "uselessReadonly": "uselessReadonly",
+ "activationDate": "Aktivierungsdatum ",
+ "uselessReadonly": "unnötig, nur zum lesen",
"cool": "cool",
- "gender": "geschlecht",
+ "gender": "Geschlecht",
"aLong": "aLong",
- "makeItDouble": "makeItDouble",
- "obscure": "obscure",
[2/2] syncope git commit: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope
Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/syncope Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/58378e13 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/58378e13 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/58378e13 Branch: refs/heads/master Commit: 58378e13f03e932da744a30959152c47c771154f Parents: 94cb160 adfdaa0 Author: Matteo Di Carlo Authored: Thu Oct 13 16:53:47 2016 +0200 Committer: Matteo Di Carlo Committed: Thu Oct 13 16:53:47 2016 +0200 -- pom.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
syncope git commit: [SYNCOPE-967] enduser tests updated
Repository: syncope
Updated Branches:
refs/heads/2_0_X d2c195c89 -> eea3e493f
[SYNCOPE-967] enduser tests updated
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/eea3e493
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/eea3e493
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/eea3e493
Branch: refs/heads/2_0_X
Commit: eea3e493f056047f342d54c557a7a8e433abcc23
Parents: d2c195c
Author: Matteo Di Carlo
Authored: Thu Nov 17 14:30:30 2016 +0100
Committer: Matteo Di Carlo
Committed: Thu Nov 17 14:30:30 2016 +0100
--
.../META-INF/resources/app/css/editUser.css | 15 +
.../resources/app/views/user-credentials.html | 2 +-
.../app/views/user-derived-schemas.html | 2 +-
.../resources/app/views/user-groups.html| 2 +-
.../resources/app/views/user-plain-schemas.html | 2 +-
.../app/views/user-virtual-schemas.html | 2 +-
.../client/enduser/protractor/tests/create.js | 29 +-
.../client/enduser/protractor/tests/edit.js | 32
8 files changed, 48 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/eea3e493/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index 10d1105..a65be7e 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -134,6 +134,21 @@ under the License.
#save:hover {
background: #658D5D;
}
+
+#finish{
+ background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*
Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Opera
11.10+ */
+ background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* IE10+ */
+ color: black;
+ margin-left: 5px;
+ /*width: 15%;*/
+}
+#finish:hover {
+ background: #658D5D;
+}
+
#cancel {
/*margin-top: 5%;*/
/*width: 15%;*/
http://git-wip-us.apache.org/repos/asf/syncope/blob/eea3e493/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 fca6237..2d1a2a8 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
@@ -63,7 +63,7 @@ under the License.
{{'FINISH'| translate}}
- {{'FINISH'|
translate}}
+ {{'FINISH'|
translate}}
http://git-wip-us.apache.org/repos/asf/syncope/blob/eea3e493/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
index f98e1c1..3bbc1c6 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
@@ -22,7 +22,7 @@ under the License.
{{'FINISH'| translate}}
- {{'FINISH'|
translate}}
+ {{'FINISH'|
translate}}
http://git-wip-us.apache.org/repos/asf/syncope/blob/eea3e493/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 9e31904..e6d362e 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
@@ -34,7 +34,7 @@ under the License.
{{'FINISH'| translate}}
- {{'FINISH'|
translate}}
+ {{'FINISH'|
translate}}
http://git-wip-us.apache.org/repos/asf/syncope/blob/eea3e493/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain-s
syncope git commit: [SYNCOPE-967] enduser tests updated
Repository: syncope
Updated Branches:
refs/heads/master d675e1b6d -> 86b836b2a
[SYNCOPE-967] enduser tests updated
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/86b836b2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/86b836b2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/86b836b2
Branch: refs/heads/master
Commit: 86b836b2a5502f0b9277354c3b1f4b4449c05632
Parents: d675e1b
Author: Matteo Di Carlo
Authored: Thu Nov 17 14:30:30 2016 +0100
Committer: Matteo Di Carlo
Committed: Thu Nov 17 14:31:20 2016 +0100
--
.../META-INF/resources/app/css/editUser.css | 15 +
.../resources/app/views/user-credentials.html | 2 +-
.../app/views/user-derived-schemas.html | 2 +-
.../resources/app/views/user-groups.html| 2 +-
.../resources/app/views/user-plain-schemas.html | 2 +-
.../app/views/user-virtual-schemas.html | 2 +-
.../client/enduser/protractor/tests/create.js | 29 +-
.../client/enduser/protractor/tests/edit.js | 32
8 files changed, 48 insertions(+), 38 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/86b836b2/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index 10d1105..a65be7e 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -134,6 +134,21 @@ under the License.
#save:hover {
background: #658D5D;
}
+
+#finish{
+ background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*
Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Opera
11.10+ */
+ background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* IE10+ */
+ color: black;
+ margin-left: 5px;
+ /*width: 15%;*/
+}
+#finish:hover {
+ background: #658D5D;
+}
+
#cancel {
/*margin-top: 5%;*/
/*width: 15%;*/
http://git-wip-us.apache.org/repos/asf/syncope/blob/86b836b2/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 fca6237..2d1a2a8 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
@@ -63,7 +63,7 @@ under the License.
{{'FINISH'| translate}}
- {{'FINISH'|
translate}}
+ {{'FINISH'|
translate}}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86b836b2/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
index f98e1c1..3bbc1c6 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/user-derived-schemas.html
@@ -22,7 +22,7 @@ under the License.
{{'FINISH'| translate}}
- {{'FINISH'|
translate}}
+ {{'FINISH'|
translate}}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86b836b2/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 9e31904..e6d362e 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
@@ -34,7 +34,7 @@ under the License.
{{'FINISH'| translate}}
- {{'FINISH'|
translate}}
+ {{'FINISH'|
translate}}
http://git-wip-us.apache.org/repos/asf/syncope/blob/86b836b2/client/enduser/src/main/resources/META-INF/resources/app/views/user-plain
syncope git commit: [SYNCOPE-970] restore default language settings on logout and page refresh
Repository: syncope
Updated Branches:
refs/heads/2_0_X eea3e493f -> 13caa7a8c
[SYNCOPE-970] restore default language settings on logout and page refresh
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/13caa7a8
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/13caa7a8
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/13caa7a8
Branch: refs/heads/2_0_X
Commit: 13caa7a8cd529c517a72f9aa2fbfcd1ac27b2bc0
Parents: eea3e49
Author: Matteo Di Carlo
Authored: Fri Nov 18 12:56:12 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Nov 18 12:56:12 2016 +0100
--
.../resources/META-INF/resources/app/index.html | 1 -
.../resources/META-INF/resources/app/js/app.js | 4 +--
.../app/js/controllers/LoginController.js | 19 +++
.../app/js/controllers/TailController.js| 29 -
.../app/js/controllers/UserController.js| 33 +---
.../META-INF/resources/app/views/editUser.html | 2 +-
.../resources/app/views/passwordreset.html | 4 +--
.../META-INF/resources/app/views/self.html | 2 +-
.../META-INF/resources/app/views/success.html | 2 +-
9 files changed, 39 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/13caa7a8/client/enduser/src/main/resources/META-INF/resources/app/index.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 55b34a5..30f155b 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -98,7 +98,6 @@ under the License.
-
http://git-wip-us.apache.org/repos/asf/syncope/blob/13caa7a8/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 12c814c..efdf8ed 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
@@ -53,8 +53,8 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
$translateProvider.useLoader('$translatePartialLoader', {
urlTemplate: 'languages/{lang}/{part}.json'
})
-.preferredLanguage('en')
-.useCookieStorage();
+.preferredLanguage('en');
+//.useCookieStorage();
// route configuration
$stateProvider
http://git-wip-us.apache.org/repos/asf/syncope/blob/13caa7a8/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
index 75d41a6..af0bfdb 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
@@ -18,25 +18,16 @@
*/
'use strict';
-angular.module("login").controller("LoginController", ['$scope', '$http',
'$location',
- 'AuthService', '$translate', '$translatePartialLoader', function ($scope,
$http,
- $location, AuthService, $translate) {
+angular.module("login").controller("LoginController", ['$scope', '$http',
'$location', 'AuthService',
+ function ($scope, $http, $location, AuthService) {
$scope.credentials = {
username: '',
password: '',
errorMessage: ''
};
-$scope.languages = {
- availableLanguages: [
-{id: '1', name: 'Italiano', code: 'it'},
-{id: '2', name: 'English', code: 'en'},
-{id: '3', name: 'Deutsch', code: 'de'}
- ],
- selectedLanguage: {id: '2', name: 'English', code: 'en'}
-};
-$scope.login = function (credentials) {
+$scope.login = function (credentials) {
AuthService.login($scope.credentials).then(function (user) {
console.info("Login success for: ", user);
// reset error message
@@ -55,6 +46,7 @@ angular.module("login").controller("LoginController",
['$scope', '$http', '$loca
$scope.showError($scope.credentials.errorMessage, $scope.notification);
});
};
+
$scope.logout = function () {
AuthService.logout().then(function (response) {
console.info("Logout successfully");
@@ -9
syncope git commit: [SYNCOPE-970] restore default language settings on logout and page refresh
Repository: syncope
Updated Branches:
refs/heads/master 86b836b2a -> 6a59c3311
[SYNCOPE-970] restore default language settings on logout and page refresh
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6a59c331
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6a59c331
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6a59c331
Branch: refs/heads/master
Commit: 6a59c3311e8b160e6ea9851c65def972a76e730e
Parents: 86b836b
Author: Matteo Di Carlo
Authored: Fri Nov 18 12:56:12 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Nov 18 12:57:16 2016 +0100
--
.../resources/META-INF/resources/app/index.html | 1 -
.../resources/META-INF/resources/app/js/app.js | 4 +--
.../app/js/controllers/LoginController.js | 19 +++
.../app/js/controllers/TailController.js| 29 -
.../app/js/controllers/UserController.js| 33 +---
.../META-INF/resources/app/views/editUser.html | 2 +-
.../resources/app/views/passwordreset.html | 4 +--
.../META-INF/resources/app/views/self.html | 2 +-
.../META-INF/resources/app/views/success.html | 2 +-
9 files changed, 39 insertions(+), 57 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/6a59c331/client/enduser/src/main/resources/META-INF/resources/app/index.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 55b34a5..30f155b 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -98,7 +98,6 @@ under the License.
-
http://git-wip-us.apache.org/repos/asf/syncope/blob/6a59c331/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 12c814c..efdf8ed 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
@@ -53,8 +53,8 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
$translateProvider.useLoader('$translatePartialLoader', {
urlTemplate: 'languages/{lang}/{part}.json'
})
-.preferredLanguage('en')
-.useCookieStorage();
+.preferredLanguage('en');
+//.useCookieStorage();
// route configuration
$stateProvider
http://git-wip-us.apache.org/repos/asf/syncope/blob/6a59c331/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
index 75d41a6..af0bfdb 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/LoginController.js
@@ -18,25 +18,16 @@
*/
'use strict';
-angular.module("login").controller("LoginController", ['$scope', '$http',
'$location',
- 'AuthService', '$translate', '$translatePartialLoader', function ($scope,
$http,
- $location, AuthService, $translate) {
+angular.module("login").controller("LoginController", ['$scope', '$http',
'$location', 'AuthService',
+ function ($scope, $http, $location, AuthService) {
$scope.credentials = {
username: '',
password: '',
errorMessage: ''
};
-$scope.languages = {
- availableLanguages: [
-{id: '1', name: 'Italiano', code: 'it'},
-{id: '2', name: 'English', code: 'en'},
-{id: '3', name: 'Deutsch', code: 'de'}
- ],
- selectedLanguage: {id: '2', name: 'English', code: 'en'}
-};
-$scope.login = function (credentials) {
+$scope.login = function (credentials) {
AuthService.login($scope.credentials).then(function (user) {
console.info("Login success for: ", user);
// reset error message
@@ -55,6 +46,7 @@ angular.module("login").controller("LoginController",
['$scope', '$http', '$loca
$scope.showError($scope.credentials.errorMessage, $scope.notification);
});
};
+
$scope.logout = function () {
AuthService.logout().then(function (response) {
console.info("Logout successfully");
@@
syncope git commit: fit enduser pom updated
Repository: syncope Updated Branches: refs/heads/2_0_X 1ecf5043b -> 6259a4d73 fit enduser pom updated Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/6259a4d7 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/6259a4d7 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/6259a4d7 Branch: refs/heads/2_0_X Commit: 6259a4d73eac920e220b4755f61780ce53d423c1 Parents: 1ecf504 Author: Matteo Di Carlo Authored: Tue Nov 22 13:33:57 2016 +0100 Committer: Matteo Di Carlo Committed: Tue Nov 22 13:33:57 2016 +0100 -- fit/enduser-reference/pom.xml | 22 ++ 1 file changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/6259a4d7/fit/enduser-reference/pom.xml -- diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml index c72263a..1db2aad 100644 --- a/fit/enduser-reference/pom.xml +++ b/fit/enduser-reference/pom.xml @@ -428,6 +428,17 @@ under the License. + + +org.codehaus.mojo +exec-maven-plugin + + +Execute Tests +none + + + @@ -538,6 +549,17 @@ under the License. + + +org.codehaus.mojo +exec-maven-plugin + + +Execute Tests +none + + +
syncope git commit: fit enduser pom updated
Repository: syncope Updated Branches: refs/heads/master 242050488 -> 7d5ec81e1 fit enduser pom updated Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7d5ec81e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7d5ec81e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7d5ec81e Branch: refs/heads/master Commit: 7d5ec81e1fb09c703e809a61c0b75faf939bed32 Parents: 2420504 Author: Matteo Di Carlo Authored: Tue Nov 22 13:33:57 2016 +0100 Committer: Matteo Di Carlo Committed: Tue Nov 22 13:34:43 2016 +0100 -- fit/enduser-reference/pom.xml | 22 ++ 1 file changed, 22 insertions(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/7d5ec81e/fit/enduser-reference/pom.xml -- diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml index e4ba8d8..03d6eb3 100644 --- a/fit/enduser-reference/pom.xml +++ b/fit/enduser-reference/pom.xml @@ -428,6 +428,17 @@ under the License. + + +org.codehaus.mojo +exec-maven-plugin + + +Execute Tests +none + + + @@ -538,6 +549,17 @@ under the License. + + +org.codehaus.mojo +exec-maven-plugin + + +Execute Tests +none + + +
syncope git commit: [SYNCOPE-972] makes Syncope Enduser template responsive
Repository: syncope
Updated Branches:
refs/heads/master 16b3f89a6 -> 5e98a4382
[SYNCOPE-972] makes Syncope Enduser template responsive
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5e98a438
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5e98a438
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5e98a438
Branch: refs/heads/master
Commit: 5e98a4382634d0323458d51d0562b69e0615edc9
Parents: 16b3f89
Author: Matteo Di Carlo
Authored: Mon Nov 28 16:31:12 2016 +0100
Committer: Matteo Di Carlo
Committed: Mon Nov 28 17:37:14 2016 +0100
--
.../META-INF/resources/app/css/app.css | 3 +
.../META-INF/resources/app/css/editUser.css | 408 ---
.../META-INF/resources/app/css/login.css| 125 +++---
.../resources/META-INF/resources/app/index.html | 1 +
.../app/js/directives/dynamicPlainAttribute.js | 2 +-
.../app/views/dynamicPlainAttribute.html| 10 +-
.../META-INF/resources/app/views/self.html | 1 +
.../resources/app/views/user-credentials.html | 10 +-
.../app/views/user-derived-schemas.html | 11 +-
.../resources/app/views/user-form-finish.html | 10 +-
.../resources/app/views/user-groups.html| 9 +-
.../resources/app/views/user-plain-schemas.html | 9 +-
.../resources/app/views/user-resources.html | 3 +-
.../app/views/user-virtual-schemas.html | 10 +-
14 files changed, 452 insertions(+), 160 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/5e98a438/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
index d112af2..f2e5d3c 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
@@ -30,10 +30,13 @@ under the License.
.k-notification-wrap{
white-space: normal !important;
word-wrap: break-word !important;
+ font-size: 12px;
+
}
.k-notification{
width : 320px;
+ font-size: 12px;
}
.suggestions{
http://git-wip-us.apache.org/repos/asf/syncope/blob/5e98a438/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index a65be7e..4f4bf42 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -17,13 +17,26 @@ specific language governing permissions and limitations
under the License.
*/
+/*default stile*/
+
+* {
+ box-sizing: border-box;
+}
+
#form-container {
position: relative;
width: 100%;
+ margin-top:-4px;
margin: 0 auto;
text-align: center;
}
+#form-container .breadcrumb-header {
+ margin: auto;
+ width: 80%;
+ padding:10px;
+}
+
#form-container .page-header { background: -moz-linear-gradient(top, #a9db80
0%, #96c56f 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left
top, left bottom, color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*
Chrome,Safari4+ */
background: -webkit-linear-gradient(top,
#a9db80 0%,#96c56f 100%); /* Chrome10+,Safari5.1+ */
@@ -39,11 +52,6 @@ under the License.
-webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0,
0.3);
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
}
-#form-container .breadcrumb-header {
- margin: auto;
- width: 80%;
- padding:10px;
-}
.signup-form {
text-align: left;
@@ -58,7 +66,7 @@ under the License.
#attribute-derived,
#attribute-virtual {
- padding: 0 155px;
+ padding: 155px;
}
.attribute-virtual-value-container {
@@ -73,10 +81,6 @@ under the License.
margin-bottom: 2%;
}
-.minus{
-
-}
-
.fileButton{
margin-top: 2%;
}
@@ -88,70 +92,79 @@ under the License.
.attribute-ui-select {
width: 100%;
- /*margin-left: 20%;*/
list-style: none;
}
#previous {
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*
Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Opera
11.10+ */
- background: -ms-linear-gradient(t
syncope git commit: [SYNCOPE-972] makes Syncope Enduser template responsive
Repository: syncope
Updated Branches:
refs/heads/2_0_X 8d6e5a64e -> f052c2ce5
[SYNCOPE-972] makes Syncope Enduser template responsive
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f052c2ce
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f052c2ce
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f052c2ce
Branch: refs/heads/2_0_X
Commit: f052c2ce5a6a48b938af7376b92ff516a63c15c5
Parents: 8d6e5a6
Author: Matteo Di Carlo
Authored: Mon Nov 28 16:31:12 2016 +0100
Committer: Matteo Di Carlo
Committed: Mon Nov 28 16:32:14 2016 +0100
--
.../META-INF/resources/app/css/app.css | 3 +
.../META-INF/resources/app/css/editUser.css | 408 ---
.../META-INF/resources/app/css/login.css| 125 +++---
.../resources/META-INF/resources/app/index.html | 1 +
.../app/js/directives/dynamicPlainAttribute.js | 2 +-
.../app/views/dynamicPlainAttribute.html| 10 +-
.../META-INF/resources/app/views/self.html | 1 +
.../resources/app/views/user-credentials.html | 10 +-
.../app/views/user-derived-schemas.html | 11 +-
.../resources/app/views/user-form-finish.html | 10 +-
.../resources/app/views/user-groups.html| 9 +-
.../resources/app/views/user-plain-schemas.html | 9 +-
.../resources/app/views/user-resources.html | 3 +-
.../app/views/user-virtual-schemas.html | 10 +-
14 files changed, 452 insertions(+), 160 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/f052c2ce/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
index d112af2..f2e5d3c 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
@@ -30,10 +30,13 @@ under the License.
.k-notification-wrap{
white-space: normal !important;
word-wrap: break-word !important;
+ font-size: 12px;
+
}
.k-notification{
width : 320px;
+ font-size: 12px;
}
.suggestions{
http://git-wip-us.apache.org/repos/asf/syncope/blob/f052c2ce/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index a65be7e..4f4bf42 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -17,13 +17,26 @@ specific language governing permissions and limitations
under the License.
*/
+/*default stile*/
+
+* {
+ box-sizing: border-box;
+}
+
#form-container {
position: relative;
width: 100%;
+ margin-top:-4px;
margin: 0 auto;
text-align: center;
}
+#form-container .breadcrumb-header {
+ margin: auto;
+ width: 80%;
+ padding:10px;
+}
+
#form-container .page-header { background: -moz-linear-gradient(top, #a9db80
0%, #96c56f 100%); /* FF3.6+ */
background: -webkit-gradient(linear, left
top, left bottom, color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*
Chrome,Safari4+ */
background: -webkit-linear-gradient(top,
#a9db80 0%,#96c56f 100%); /* Chrome10+,Safari5.1+ */
@@ -39,11 +52,6 @@ under the License.
-webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0,
0.3);
box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
}
-#form-container .breadcrumb-header {
- margin: auto;
- width: 80%;
- padding:10px;
-}
.signup-form {
text-align: left;
@@ -58,7 +66,7 @@ under the License.
#attribute-derived,
#attribute-virtual {
- padding: 0 155px;
+ padding: 155px;
}
.attribute-virtual-value-container {
@@ -73,10 +81,6 @@ under the License.
margin-bottom: 2%;
}
-.minus{
-
-}
-
.fileButton{
margin-top: 2%;
}
@@ -88,70 +92,79 @@ under the License.
.attribute-ui-select {
width: 100%;
- /*margin-left: 20%;*/
list-style: none;
}
#previous {
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /* Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*
Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Opera
11.10+ */
- background: -ms-linear-gradient(top
syncope git commit: [SYNCOPE-977] add responsive css for captcha buttons
Repository: syncope
Updated Branches:
refs/heads/2_0_X 4f05ba390 -> f9b03e82f
[SYNCOPE-977] add responsive css for captcha buttons
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f9b03e82
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f9b03e82
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f9b03e82
Branch: refs/heads/2_0_X
Commit: f9b03e82fa42b110b23731eec53dffb68f24fb15
Parents: 4f05ba3
Author: Matteo Di Carlo
Authored: Wed Nov 30 16:02:19 2016 +0100
Committer: Matteo Di Carlo
Committed: Wed Nov 30 16:02:19 2016 +0100
--
.../META-INF/resources/app/css/editUser.css | 84
.../META-INF/resources/app/views/captcha.html | 4 +-
.../resources/app/views/user-credentials.html | 2 +-
.../app/views/user-derived-schemas.html | 2 +-
.../resources/app/views/user-groups.html| 2 +-
.../resources/app/views/user-plain-schemas.html | 2 +-
.../app/views/user-virtual-schemas.html | 2 +-
7 files changed, 77 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9b03e82/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index 4f4bf42..bb4a6c6 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -31,7 +31,7 @@ under the License.
text-align: center;
}
-#form-container .breadcrumb-header {
+#form-container .breadcrumb-header{
margin: auto;
width: 80%;
padding:10px;
@@ -96,7 +96,7 @@ under the License.
}
#previous {
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+
+ background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+*/
@@ -167,6 +167,16 @@ under the License.
width: 70px;
}
+
+.container-fluid {
+ padding-right: 15px;
+ padding-left: 15px;
+ margin-right: auto;
+ margin-left: auto;
+ width: 63%;
+}
+
+
#form-views { width:100%; }
/* basic styling for entering and leaving */
@@ -292,6 +302,7 @@ under the License.
color: #dd301b;
font-weight: 600;
}
+
/*--end default style*/
/*style for devices max width 350 */
@@ -329,6 +340,20 @@ under the License.
padding: 0px 0px 1px 0px
}
+ /*.container-fluid {
+ padding-right: 15px;
+ padding-left: 31px;
+ margin-right: auto;
+ margin-left: auto;
+ width: 100%;
+}
+
+#captchaButtons {
+ width: 20%;
+ margin-left: 100px;
+ padding-bottom: 5px;
+}*/
+
}
/*style for devices max width 400 */
@@ -337,19 +362,19 @@ under the License.
input[type=file] {
display: block;
}
-
+
.panel-body {
padding: 0px;
}
-
+
#datetime input {
width: 100%;
}
-
+
#form-container {
padding: 1px 0px 0px 0px;
}
-
+
#form-container .breadcrumb-header {
margin: auto;
width: 100%;
@@ -357,7 +382,7 @@ under the License.
text-align: left;
overflow: auto;
}
-
+
.btn-group{
position: relative;
display: inline-flex;
@@ -367,18 +392,22 @@ under the License.
margin-top: 10px;
padding: 0px 0px 1px 0px
}
-
+
.btn-breadcrumb .btn {
padding:6px 12px 6px 12px;
}
-
+
.btn-breadcrumb .btn:first-child {
padding:6px 6px 6px 10px;
}
-
+
.btn-breadcrumb .btn:last-child {
padding:6px 18px 6px 24px;
}
+ /*
+#refresh{
+ margin-top:1px;
+}*/
}
@@ -426,7 +455,7 @@ under the License.
color: #333;
background-color: #fff;
border-color: #ccc;
-width: 100%;
+/*width: 100%;*/
}
.card-container.card {
@@ -437,11 +466,11 @@ under the License.
.btn-breadcrumb .btn {
padding:6px 12px 6px 12px;
}
-
+
.btn-breadcrumb .btn:first-child {
padding:6px 6px 6px 10px;
}
-
+
.btn-breadcrumb .btn:last-child {
padding:6px 18px 6px 24px;
}
@@ -461,6 +490,7 @@ under the License.
padding-left: 0px;
margin-right: auto;
margin-left: auto;
+/*margin-top: -4px;*/
}
.input-group .form-control{
@@ -513,7 +543,17 @@ under the License.
.row{
margin-left: -34px;
-margin-right: -76px;
+margin-right: 0px;
syncope git commit: [SYNCOPE-977] add responsive css for captcha buttons
Repository: syncope
Updated Branches:
refs/heads/master 13c18df35 -> e7e8e92da
[SYNCOPE-977] add responsive css for captcha buttons
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/e7e8e92d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/e7e8e92d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/e7e8e92d
Branch: refs/heads/master
Commit: e7e8e92da2ac89cc7ee698cc589e28dfb1c06de3
Parents: 13c18df
Author: Matteo Di Carlo
Authored: Wed Nov 30 16:02:19 2016 +0100
Committer: Matteo Di Carlo
Committed: Wed Nov 30 16:03:20 2016 +0100
--
.../META-INF/resources/app/css/editUser.css | 84
.../META-INF/resources/app/views/captcha.html | 4 +-
.../resources/app/views/user-credentials.html | 2 +-
.../app/views/user-derived-schemas.html | 2 +-
.../resources/app/views/user-groups.html| 2 +-
.../resources/app/views/user-plain-schemas.html | 2 +-
.../app/views/user-virtual-schemas.html | 2 +-
7 files changed, 77 insertions(+), 21 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/e7e8e92d/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index 4f4bf42..bb4a6c6 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -31,7 +31,7 @@ under the License.
text-align: center;
}
-#form-container .breadcrumb-header {
+#form-container .breadcrumb-header{
margin: auto;
width: 80%;
padding:10px;
@@ -96,7 +96,7 @@ under the License.
}
#previous {
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+
+ background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+ */
background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+*/
@@ -167,6 +167,16 @@ under the License.
width: 70px;
}
+
+.container-fluid {
+ padding-right: 15px;
+ padding-left: 15px;
+ margin-right: auto;
+ margin-left: auto;
+ width: 63%;
+}
+
+
#form-views { width:100%; }
/* basic styling for entering and leaving */
@@ -292,6 +302,7 @@ under the License.
color: #dd301b;
font-weight: 600;
}
+
/*--end default style*/
/*style for devices max width 350 */
@@ -329,6 +340,20 @@ under the License.
padding: 0px 0px 1px 0px
}
+ /*.container-fluid {
+ padding-right: 15px;
+ padding-left: 31px;
+ margin-right: auto;
+ margin-left: auto;
+ width: 100%;
+}
+
+#captchaButtons {
+ width: 20%;
+ margin-left: 100px;
+ padding-bottom: 5px;
+}*/
+
}
/*style for devices max width 400 */
@@ -337,19 +362,19 @@ under the License.
input[type=file] {
display: block;
}
-
+
.panel-body {
padding: 0px;
}
-
+
#datetime input {
width: 100%;
}
-
+
#form-container {
padding: 1px 0px 0px 0px;
}
-
+
#form-container .breadcrumb-header {
margin: auto;
width: 100%;
@@ -357,7 +382,7 @@ under the License.
text-align: left;
overflow: auto;
}
-
+
.btn-group{
position: relative;
display: inline-flex;
@@ -367,18 +392,22 @@ under the License.
margin-top: 10px;
padding: 0px 0px 1px 0px
}
-
+
.btn-breadcrumb .btn {
padding:6px 12px 6px 12px;
}
-
+
.btn-breadcrumb .btn:first-child {
padding:6px 6px 6px 10px;
}
-
+
.btn-breadcrumb .btn:last-child {
padding:6px 18px 6px 24px;
}
+ /*
+#refresh{
+ margin-top:1px;
+}*/
}
@@ -426,7 +455,7 @@ under the License.
color: #333;
background-color: #fff;
border-color: #ccc;
-width: 100%;
+/*width: 100%;*/
}
.card-container.card {
@@ -437,11 +466,11 @@ under the License.
.btn-breadcrumb .btn {
padding:6px 12px 6px 12px;
}
-
+
.btn-breadcrumb .btn:first-child {
padding:6px 6px 6px 10px;
}
-
+
.btn-breadcrumb .btn:last-child {
padding:6px 18px 6px 24px;
}
@@ -461,6 +490,7 @@ under the License.
padding-left: 0px;
margin-right: auto;
margin-left: auto;
+/*margin-top: -4px;*/
}
.input-group .form-control{
@@ -513,7 +543,17 @@ under the License.
.row{
margin-left: -34px;
-margin-right: -76px;
+margin-right: 0px
syncope git commit: [SYNCOPE-979]-adding resource column in user propagation tasks table
Repository: syncope
Updated Branches:
refs/heads/2_0_X 7665690e9 -> 5c8975f02
[SYNCOPE-979]-adding resource column in user propagation tasks table
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5c8975f0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5c8975f0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5c8975f0
Branch: refs/heads/2_0_X
Commit: 5c8975f02f807a3cd9fb448a4a721fa5c7ab887e
Parents: 7665690
Author: Matteo Di Carlo
Authored: Thu Dec 1 16:18:44 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Dec 2 16:12:00 2016 +0100
--
.../client/console/panels/DisplayAttributesModalPanel.java | 8 +++-
.../client/console/tasks/PropagationTaskDirectoryPanel.java | 9 +++--
.../console/tasks/PropagationTaskDirectoryPanel.properties | 1 +
.../tasks/PropagationTaskDirectoryPanel_it.properties | 1 +
.../tasks/PropagationTaskDirectoryPanel_pt_BR.properties| 1 +
.../tasks/PropagationTaskDirectoryPanel_ru.properties | 1 +
6 files changed, 18 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/5c8975f0/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
index bbe8a19..106ba0c 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
@@ -19,6 +19,7 @@
package org.apache.syncope.client.console.panels;
import java.io.Serializable;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -81,13 +82,18 @@ public abstract class DisplayAttributesModalPanel extend
super(modal, pageRef);
this.type = type;
+final List detailslList = SearchableFields.get(getTOClass());
+Collections.sort(detailslList);
+Collections.sort(pSchemaNames);
+Collections.sort(dSchemaNames);
+
final IModel> fnames = new
LoadableDetachableModel>() {
private static final long serialVersionUID = 5275935387613157437L;
@Override
protected List load() {
-return SearchableFields.get(getTOClass());
+return detailslList;
}
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/5c8975f0/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
index 0bb8e90..a8e3f9a 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
@@ -80,8 +80,13 @@ public abstract class PropagationTaskDirectoryPanel
columns.add(new PropertyColumn(new
StringResourceModel(
"operation", this, null), "operation", "operation"));
-columns.add(new PropertyColumn(
-new StringResourceModel("anyTypeKind", this, null),
"anyTypeKind", "anyTypeKind"));
+if (resource == null) {
+columns.add(new PropertyColumn(new
StringResourceModel(
+"resource", this, null), "resource", "resource"));
+} else {
+columns.add(new PropertyColumn(
+new StringResourceModel("anyTypeKind", this, null),
"anyTypeKind", "anyTypeKind"));
+}
columns.add(new PropertyColumn(
new StringResourceModel("entityKey", this, null), "entityKey",
"entityKey"));
http://git-wip-us.apache.org/repos/asf/syncope/blob/5c8975f0/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
--
diff --git
a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
index 83b7a7d..32c785a 100644
---
a/client/console/src/main/resources/org/apache/syncope/client/
syncope git commit: [SYNCOPE-979]-adding resource column in user propagation tasks table
Repository: syncope
Updated Branches:
refs/heads/master 9722c9218 -> db0695107
[SYNCOPE-979]-adding resource column in user propagation tasks table
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/db069510
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/db069510
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/db069510
Branch: refs/heads/master
Commit: db06951074ce82882bdc6bab9829f8bc60de221f
Parents: 9722c92
Author: Matteo Di Carlo
Authored: Thu Dec 1 16:18:44 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Dec 2 16:17:06 2016 +0100
--
.../client/console/panels/DisplayAttributesModalPanel.java | 8 +++-
.../client/console/tasks/PropagationTaskDirectoryPanel.java | 9 +++--
.../console/tasks/PropagationTaskDirectoryPanel.properties | 1 +
.../tasks/PropagationTaskDirectoryPanel_it.properties | 1 +
.../tasks/PropagationTaskDirectoryPanel_pt_BR.properties| 1 +
.../tasks/PropagationTaskDirectoryPanel_ru.properties | 1 +
6 files changed, 18 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
index bbe8a19..106ba0c 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/DisplayAttributesModalPanel.java
@@ -19,6 +19,7 @@
package org.apache.syncope.client.console.panels;
import java.io.Serializable;
+import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -81,13 +82,18 @@ public abstract class DisplayAttributesModalPanel extend
super(modal, pageRef);
this.type = type;
+final List detailslList = SearchableFields.get(getTOClass());
+Collections.sort(detailslList);
+Collections.sort(pSchemaNames);
+Collections.sort(dSchemaNames);
+
final IModel> fnames = new
LoadableDetachableModel>() {
private static final long serialVersionUID = 5275935387613157437L;
@Override
protected List load() {
-return SearchableFields.get(getTOClass());
+return detailslList;
}
};
http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
index 0bb8e90..a8e3f9a 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.java
@@ -80,8 +80,13 @@ public abstract class PropagationTaskDirectoryPanel
columns.add(new PropertyColumn(new
StringResourceModel(
"operation", this, null), "operation", "operation"));
-columns.add(new PropertyColumn(
-new StringResourceModel("anyTypeKind", this, null),
"anyTypeKind", "anyTypeKind"));
+if (resource == null) {
+columns.add(new PropertyColumn(new
StringResourceModel(
+"resource", this, null), "resource", "resource"));
+} else {
+columns.add(new PropertyColumn(
+new StringResourceModel("anyTypeKind", this, null),
"anyTypeKind", "anyTypeKind"));
+}
columns.add(new PropertyColumn(
new StringResourceModel("entityKey", this, null), "entityKey",
"entityKey"));
http://git-wip-us.apache.org/repos/asf/syncope/blob/db069510/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
--
diff --git
a/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/tasks/PropagationTaskDirectoryPanel.properties
index 83b7a7d..32c785a 100644
---
a/client/console/src/main/resources/org/apache/syncope/clien
syncope git commit: [SYNCOPE-773] allow edit and view in job dashboard widget
Repository: syncope
Updated Branches:
refs/heads/2_0_X 02722801b -> 9ed1a00c2
[SYNCOPE-773] allow edit and view in job dashboard widget
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9ed1a00c
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9ed1a00c
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9ed1a00c
Branch: refs/heads/2_0_X
Commit: 9ed1a00c27440bf1eddfbef559088afdc8bfec4a
Parents: 0272280
Author: Matteo Di Carlo
Authored: Fri Dec 23 17:09:15 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Dec 30 13:02:42 2016 +0100
--
.../client/console/panels/ExecMessageModal.java | 34 ++
.../console/tasks/ExecutionsDirectoryPanel.java | 2 +-
.../client/console/widgets/ActionColumn.java| 27 +
.../console/widgets/ActionLinksPanel.java | 27 +
.../client/console/widgets/ExecActionPanel.java | 41 +++
.../client/console/widgets/JobActionPanel.java | 103 +-
.../client/console/widgets/JobWidget.java | 107 ++-
.../client/console/panels/ExecMessageModal.html | 25 +
.../client/console/widgets/JobActionPanel.html | 14 +--
.../JobWidget$AvailableJobsPanel.properties | 21
.../JobWidget$AvailableJobsPanel_it.properties | 21
...obWidget$AvailableJobsPanel_pt_BR.properties | 21
.../JobWidget$AvailableJobsPanel_ru.properties | 21
.../client/console/widgets/JobWidget.html | 2 +
.../client/console/widgets/JobWidget.properties | 1 +
.../console/widgets/JobWidget_it.properties | 1 +
.../console/widgets/JobWidget_pt_BR.properties | 1 +
.../console/widgets/JobWidget_ru.properties | 19 ++--
18 files changed, 461 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ed1a00c/client/console/src/main/java/org/apache/syncope/client/console/panels/ExecMessageModal.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ExecMessageModal.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ExecMessageModal.java
new file mode 100644
index 000..23f411b
--- /dev/null
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ExecMessageModal.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.panels;
+
+import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+
+public class ExecMessageModal extends Panel implements ModalPanel {
+
+private static final long serialVersionUID = 1L;
+
+public ExecMessageModal(final PageReference pageRef, final String
executionMessage) {
+super(BaseModal.CONTENT_ID);
+add(new Label("executionMessage",
executionMessage).setOutputMarkupId(true));
+}
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/9ed1a00c/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
index 1e39479..4daa2a7 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
@@ -88,7 +88,7 @@ public abstract class ExecutionsDirectoryPanel
this.key = key;
initResultTable();
}
-
+
@Override
protected void resultTableCustomChanges(final
AjaxDataTablePanel.Builder resultTableBuilder) {
resultTableBuilder.setMultiLevelPanel(bas
syncope git commit: [SYNCOPE-773] allow edit and view in job dashboard widget
Repository: syncope
Updated Branches:
refs/heads/master 6e9fbc4e9 -> 69a2e6c59
[SYNCOPE-773] allow edit and view in job dashboard widget
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/69a2e6c5
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/69a2e6c5
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/69a2e6c5
Branch: refs/heads/master
Commit: 69a2e6c595067264da66d7992d00e0b8d41c0bc3
Parents: 6e9fbc4
Author: Matteo Di Carlo
Authored: Fri Dec 23 17:09:15 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Dec 30 14:05:00 2016 +0100
--
.../client/console/panels/ExecMessageModal.java | 34 ++
.../console/tasks/ExecutionsDirectoryPanel.java | 2 +-
.../client/console/widgets/ActionColumn.java| 27 +
.../console/widgets/ActionLinksPanel.java | 27 +
.../client/console/widgets/ExecActionPanel.java | 41 +++
.../client/console/widgets/JobActionPanel.java | 103 +-
.../client/console/widgets/JobWidget.java | 107 ++-
.../client/console/panels/ExecMessageModal.html | 25 +
.../client/console/widgets/JobActionPanel.html | 14 +--
.../JobWidget$AvailableJobsPanel.properties | 21
.../JobWidget$AvailableJobsPanel_it.properties | 21
...obWidget$AvailableJobsPanel_pt_BR.properties | 21
.../JobWidget$AvailableJobsPanel_ru.properties | 21
.../client/console/widgets/JobWidget.html | 2 +
.../client/console/widgets/JobWidget.properties | 1 +
.../console/widgets/JobWidget_it.properties | 1 +
.../console/widgets/JobWidget_pt_BR.properties | 1 +
.../console/widgets/JobWidget_ru.properties | 19 ++--
18 files changed, 461 insertions(+), 27 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/69a2e6c5/client/console/src/main/java/org/apache/syncope/client/console/panels/ExecMessageModal.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ExecMessageModal.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ExecMessageModal.java
new file mode 100644
index 000..23f411b
--- /dev/null
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ExecMessageModal.java
@@ -0,0 +1,34 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.client.console.panels;
+
+import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
+import org.apache.wicket.PageReference;
+import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.markup.html.panel.Panel;
+
+public class ExecMessageModal extends Panel implements ModalPanel {
+
+private static final long serialVersionUID = 1L;
+
+public ExecMessageModal(final PageReference pageRef, final String
executionMessage) {
+super(BaseModal.CONTENT_ID);
+add(new Label("executionMessage",
executionMessage).setOutputMarkupId(true));
+}
+}
http://git-wip-us.apache.org/repos/asf/syncope/blob/69a2e6c5/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
index 1e39479..4daa2a7 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/tasks/ExecutionsDirectoryPanel.java
@@ -88,7 +88,7 @@ public abstract class ExecutionsDirectoryPanel
this.key = key;
initResultTable();
}
-
+
@Override
protected void resultTableCustomChanges(final
AjaxDataTablePanel.Builder resultTableBuilder) {
resultTableBuilder.setMultiLevelPanel(b
syncope git commit: [SYNCOPE-773] allow edit and view in job dashboard widget
Repository: syncope
Updated Branches:
refs/heads/2_0_X 9ed1a00c2 -> b38d5de21
[SYNCOPE-773] allow edit and view in job dashboard widget
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/b38d5de2
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/b38d5de2
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/b38d5de2
Branch: refs/heads/2_0_X
Commit: b38d5de21178e9c66d2f162832b540e8b1d89e23
Parents: 9ed1a00
Author: Matteo Di Carlo
Authored: Fri Dec 30 14:12:34 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Dec 30 14:12:34 2016 +0100
--
.../client/console/widgets/ActionColumn.java| 27 -
.../console/widgets/ActionLinksPanel.java | 27 -
.../client/console/widgets/ExecActionPanel.java | 41
3 files changed, 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/b38d5de2/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionColumn.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionColumn.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionColumn.java
deleted file mode 100644
index ddef2dd..000
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionColumn.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.console.widgets;
-
-/**
- *
- * @author matt3o
- */
-public class ActionColumn {
-
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/b38d5de2/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionLinksPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionLinksPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionLinksPanel.java
deleted file mode 100644
index cb2ea92..000
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionLinksPanel.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.console.widgets;
-
-/**
- *
- * @author matt3o
- */
-class ActionLinksPanel {
-
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/b38d5de2/client/console/src/main/java/org/apache/syncope/client/console/widgets/ExecActionPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ExecActionPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ExecActionPanel.java
deleted file mode 100644
index f66bd6b..000
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ExecActionPanel.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you unde
syncope git commit: [SYNCOPE-773] allow edit and view in job dashboard widget
Repository: syncope
Updated Branches:
refs/heads/master 69a2e6c59 -> 8d53c44d0
[SYNCOPE-773] allow edit and view in job dashboard widget
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/8d53c44d
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/8d53c44d
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/8d53c44d
Branch: refs/heads/master
Commit: 8d53c44d0befb750796d4a181abb93e412a85a01
Parents: 69a2e6c
Author: Matteo Di Carlo
Authored: Fri Dec 30 14:12:34 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Dec 30 14:14:17 2016 +0100
--
.../client/console/widgets/ActionColumn.java| 27 -
.../console/widgets/ActionLinksPanel.java | 27 -
.../client/console/widgets/ExecActionPanel.java | 41
3 files changed, 95 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/8d53c44d/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionColumn.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionColumn.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionColumn.java
deleted file mode 100644
index ddef2dd..000
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionColumn.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.console.widgets;
-
-/**
- *
- * @author matt3o
- */
-public class ActionColumn {
-
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8d53c44d/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionLinksPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionLinksPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionLinksPanel.java
deleted file mode 100644
index cb2ea92..000
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ActionLinksPanel.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package org.apache.syncope.client.console.widgets;
-
-/**
- *
- * @author matt3o
- */
-class ActionLinksPanel {
-
-}
http://git-wip-us.apache.org/repos/asf/syncope/blob/8d53c44d/client/console/src/main/java/org/apache/syncope/client/console/widgets/ExecActionPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ExecActionPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/ExecActionPanel.java
deleted file mode 100644
index f66bd6b..000
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/ExecActionPanel.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you un
syncope git commit: [SYNCOPE-773] fix checkstyle violations
Repository: syncope
Updated Branches:
refs/heads/2_0_X b38d5de21 -> 35db8e299
[SYNCOPE-773] fix checkstyle violations
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/35db8e29
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/35db8e29
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/35db8e29
Branch: refs/heads/2_0_X
Commit: 35db8e299c9dccd92783673b6a53c9f42a717cf2
Parents: b38d5de
Author: Matteo Di Carlo
Authored: Fri Dec 30 14:18:58 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Dec 30 14:18:58 2016 +0100
--
.../java/org/apache/syncope/client/console/widgets/JobWidget.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/35db8e29/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
index d70c449..e02f729 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
@@ -404,7 +404,7 @@ public class JobWidget extends BaseWidget {
final ActionLinksPanel.Builder panel =
ActionLinksPanel.builder().
add(new ActionLink() {
-private static final long serialVersionUID=
-3722207913631435501L;
+private static final long serialVersionUID =
-3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget
target, final ExecTO ignore) {
syncope git commit: [SYNCOPE-773] fix checkstyle violations
Repository: syncope
Updated Branches:
refs/heads/master 8d53c44d0 -> 31fe2a603
[SYNCOPE-773] fix checkstyle violations
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/31fe2a60
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/31fe2a60
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/31fe2a60
Branch: refs/heads/master
Commit: 31fe2a6033456b6d63a1773c5002daf14888b895
Parents: 8d53c44
Author: Matteo Di Carlo
Authored: Fri Dec 30 14:18:58 2016 +0100
Committer: Matteo Di Carlo
Committed: Fri Dec 30 14:20:18 2016 +0100
--
.../java/org/apache/syncope/client/console/widgets/JobWidget.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/31fe2a60/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
index d70c449..e02f729 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobWidget.java
@@ -404,7 +404,7 @@ public class JobWidget extends BaseWidget {
final ActionLinksPanel.Builder panel =
ActionLinksPanel.builder().
add(new ActionLink() {
-private static final long serialVersionUID=
-3722207913631435501L;
+private static final long serialVersionUID =
-3722207913631435501L;
@Override
public void onClick(final AjaxRequestTarget
target, final ExecTO ignore) {
syncope git commit: [SYNCOPE-773] resize job modals and add compose modal for reports
Repository: syncope
Updated Branches:
refs/heads/2_0_X 5c92a9da5 -> f387fbb05
[SYNCOPE-773] resize job modals and add compose modal for reports
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f387fbb0
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f387fbb0
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f387fbb0
Branch: refs/heads/2_0_X
Commit: f387fbb057415c0b59ab4b026f3c808c4abaeac3
Parents: 5c92a9d
Author: Matteo Di Carlo
Authored: Tue Jan 10 10:10:58 2017 +0100
Committer: Matteo Di Carlo
Committed: Thu Jan 12 12:06:57 2017 +0100
--
.../reports/ReportletDirectoryPanel.java| 2 +-
.../client/console/widgets/JobActionPanel.java | 62 +++-
.../client/console/widgets/JobWidget.java | 28 -
.../client/console/widgets/JobActionPanel.html | 1 +
.../client/console/widgets/JobWidget.html | 1 +
.../client/console/widgets/JobWidget.properties | 2 +
.../console/widgets/JobWidget_it.properties | 1 +
.../console/widgets/JobWidget_pt_BR.properties | 1 +
.../console/widgets/JobWidget_ru.properties | 1 +
9 files changed, 95 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/f387fbb0/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
index b9ef700..7968fe5 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
@@ -84,7 +84,7 @@ public class ReportletDirectoryPanel extends DirectoryPanel<
private final String report;
-protected ReportletDirectoryPanel(
+public ReportletDirectoryPanel(
final BaseModal baseModal, final String report, final
PageReference pageRef) {
super(BaseModal.CONTENT_ID, pageRef, false);
http://git-wip-us.apache.org/repos/asf/syncope/blob/f387fbb0/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
index 30797ae..400e0c7 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
@@ -18,12 +18,14 @@
*/
package org.apache.syncope.client.console.widgets;
+import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.reports.ReportWizardBuilder;
+import org.apache.syncope.client.console.reports.ReportletDirectoryPanel;
import org.apache.syncope.client.console.rest.ReportRestClient;
import org.apache.syncope.client.console.rest.TaskRestClient;
import org.apache.syncope.client.console.tasks.SchedTaskWizardBuilder;
@@ -36,11 +38,13 @@ import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.syncope.common.lib.to.SchedTaskTO;
import org.apache.syncope.common.lib.types.JobAction;
import org.apache.syncope.common.lib.types.JobType;
+import org.apache.syncope.common.lib.types.StandardEntitlement;
import org.apache.syncope.common.rest.api.service.NotificationService;
import org.apache.syncope.common.rest.api.service.ReportService;
import org.apache.syncope.common.rest.api.service.TaskService;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -57,17 +61,23 @@ public class JobActionPanel extends
WizardMgtPanel {
private final BaseModal jobModal;
+private final BaseModal reportModal;
+
public JobActionPanel(
final String id,
final JobTO jobTO,
final JobWidget widget,
final BaseModal jobModal,
+final
syncope git commit: [SYNCOPE-773] resize job modals and add compose modal for reports
Repository: syncope
Updated Branches:
refs/heads/master 3117b89d7 -> 022d2c5f7
[SYNCOPE-773] resize job modals and add compose modal for reports
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/022d2c5f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/022d2c5f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/022d2c5f
Branch: refs/heads/master
Commit: 022d2c5f7470c757efbe8fbb4b875f3edcbc953c
Parents: 3117b89
Author: Matteo Di Carlo
Authored: Tue Jan 10 10:10:58 2017 +0100
Committer: Matteo Di Carlo
Committed: Thu Jan 12 12:08:57 2017 +0100
--
.../reports/ReportletDirectoryPanel.java| 2 +-
.../client/console/widgets/JobActionPanel.java | 62 +++-
.../client/console/widgets/JobWidget.java | 28 -
.../client/console/widgets/JobActionPanel.html | 1 +
.../client/console/widgets/JobWidget.html | 1 +
.../client/console/widgets/JobWidget.properties | 2 +
.../console/widgets/JobWidget_it.properties | 1 +
.../console/widgets/JobWidget_pt_BR.properties | 1 +
.../console/widgets/JobWidget_ru.properties | 1 +
9 files changed, 95 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/022d2c5f/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
index b9ef700..7968fe5 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/reports/ReportletDirectoryPanel.java
@@ -84,7 +84,7 @@ public class ReportletDirectoryPanel extends DirectoryPanel<
private final String report;
-protected ReportletDirectoryPanel(
+public ReportletDirectoryPanel(
final BaseModal baseModal, final String report, final
PageReference pageRef) {
super(BaseModal.CONTENT_ID, pageRef, false);
http://git-wip-us.apache.org/repos/asf/syncope/blob/022d2c5f/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
index 30797ae..400e0c7 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/widgets/JobActionPanel.java
@@ -18,12 +18,14 @@
*/
package org.apache.syncope.client.console.widgets;
+import de.agilecoders.wicket.core.markup.html.bootstrap.dialog.Modal;
import java.io.Serializable;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.SyncopeConsoleSession;
import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.reports.ReportWizardBuilder;
+import org.apache.syncope.client.console.reports.ReportletDirectoryPanel;
import org.apache.syncope.client.console.rest.ReportRestClient;
import org.apache.syncope.client.console.rest.TaskRestClient;
import org.apache.syncope.client.console.tasks.SchedTaskWizardBuilder;
@@ -36,11 +38,13 @@ import org.apache.syncope.common.lib.to.ReportTO;
import org.apache.syncope.common.lib.to.SchedTaskTO;
import org.apache.syncope.common.lib.types.JobAction;
import org.apache.syncope.common.lib.types.JobType;
+import org.apache.syncope.common.lib.types.StandardEntitlement;
import org.apache.syncope.common.rest.api.service.NotificationService;
import org.apache.syncope.common.rest.api.service.ReportService;
import org.apache.syncope.common.rest.api.service.TaskService;
import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.event.Broadcast;
import org.apache.wicket.event.IEvent;
import org.apache.wicket.markup.html.panel.Fragment;
@@ -57,17 +61,23 @@ public class JobActionPanel extends
WizardMgtPanel {
private final BaseModal jobModal;
+private final BaseModal reportModal;
+
public JobActionPanel(
final String id,
final JobTO jobTO,
final JobWidget widget,
final BaseModal jobModal,
+fina
syncope git commit: [SYNCOPE-997] hide ui-router error messages
Repository: syncope
Updated Branches:
refs/heads/2_0_X eded0eb3a -> 44a858dc9
[SYNCOPE-997] hide ui-router error messages
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/44a858dc
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/44a858dc
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/44a858dc
Branch: refs/heads/2_0_X
Commit: 44a858dc9bd9d32c07ca19217117babefdc7b4df
Parents: eded0eb
Author: Matteo Di Carlo
Authored: Fri Jan 13 17:02:15 2017 +0100
Committer: Matteo Di Carlo
Committed: Fri Jan 13 17:02:15 2017 +0100
--
.../src/main/resources/META-INF/resources/app/js/app.js | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/44a858dc/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 efdf8ed..37bcafd 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
@@ -45,8 +45,11 @@ var app = angular.module('SyncopeEnduserApp', [
'pascalprecht.translate'
]);
-app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider', '$translatePartialLoaderProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
+app.config(['$qProvider', '$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translateProvider', '$translatePartialLoaderProvider',
+ function ($qProvider, $stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
+
+//workaround for angular-ui-router issue: [SYNCOPE-997]
+$qProvider.errorOnUnhandledRejections(false);
$translatePartialLoaderProvider.addPart('static');
$translatePartialLoaderProvider.addPart('dynamic');
syncope git commit: [SYNCOPE-997] hide ui-router error messages
Repository: syncope
Updated Branches:
refs/heads/master b30099b68 -> 9f7e0ac15
[SYNCOPE-997] hide ui-router error messages
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9f7e0ac1
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9f7e0ac1
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9f7e0ac1
Branch: refs/heads/master
Commit: 9f7e0ac15813fb50f34992bc413729c8943cd6e5
Parents: b30099b
Author: Matteo Di Carlo
Authored: Fri Jan 13 17:02:15 2017 +0100
Committer: Matteo Di Carlo
Committed: Fri Jan 13 17:03:30 2017 +0100
--
.../src/main/resources/META-INF/resources/app/js/app.js | 7 +--
1 file changed, 5 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/9f7e0ac1/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 efdf8ed..37bcafd 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
@@ -45,8 +45,11 @@ var app = angular.module('SyncopeEnduserApp', [
'pascalprecht.translate'
]);
-app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider', '$translatePartialLoaderProvider',
- function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
+app.config(['$qProvider', '$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translateProvider', '$translatePartialLoaderProvider',
+ function ($qProvider, $stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
+
+//workaround for angular-ui-router issue: [SYNCOPE-997]
+$qProvider.errorOnUnhandledRejections(false);
$translatePartialLoaderProvider.addPart('static');
$translatePartialLoaderProvider.addPart('dynamic');
syncope git commit: [SYNCOPE-997] update angular-ui-router
Repository: syncope
Updated Branches:
refs/heads/2_0_X 44a858dc9 -> 5e6242bb5
[SYNCOPE-997] update angular-ui-router
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/5e6242bb
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/5e6242bb
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/5e6242bb
Branch: refs/heads/2_0_X
Commit: 5e6242bb55f6bd725dc16a8a670ecb01f8b96d53
Parents: 44a858d
Author: Matteo Di Carlo
Authored: Fri Jan 13 17:30:20 2017 +0100
Committer: Matteo Di Carlo
Committed: Fri Jan 13 17:30:20 2017 +0100
--
client/enduser/pom.xml| 2 +-
.../src/main/resources/META-INF/resources/app/index.html | 2 +-
.../src/main/resources/META-INF/resources/app/js/app.js | 7 ++-
pom.xml | 4 ++--
4 files changed, 6 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/5e6242bb/client/enduser/pom.xml
--
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index 900521b..7cbe58b 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -70,7 +70,7 @@ under the License.
angular-resource
- org.webjars
+ org.webjars.bower
angular-ui-router
http://git-wip-us.apache.org/repos/asf/syncope/blob/5e6242bb/client/enduser/src/main/resources/META-INF/resources/app/index.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 22152fc..ef58553 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -63,7 +63,7 @@ under the License.
-
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/5e6242bb/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 37bcafd..5d062cb 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
@@ -45,12 +45,9 @@ var app = angular.module('SyncopeEnduserApp', [
'pascalprecht.translate'
]);
-app.config(['$qProvider', '$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translateProvider', '$translatePartialLoaderProvider',
- function ($qProvider, $stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
+app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider', '$translatePartialLoaderProvider',
+ function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
-//workaround for angular-ui-router issue: [SYNCOPE-997]
-$qProvider.errorOnUnhandledRejections(false);
-
$translatePartialLoaderProvider.addPart('static');
$translatePartialLoaderProvider.addPart('dynamic');
$translateProvider.useLoader('$translatePartialLoader', {
http://git-wip-us.apache.org/repos/asf/syncope/blob/5e6242bb/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 1c4e98a..a0823ec 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,7 +426,7 @@ under the License.
7.0.1
1.6.1
-0.2.18
+0.3.2
1.3.3
0.19.6
1.1.0
@@ -1184,7 +1184,7 @@ under the License.
${angular.version}
-org.webjars
+org.webjars.bower
angular-ui-router
${angular-ui-router.version}
syncope git commit: [SYNCOPE-997] update angular-ui-router
Repository: syncope
Updated Branches:
refs/heads/master 9f7e0ac15 -> 9c15f643a
[SYNCOPE-997] update angular-ui-router
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9c15f643
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9c15f643
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9c15f643
Branch: refs/heads/master
Commit: 9c15f643a4f38cd86b6a4852896721d9d72ed824
Parents: 9f7e0ac
Author: Matteo Di Carlo
Authored: Fri Jan 13 17:30:20 2017 +0100
Committer: Matteo Di Carlo
Committed: Fri Jan 13 17:31:19 2017 +0100
--
client/enduser/pom.xml| 2 +-
.../src/main/resources/META-INF/resources/app/index.html | 2 +-
.../src/main/resources/META-INF/resources/app/js/app.js | 7 ++-
pom.xml | 4 ++--
4 files changed, 6 insertions(+), 9 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/9c15f643/client/enduser/pom.xml
--
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index 0a461f5..db4e3ab 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -70,7 +70,7 @@ under the License.
angular-resource
- org.webjars
+ org.webjars.bower
angular-ui-router
http://git-wip-us.apache.org/repos/asf/syncope/blob/9c15f643/client/enduser/src/main/resources/META-INF/resources/app/index.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 22152fc..ef58553 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -63,7 +63,7 @@ under the License.
-
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/9c15f643/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 37bcafd..5d062cb 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
@@ -45,12 +45,9 @@ var app = angular.module('SyncopeEnduserApp', [
'pascalprecht.translate'
]);
-app.config(['$qProvider', '$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translateProvider', '$translatePartialLoaderProvider',
- function ($qProvider, $stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
+app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider', '$translatePartialLoaderProvider',
+ function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
-//workaround for angular-ui-router issue: [SYNCOPE-997]
-$qProvider.errorOnUnhandledRejections(false);
-
$translatePartialLoaderProvider.addPart('static');
$translatePartialLoaderProvider.addPart('dynamic');
$translateProvider.useLoader('$translatePartialLoader', {
http://git-wip-us.apache.org/repos/asf/syncope/blob/9c15f643/pom.xml
--
diff --git a/pom.xml b/pom.xml
index 953b132..3a8ca5f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -426,7 +426,7 @@ under the License.
7.0.1
1.6.1
-0.2.18
+0.3.2
1.3.3
0.19.6
1.1.0
@@ -1179,7 +1179,7 @@ under the License.
${angular.version}
-org.webjars
+org.webjars.bower
angular-ui-router
${angular-ui-router.version}
syncope git commit: [SYNCOPE-993] fix enduser buttons style
Repository: syncope
Updated Branches:
refs/heads/2_0_X 578601dd2 -> 13d7ad2fb
[SYNCOPE-993] fix enduser buttons style
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/13d7ad2f
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/13d7ad2f
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/13d7ad2f
Branch: refs/heads/2_0_X
Commit: 13d7ad2fb9144c8dbd49ca89cfd88a4e13b0c4d1
Parents: 578601d
Author: Matteo Di Carlo
Authored: Mon Jan 16 16:38:32 2017 +0100
Committer: Matteo Di Carlo
Committed: Mon Jan 16 16:38:32 2017 +0100
--
.../META-INF/resources/app/css/editUser.css | 115 ++-
.../resources/app/views/user-credentials.html | 15 ++-
.../app/views/user-derived-schemas.html | 20 ++--
.../resources/app/views/user-form-finish.html | 15 ++-
.../resources/app/views/user-groups.html| 16 ++-
.../resources/app/views/user-plain-schemas.html | 16 ++-
.../resources/app/views/user-resources.html | 14 ++-
.../app/views/user-virtual-schemas.html | 18 +--
8 files changed, 156 insertions(+), 73 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/13d7ad2f/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index bb4a6c6..d88cebf 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -101,10 +101,10 @@ under the License.
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+*/
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+*/
- float: right;
+ display: inline-block;
color: black;
- width: 80px;
- padding-left: 4px;
+ padding-left: 8px;
+ padding-right: 8px;
margin-left: 5px;
}
@@ -118,10 +118,12 @@ under the License.
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+ */
+ display: inline-block;
margin-left: 5px;
+ padding-left: 8px;
+ padding-right: 8px;
float: right;
color: black;
- width: 78px;
}
#next:hover {
@@ -135,10 +137,11 @@ under the License.
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+ */
color: black;
+ display: inline-block;
+ padding-left: 8px;
+ padding-right: 8px;
margin-left: 5px;
- /*margin-right: 5px;*/
- width: 70px;
- float: right;
+ margin-right: 5px;
}
#save:hover {
@@ -151,11 +154,13 @@ under the License.
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+*/
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+*/
+ display: inline-block;
+ margin-left:5px;
+ padding-left: 8px;
+ padding-right: 8px;
color: black;
margin-left: 5px;
- /*margin-right: 5px;*/
- width: 78px;
- float:right;
+ margin-right: 5px;
}
#finish:hover {
@@ -164,10 +169,8 @@ under the License.
#cancel {
margin-top: 0%;
- width: 70px;
}
-
.container-fluid {
padding-right: 15px;
padding-left: 15px;
@@ -317,7 +320,6 @@ under the License.
padding: 1px 0px 0px 0px;
}
-
.panel-body {
padding: 0px;
}
@@ -340,19 +342,30 @@ under the License.
padding: 0px 0px 1px 0px
}
- /*.container-fluid {
- padding-right: 15px;
- padding-left: 31px;
- margin-right: auto;
- margin-left: auto;
- width: 100%;
-}
-
-#captchaButtons {
- width: 20%;
- margin-left: 100px;
- padding-bottom: 5px;
-}*/
+ #finish{
+padding-left: 2px;
+padding-right: 2px;
+margin-left:-27px;
+margin-top: 2px;
+ }
+ #next{
+padding-left: 2px;
+padding-right: 2px;
+margin-left: 1px;
+ }
+ #previous{
+padding-left: 2px;
+padding-right: 2px;
+margin-left:-126px;
+ }
+ #save{
+margin-top: 4px;
+padding-left: 2px;
+padding-right: 2px;
+margin-top:-31px;
+margin-left: -42px;
+margin-right: 15px;
+ }
}
@@ -404,10 +417,29 @@ under the License.
.btn-breadcrumb .btn:last-child {
padding:6px 18px 6px 24px;
}
- /*
-#refresh{
- margin-top:1px;
-
syncope git commit: [SYNCOPE-993] fix enduser buttons style
Repository: syncope
Updated Branches:
refs/heads/master 4bc487028 -> c12a54600
[SYNCOPE-993] fix enduser buttons style
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c12a5460
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c12a5460
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c12a5460
Branch: refs/heads/master
Commit: c12a546007c48616a304c110fbd25d9ff0527118
Parents: 4bc4870
Author: Matteo Di Carlo
Authored: Mon Jan 16 16:38:32 2017 +0100
Committer: Matteo Di Carlo
Committed: Mon Jan 16 16:39:51 2017 +0100
--
.../META-INF/resources/app/css/editUser.css | 115 ++-
.../resources/app/views/user-credentials.html | 15 ++-
.../app/views/user-derived-schemas.html | 20 ++--
.../resources/app/views/user-form-finish.html | 15 ++-
.../resources/app/views/user-groups.html| 16 ++-
.../resources/app/views/user-plain-schemas.html | 16 ++-
.../resources/app/views/user-resources.html | 14 ++-
.../app/views/user-virtual-schemas.html | 18 +--
8 files changed, 156 insertions(+), 73 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/c12a5460/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index bb4a6c6..d88cebf 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -101,10 +101,10 @@ under the License.
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+*/
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+*/
- float: right;
+ display: inline-block;
color: black;
- width: 80px;
- padding-left: 4px;
+ padding-left: 8px;
+ padding-right: 8px;
margin-left: 5px;
}
@@ -118,10 +118,12 @@ under the License.
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+ */
+ display: inline-block;
margin-left: 5px;
+ padding-left: 8px;
+ padding-right: 8px;
float: right;
color: black;
- width: 78px;
}
#next:hover {
@@ -135,10 +137,11 @@ under the License.
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+ */
color: black;
+ display: inline-block;
+ padding-left: 8px;
+ padding-right: 8px;
margin-left: 5px;
- /*margin-right: 5px;*/
- width: 70px;
- float: right;
+ margin-right: 5px;
}
#save:hover {
@@ -151,11 +154,13 @@ under the License.
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+*/
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+*/
+ display: inline-block;
+ margin-left:5px;
+ padding-left: 8px;
+ padding-right: 8px;
color: black;
margin-left: 5px;
- /*margin-right: 5px;*/
- width: 78px;
- float:right;
+ margin-right: 5px;
}
#finish:hover {
@@ -164,10 +169,8 @@ under the License.
#cancel {
margin-top: 0%;
- width: 70px;
}
-
.container-fluid {
padding-right: 15px;
padding-left: 15px;
@@ -317,7 +320,6 @@ under the License.
padding: 1px 0px 0px 0px;
}
-
.panel-body {
padding: 0px;
}
@@ -340,19 +342,30 @@ under the License.
padding: 0px 0px 1px 0px
}
- /*.container-fluid {
- padding-right: 15px;
- padding-left: 31px;
- margin-right: auto;
- margin-left: auto;
- width: 100%;
-}
-
-#captchaButtons {
- width: 20%;
- margin-left: 100px;
- padding-bottom: 5px;
-}*/
+ #finish{
+padding-left: 2px;
+padding-right: 2px;
+margin-left:-27px;
+margin-top: 2px;
+ }
+ #next{
+padding-left: 2px;
+padding-right: 2px;
+margin-left: 1px;
+ }
+ #previous{
+padding-left: 2px;
+padding-right: 2px;
+margin-left:-126px;
+ }
+ #save{
+margin-top: 4px;
+padding-left: 2px;
+padding-right: 2px;
+margin-top:-31px;
+margin-left: -42px;
+margin-right: 15px;
+ }
}
@@ -404,10 +417,29 @@ under the License.
.btn-breadcrumb .btn:last-child {
padding:6px 18px 6px 24px;
}
- /*
-#refresh{
- margin-top:1px;
-
syncope git commit: [SYNCOPE-994] add encoding and content of wicket resources responses
Repository: syncope
Updated Branches:
refs/heads/2_0_X d1eb8dcf4 -> 314f8364b
[SYNCOPE-994] add encoding and content of wicket resources responses
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/314f8364
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/314f8364
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/314f8364
Branch: refs/heads/2_0_X
Commit: 314f8364be9972a11e51d18c6efdcdf4b9091dc1
Parents: d1eb8dc
Author: Matteo Di Carlo
Authored: Fri Jan 20 12:21:09 2017 +0100
Committer: Matteo Di Carlo
Committed: Fri Jan 20 12:21:09 2017 +0100
--
.../console/resources/FilesystemResource.java | 2 ++
.../console/resources/WorkflowDefGETResource.java | 3 ++-
.../enduser/resources/AnyTypeClassResource.java| 2 ++
.../client/enduser/resources/AnyTypeResource.java | 3 +++
.../resources/ExternalResourceResource.java| 2 ++
.../client/enduser/resources/GroupResource.java| 2 +-
.../client/enduser/resources/InfoResource.java | 3 +++
.../client/enduser/resources/LoginResource.java| 3 ++-
.../client/enduser/resources/RealmResource.java| 3 +++
.../client/enduser/resources/SchemaResource.java | 3 +++
.../resources/SecurityQuestionResource.java| 5 -
.../enduser/resources/UserSelfChangePassword.java | 3 +++
.../resources/UserSelfConfirmPasswordReset.java| 2 ++
.../enduser/resources/UserSelfCreateResource.java | 15 +--
.../enduser/resources/UserSelfPasswordReset.java | 3 +++
.../enduser/resources/UserSelfReadResource.java| 5 +
.../enduser/resources/UserSelfUpdateResource.java | 17 ++---
17 files changed, 59 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/314f8364/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
b/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
index e976b16..4259ff7 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.resources;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.util.io.IOUtils;
import org.slf4j.Logger;
@@ -55,6 +56,7 @@ public class FilesystemResource extends AbstractResource {
replace('/', File.separatorChar);
LOG.debug("Request for {}", subPath);
+response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING);
response.setWriteCallback(new WriteCallback() {
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/314f8364/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
index 91e2548..24a5d15 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.resources;
import java.io.IOException;
import javax.ws.rs.core.MediaType;
import org.apache.syncope.client.console.rest.WorkflowRestClient;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.util.io.IOUtils;
@@ -38,7 +39,7 @@ public class WorkflowDefGETResource extends AbstractResource {
ResourceResponse response = new ResourceResponse();
response.disableCaching();
response.setContentType(MediaType.APPLICATION_JSON);
-
+response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING);
response.setWriteCallback(new WriteCallback() {
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/314f8364/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/AnyTypeClassResource.java
--
diff --git
a/client/enduser/src
syncope git commit: [SYNCOPE-994] add encoding and content of wicket resources responses
Repository: syncope
Updated Branches:
refs/heads/master 7525dc125 -> f11b63cf9
[SYNCOPE-994] add encoding and content of wicket resources responses
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f11b63cf
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f11b63cf
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f11b63cf
Branch: refs/heads/master
Commit: f11b63cf9498d6259c7d8f58d54389cf2fa18edc
Parents: 7525dc1
Author: Matteo Di Carlo
Authored: Fri Jan 20 12:21:09 2017 +0100
Committer: Matteo Di Carlo
Committed: Fri Jan 20 12:22:04 2017 +0100
--
.../console/resources/FilesystemResource.java | 2 ++
.../console/resources/WorkflowDefGETResource.java | 3 ++-
.../enduser/resources/AnyTypeClassResource.java| 2 ++
.../client/enduser/resources/AnyTypeResource.java | 3 +++
.../resources/ExternalResourceResource.java| 2 ++
.../client/enduser/resources/GroupResource.java| 2 +-
.../client/enduser/resources/InfoResource.java | 3 +++
.../client/enduser/resources/LoginResource.java| 3 ++-
.../client/enduser/resources/RealmResource.java| 3 +++
.../client/enduser/resources/SchemaResource.java | 3 +++
.../resources/SecurityQuestionResource.java| 5 -
.../enduser/resources/UserSelfChangePassword.java | 3 +++
.../resources/UserSelfConfirmPasswordReset.java| 2 ++
.../enduser/resources/UserSelfCreateResource.java | 15 +--
.../enduser/resources/UserSelfPasswordReset.java | 3 +++
.../enduser/resources/UserSelfReadResource.java| 5 +
.../enduser/resources/UserSelfUpdateResource.java | 17 ++---
17 files changed, 59 insertions(+), 17 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/f11b63cf/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
b/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
index e976b16..4259ff7 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/resources/FilesystemResource.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.resources;
import java.io.File;
import java.io.FileInputStream;
import java.io.IOException;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.util.io.IOUtils;
import org.slf4j.Logger;
@@ -55,6 +56,7 @@ public class FilesystemResource extends AbstractResource {
replace('/', File.separatorChar);
LOG.debug("Request for {}", subPath);
+response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING);
response.setWriteCallback(new WriteCallback() {
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/f11b63cf/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
--
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
index 91e2548..24a5d15 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/resources/WorkflowDefGETResource.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.resources;
import java.io.IOException;
import javax.ws.rs.core.MediaType;
import org.apache.syncope.client.console.rest.WorkflowRestClient;
+import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.wicket.request.resource.AbstractResource;
import org.apache.wicket.util.io.IOUtils;
@@ -38,7 +39,7 @@ public class WorkflowDefGETResource extends AbstractResource {
ResourceResponse response = new ResourceResponse();
response.disableCaching();
response.setContentType(MediaType.APPLICATION_JSON);
-
+response.setTextEncoding(SyncopeConstants.DEFAULT_ENCODING);
response.setWriteCallback(new WriteCallback() {
@Override
http://git-wip-us.apache.org/repos/asf/syncope/blob/f11b63cf/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/AnyTypeClassResource.java
--
diff --git
a/client/enduser/s
syncope git commit: [SYNCOPE-994] clean unused imports
Repository: syncope Updated Branches: refs/heads/2_0_X 314f8364b -> 1d91d1d00 [SYNCOPE-994] clean unused imports Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/1d91d1d0 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/1d91d1d0 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/1d91d1d0 Branch: refs/heads/2_0_X Commit: 1d91d1d0023c1a6c4ec3971e9a8f3f5c5e76f31e Parents: 314f836 Author: Matteo Di Carlo Authored: Fri Jan 20 12:37:29 2017 +0100 Committer: Matteo Di Carlo Committed: Fri Jan 20 12:37:29 2017 +0100 -- .../org/apache/syncope/client/enduser/resources/InfoResource.java | 1 - .../syncope/client/enduser/resources/UserSelfPasswordReset.java | 1 - 2 files changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/1d91d1d0/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java index 4a21ed8..1af9593 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java @@ -19,7 +19,6 @@ package org.apache.syncope.client.enduser.resources; import java.io.IOException; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.enduser.SyncopeEnduserConstants; http://git-wip-us.apache.org/repos/asf/syncope/blob/1d91d1d0/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java index 31c1fc8..8b36c69 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java @@ -21,7 +21,6 @@ package org.apache.syncope.client.enduser.resources; import java.io.IOException; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.syncope.client.enduser.SyncopeEnduserConstants; import org.apache.syncope.client.enduser.SyncopeEnduserSession;
syncope git commit: [SYNCOPE-994] clean unused imports
Repository: syncope Updated Branches: refs/heads/master f11b63cf9 -> ef65d83cf [SYNCOPE-994] clean unused imports Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ef65d83c Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ef65d83c Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ef65d83c Branch: refs/heads/master Commit: ef65d83cf867044f0b859e8691728cefcd3f651f Parents: f11b63c Author: Matteo Di Carlo Authored: Fri Jan 20 12:37:29 2017 +0100 Committer: Matteo Di Carlo Committed: Fri Jan 20 12:38:06 2017 +0100 -- .../org/apache/syncope/client/enduser/resources/InfoResource.java | 1 - .../syncope/client/enduser/resources/UserSelfPasswordReset.java | 1 - 2 files changed, 2 deletions(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/ef65d83c/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java index 4a21ed8..1af9593 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/InfoResource.java @@ -19,7 +19,6 @@ package org.apache.syncope.client.enduser.resources; import java.io.IOException; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.commons.lang3.StringUtils; import org.apache.syncope.client.enduser.SyncopeEnduserConstants; http://git-wip-us.apache.org/repos/asf/syncope/blob/ef65d83c/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java -- diff --git a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java index 31c1fc8..8b36c69 100644 --- a/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java +++ b/client/enduser/src/main/java/org/apache/syncope/client/enduser/resources/UserSelfPasswordReset.java @@ -21,7 +21,6 @@ package org.apache.syncope.client.enduser.resources; import java.io.IOException; import java.util.Map; import javax.servlet.http.HttpServletRequest; -import javax.ws.rs.core.MediaType; import javax.ws.rs.core.Response; import org.apache.syncope.client.enduser.SyncopeEnduserConstants; import org.apache.syncope.client.enduser.SyncopeEnduserSession;
syncope git commit: [SYNCOPE-996] add kendo date time picker
Repository: syncope
Updated Branches:
refs/heads/2_0_X bc310b1a3 -> 828227cfd
[SYNCOPE-996] add kendo date time picker
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/828227cf
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/828227cf
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/828227cf
Branch: refs/heads/2_0_X
Commit: 828227cfdc4fdfc9608d5a8f60e4d93d73afdeac
Parents: bc310b1
Author: Matteo Di Carlo
Authored: Mon Jan 23 12:30:47 2017 +0100
Committer: Matteo Di Carlo
Committed: Tue Jan 24 15:44:15 2017 +0100
--
.../META-INF/resources/app/css/editUser.css | 25 +++--
.../resources/META-INF/resources/app/index.html | 3 +
.../resources/META-INF/resources/app/js/app.js | 13 ++-
.../app/js/controllers/UserController.js| 13 +--
.../app/js/directives/dynamicPlainAttribute.js | 110 +++
.../app/views/dynamicPlainAttribute.html| 30 ++---
.../src/test/resources/tests/edit.js| 2 -
.../workingwithapachesyncope/customization.adoc | 37 +--
8 files changed, 84 insertions(+), 149 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/828227cf/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index d88cebf..ec5baca 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -17,8 +17,6 @@ specific language governing permissions and limitations
under the License.
*/
-/*default stile*/
-
* {
box-sizing: border-box;
}
@@ -209,12 +207,8 @@ under the License.
margin-top: 10px;
}
-#datetime{
- line-height: 34px;
- float: left;
- margin-top:-30px;
- padding: 0 3px 0px 0px;
- display: -webkit-inline-box;
+span.k-datetimepicker{
+ width: 170%;
}
#date{
@@ -332,6 +326,7 @@ under the License.
margin-top: -65px;
}
+
.btn-group{
position: relative;
display: inline-flex;
@@ -366,6 +361,11 @@ under the License.
margin-left: -42px;
margin-right: 15px;
}
+
+ span.k-datetimepicker {
+width: 141%;
+margin-top: -50px;
+}
}
@@ -440,6 +440,10 @@ under the License.
margin-left: -21px;
margin-top: 4px;
}
+
+span.k-datetimepicker{
+width: 160%;
+ }
}
@@ -569,6 +573,11 @@ under the License.
margin-top: -65px;
}
+ span.k-datetimepicker{
+width: 171%;
+margin-top: 50%;
+ }
+
.multivalue button{
width: 40px;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/828227cf/client/enduser/src/main/resources/META-INF/resources/app/index.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index ef58553..3c98e23 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -73,6 +73,9 @@ under the License.
+
+
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/828227cf/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 5d062cb..c74b6e8 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
@@ -47,16 +47,14 @@ var app = angular.module('SyncopeEnduserApp', [
app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider', '$translatePartialLoaderProvider',
function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
-
+
$translatePartialLoaderProvider.addPart('static');
$translatePartialLoaderProvider.addPart('dynamic');
$translateProvider.useLoader('$translatePartialLoader', {
urlTemplate: 'languages/{lang}/{part}.json'
})
.preferredLanguage('en');
-//.useCookieStorage();
-// route configuration
$stateProvider
.state('home', {
url: '/',
@@ -263,6 +261,15 @@ app.run(['$rootScope', '$location', '$state',
'AuthService',
//If the route change failed due to authentication error, redirect them out
$rootScope.endReached
syncope git commit: [SYNCOPE-996] add kendo date time picker
Repository: syncope
Updated Branches:
refs/heads/master b709acfaf -> 00ac28317
[SYNCOPE-996] add kendo date time picker
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/00ac2831
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/00ac2831
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/00ac2831
Branch: refs/heads/master
Commit: 00ac28317ada7afdcad78a1635ce3d65cc6be387
Parents: b709acf
Author: Matteo Di Carlo
Authored: Mon Jan 23 12:30:47 2017 +0100
Committer: Matteo Di Carlo
Committed: Tue Jan 24 15:44:54 2017 +0100
--
.../META-INF/resources/app/css/editUser.css | 25 +++--
.../resources/META-INF/resources/app/index.html | 3 +
.../resources/META-INF/resources/app/js/app.js | 13 ++-
.../app/js/controllers/UserController.js| 13 +--
.../app/js/directives/dynamicPlainAttribute.js | 110 +++
.../app/views/dynamicPlainAttribute.html| 30 ++---
.../src/test/resources/tests/edit.js| 2 -
.../workingwithapachesyncope/customization.adoc | 37 +--
8 files changed, 84 insertions(+), 149 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/00ac2831/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index d88cebf..ec5baca 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -17,8 +17,6 @@ specific language governing permissions and limitations
under the License.
*/
-/*default stile*/
-
* {
box-sizing: border-box;
}
@@ -209,12 +207,8 @@ under the License.
margin-top: 10px;
}
-#datetime{
- line-height: 34px;
- float: left;
- margin-top:-30px;
- padding: 0 3px 0px 0px;
- display: -webkit-inline-box;
+span.k-datetimepicker{
+ width: 170%;
}
#date{
@@ -332,6 +326,7 @@ under the License.
margin-top: -65px;
}
+
.btn-group{
position: relative;
display: inline-flex;
@@ -366,6 +361,11 @@ under the License.
margin-left: -42px;
margin-right: 15px;
}
+
+ span.k-datetimepicker {
+width: 141%;
+margin-top: -50px;
+}
}
@@ -440,6 +440,10 @@ under the License.
margin-left: -21px;
margin-top: 4px;
}
+
+span.k-datetimepicker{
+width: 160%;
+ }
}
@@ -569,6 +573,11 @@ under the License.
margin-top: -65px;
}
+ span.k-datetimepicker{
+width: 171%;
+margin-top: 50%;
+ }
+
.multivalue button{
width: 40px;
}
http://git-wip-us.apache.org/repos/asf/syncope/blob/00ac2831/client/enduser/src/main/resources/META-INF/resources/app/index.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index ef58553..3c98e23 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -73,6 +73,9 @@ under the License.
+
+
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/00ac2831/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 5d062cb..c74b6e8 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
@@ -47,16 +47,14 @@ var app = angular.module('SyncopeEnduserApp', [
app.config(['$stateProvider', '$urlRouterProvider', '$httpProvider',
'$translateProvider', '$translatePartialLoaderProvider',
function ($stateProvider, $urlRouterProvider, $httpProvider,
$translateProvider, $translatePartialLoaderProvider) {
-
+
$translatePartialLoaderProvider.addPart('static');
$translatePartialLoaderProvider.addPart('dynamic');
$translateProvider.useLoader('$translatePartialLoader', {
urlTemplate: 'languages/{lang}/{part}.json'
})
.preferredLanguage('en');
-//.useCookieStorage();
-// route configuration
$stateProvider
.state('home', {
url: '/',
@@ -263,6 +261,15 @@ app.run(['$rootScope', '$location', '$state',
'AuthService',
//If the route change failed due to authentication error, redirect them out
$rootScope.endReache
syncope git commit: adds developer entry in pom.xml
Repository: syncope Updated Branches: refs/heads/master 5badf6504 -> c3d8b9984 adds developer entry in pom.xml Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c3d8b998 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c3d8b998 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c3d8b998 Branch: refs/heads/master Commit: c3d8b998429b76fbad6227593378d5689737af18 Parents: 5badf65 Author: Matteo Di Carlo Authored: Fri Jul 15 16:38:34 2016 +0200 Committer: Matteo Di Carlo Committed: Fri Jul 15 16:38:34 2016 +0200 -- pom.xml | 12 +++- 1 file changed, 11 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/c3d8b998/pom.xml -- diff --git a/pom.xml b/pom.xml index a46b2be..693341a 100644 --- a/pom.xml +++ b/pom.xml @@ -282,8 +282,18 @@ under the License. http://people.apache.org/~giacomolm/ giacom...@apache.org + + matteodc + Matteo Di Carlo + Tirasa + http://www.tirasa.net/ + +committer + + http://people.apache.org/~matteodc/ + matte...@apache.org + - Denis Signoretto
syncope git commit: SYNCOPE-872 shows type extensions on user form
Repository: syncope
Updated Branches:
refs/heads/master d0d69fea0 -> 343b3d400
SYNCOPE-872 shows type extensions on user form
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/343b3d40
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/343b3d40
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/343b3d40
Branch: refs/heads/master
Commit: 343b3d400fd2457e2458c52eacd03af17c51dbac
Parents: d0d69fe
Author: Matteo Di Carlo
Authored: Wed Aug 3 18:19:38 2016 +0200
Committer: Matteo Di Carlo
Committed: Wed Aug 3 18:19:38 2016 +0200
--
.../client/enduser/model/SchemaResponse.java| 28 +++
.../enduser/resources/SchemaResource.java | 78 +-
.../resources/UserSelfCreateResource.java | 84 +++-
.../enduser/resources/UserSelfReadResource.java | 20 +
.../resources/UserSelfUpdateResource.java | 84 +++-
.../app/js/controllers/UserController.js| 50 +---
.../js/directives/dynamicDerivedAttributes.js | 38 -
.../app/js/directives/dynamicPlainAttribute.js | 6 +-
.../app/js/directives/dynamicPlainAttributes.js | 72 +++--
.../js/directives/dynamicVirtualAttribute.js| 2 +-
.../js/directives/dynamicVirtualAttributes.js | 67 ++--
.../resources/app/js/directives/groups.js | 18 +++--
.../app/js/directives/validationMessage.js | 2 +-
.../resources/app/js/services/schemaService.js | 16 +++-
.../resources/app/languages/de/static.json | 4 +-
.../resources/app/languages/en/static.json | 4 +-
.../resources/app/languages/it/static.json | 3 +-
.../app/views/dynamicDerivedAttributes.html | 38 +++--
.../app/views/dynamicPlainAttributes.html | 50 +++-
.../app/views/dynamicVirtualAttributes.html | 45 +++
.../common/rest/api/service/GroupService.java | 15
.../apache/syncope/core/logic/GroupLogic.java | 13 +++
.../java/data/AnyObjectDataBinderImpl.java | 7 +-
.../java/data/UserDataBinderImpl.java | 7 +-
.../core/rest/cxf/service/GroupServiceImpl.java | 6 ++
25 files changed, 589 insertions(+), 168 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/343b3d40/client/enduser/src/main/java/org/apache/syncope/client/enduser/model/SchemaResponse.java
--
diff --git
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/model/SchemaResponse.java
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/model/SchemaResponse.java
index 912f287..38efba2 100644
---
a/client/enduser/src/main/java/org/apache/syncope/client/enduser/model/SchemaResponse.java
+++
b/client/enduser/src/main/java/org/apache/syncope/client/enduser/model/SchemaResponse.java
@@ -21,58 +21,56 @@ package org.apache.syncope.client.enduser.model;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import org.apache.syncope.common.lib.to.DerSchemaTO;
-import org.apache.syncope.common.lib.to.PlainSchemaTO;
-import org.apache.syncope.common.lib.to.VirSchemaTO;
+import org.apache.syncope.common.lib.to.AbstractSchemaTO;
public class SchemaResponse implements Serializable {
private static final long serialVersionUID = -8896862106241712829L;
-private List plainSchemas = new ArrayList<>();
+private List plainSchemas = new ArrayList<>();
-private List derSchemas = new ArrayList<>();
+private List derSchemas = new ArrayList<>();
-private List virSchemas = new ArrayList<>();
+private List virSchemas = new ArrayList<>();
public SchemaResponse() {
}
-public List getPlainSchemas() {
+public List getPlainSchemas() {
return plainSchemas;
}
-public void setPlainSchemas(final List plainSchemas) {
+public void setPlainSchemas(final List plainSchemas) {
this.plainSchemas = plainSchemas;
}
-public List getDerSchemas() {
+public List getDerSchemas() {
return derSchemas;
}
-public void setDerSchemas(final List derSchemas) {
+public void setDerSchemas(final List derSchemas) {
this.derSchemas = derSchemas;
}
-public List getVirSchemas() {
+public List getVirSchemas() {
return virSchemas;
}
-public void setVirSchemas(final List virSchemas) {
+public void setVirSchemas(final List virSchemas) {
this.virSchemas = virSchemas;
}
-public SchemaResponse plainSchemas(final List value) {
+public SchemaResponse plainSchemas(final List value) {
this.plainSchemas = value;
return this;
}
-public SchemaResponse derSchemas(final List value) {
+public SchemaResponse derSchemas(final Lis
syncope git commit: [SYNCOPE-872] shows type extensions in user form grouped in distinct accordions
Repository: syncope
Updated Branches:
refs/heads/master 0e3ad3cf6 -> 9cc78981f
[SYNCOPE-872] shows type extensions in user form grouped in distinct accordions
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9cc78981
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9cc78981
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9cc78981
Branch: refs/heads/master
Commit: 9cc78981f944546ee32e5968def5b0bb1e2f5241
Parents: 0e3ad3c
Author: Matteo Di Carlo
Authored: Fri Aug 5 14:06:28 2016 +0200
Committer: Matteo Di Carlo
Committed: Fri Aug 5 14:06:28 2016 +0200
--
.../app/js/controllers/UserController.js| 15 +++-
.../js/directives/dynamicDerivedAttributes.js | 21 +++--
.../app/js/directives/dynamicPlainAttributes.js | 90 ++--
.../js/directives/dynamicVirtualAttributes.js | 86 ++-
.../app/views/dynamicDerivedAttributes.html | 2 +-
.../app/views/dynamicPlainAttributes.html | 2 +-
6 files changed, 119 insertions(+), 97 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/9cc78981/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 f0e2ec5..4995e26 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
@@ -69,7 +69,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
schemaService = SchemaService.getUserSchemas(anyTypeClass);
}
schemaService.then(function (schemas) {
- if(group && ( schemas.plainSchemas.length > 0 ||
schemas.derSchemas.length > 0 || schemas.virSchemas.length > 0))
+ if (group && (schemas.plainSchemas.length > 0 ||
schemas.derSchemas.length > 0 || schemas.virSchemas.length > 0))
$scope.dynamicForm.groupSchemas.push(group);
//initializing user schemas values
initSchemaValues(schemas);
@@ -264,17 +264,26 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
};
var removeUserSchemas = function (anyTypeClass, group) {
+
+//removing plain groupSchemas
+for (var i = 0; i < $scope.dynamicForm.groupSchemas.length; i++) {
+ if ($scope.dynamicForm.groupSchemas[i] === group) {
+$scope.dynamicForm.groupSchemas.splice(i, 1);
+i--;
+ }
+}
+
//removing plain schemas
for (var i = 0; i < $scope.dynamicForm.plainSchemas.length; i++) {
- if ((anyTypeClass && $scope.dynamicForm.plainSchemas[i].anyTypeClass
== anyTypeClass)
+ if ((anyTypeClass && $scope.dynamicForm.plainSchemas[i].anyTypeClass
=== anyTypeClass)
|| (group &&
$scope.dynamicForm.plainSchemas[i].key.includes(group + '#'))) {
-
//cleaning both form and user model
delete
$scope.user.plainAttrs[$scope.dynamicForm.plainSchemas[i].key];
$scope.dynamicForm.plainSchemas.splice(i, 1);
i--;
}
}
+
//removing derived schemas
for (var i = 0; i < $scope.dynamicForm.derSchemas.length; i++) {
if ((anyTypeClass && $scope.dynamicForm.derSchemas[i].anyTypeClass
== anyTypeClass)
http://git-wip-us.apache.org/repos/asf/syncope/blob/9cc78981/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
index 7898767..79869b0 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/directives/dynamicDerivedAttributes.js
@@ -32,18 +32,23 @@ angular.module('self')
user: "="
},
controller: function ($scope) {
- $scope.getByGroup = function (schema) {
+
+ $scope.getByGroup = function (group) {
var currentDerivedSchemas = new Array();
for (var i = 0; i < $scope.dynamicForm.derSchemas.length; i++)
{
- if (schema == "own" &&
$scope.dynamicForm.derSchemas[i].key.indexOf('#') == -1) {
-
syncope git commit: [SYNCOPE-914] - The spinner is now always on top of every other element
Repository: syncope
Updated Branches:
refs/heads/master 315dd729a -> 452b01690
[SYNCOPE-914] - The spinner is now always on top of every other element
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/452b0169
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/452b0169
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/452b0169
Branch: refs/heads/master
Commit: 452b016906f512e37a37423392ba9502ab2c3164
Parents: 315dd72
Author: Matteo Di Carlo
Authored: Fri Aug 5 17:01:38 2016 +0200
Committer: Matteo Di Carlo
Committed: Fri Aug 5 17:01:38 2016 +0200
--
.../enduser/src/main/resources/META-INF/resources/app/css/app.css | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/452b0169/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
index 04f4eb2..d112af2 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/app.css
@@ -66,7 +66,7 @@ under the License.
}
.treasure-overlay-spinner-container{
- z-index : 3;
+ z-index : 5;
}
treasure-overlay-spinner.treasure-overlay-spinner-active-remove{
syncope git commit: SYNCOPE-918 fixes redirection to home page after user update
Repository: syncope
Updated Branches:
refs/heads/master 62e9636ae -> 729de516b
SYNCOPE-918 fixes redirection to home page after user update
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/729de516
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/729de516
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/729de516
Branch: refs/heads/master
Commit: 729de516b9dd0c86fb1b481a37e6b11c0492abf0
Parents: 62e9636
Author: Matteo Di Carlo
Authored: Mon Aug 8 15:48:07 2016 +0200
Committer: Matteo Di Carlo
Committed: Mon Aug 8 15:48:07 2016 +0200
--
.../resources/META-INF/resources/app/index.html | 1 +
.../app/js/controllers/TailController.js| 28
.../META-INF/resources/app/views/success.html | 4 +--
3 files changed, 31 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/729de516/client/enduser/src/main/resources/META-INF/resources/app/index.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/index.html
b/client/enduser/src/main/resources/META-INF/resources/app/index.html
index 62f1fb5..7f0271f 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/index.html
+++ b/client/enduser/src/main/resources/META-INF/resources/app/index.html
@@ -97,6 +97,7 @@ under the License.
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/729de516/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
new file mode 100644
index 000..69de101
--- /dev/null
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/TailController.js
@@ -0,0 +1,28 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+'use strict';
+
+angular.module("self")
+.controller("TailController",
+function ($scope, $location) {
+ $scope.redirect = function () {
+$location.path('/self');
+ };
+});
http://git-wip-us.apache.org/repos/asf/syncope/blob/729de516/client/enduser/src/main/resources/META-INF/resources/app/views/success.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/success.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/success.html
index 1584973..bcb2331 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/success.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/success.html
@@ -20,12 +20,12 @@ under the License.
-
+
{{'USER'| translate}} {{currentUser}} {{currentOp|
translate}}
- {{'GOBACKHOME'| translate}}
+ {{'GOBACKHOME'| translate}}
