- Pollen-commits - mailman.cloud.codelutin.com

[pollen] branch feature/adminUser updated (fe0076d -> d3d8c4b)
by chorem.org scm July 23, 2014

July 23, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git from fe0076d add button 'Disable Me' in edit user profil new d3d8c4b admin can reset an user password The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d3d8c4b3c151d6a5b1439037734b7aa16ed03dad Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 23 17:55:41 2014 +0200 admin can reset an user password Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 7 +++++-- pollen-ui-angular/src/main/webapp/i18n/fr.js | 3 +++ pollen-ui-angular/src/main/webapp/js/controllers/userCtrl.js | 10 ++++++++-- .../src/main/webapp/partials/user-admin-list.html | 7 ++++--- 4 files changed, 20 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/adminUser updated (f4e8036 -> fe0076d)
by chorem.org scm July 23, 2014

July 23, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git from f4e8036 add good error when you want to change password new fe6e1b0 filter list of user new fe0076d add button 'Disable Me' in edit user profil The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit fe0076d40d5135764ee00082e9fb7fb6fb8fd1aa Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 23 17:06:46 2014 +0200 add button 'Disable Me' in edit user profil commit fe6e1b0686e7a499b40e3e9002fb76b7e0f4e948 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 23 16:56:01 2014 +0200 filter list of user Summary of changes: .../chorem/pollen/services/bean/PollenUserBean.java | 10 ++++++++++ .../pollen/services/service/PollenUserService.java | 8 ++++++++ pollen-ui-angular/src/main/webapp/i18n/en.js | 2 ++ pollen-ui-angular/src/main/webapp/i18n/fr.js | 2 ++ .../src/main/webapp/js/controllers/userCtrl.js | 20 ++++++++++++++++++-- pollen-ui-angular/src/main/webapp/js/services.js | 3 ++- pollen-ui-angular/src/main/webapp/less/style.less | 4 ++++ .../src/main/webapp/partials/user-admin-list.html | 16 +++++++++++++--- .../src/main/webapp/partials/user-edit.html | 16 +++++++++++++++- 9 files changed, 74 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch feature/adminUser updated (b34d2c1 -> f4e8036)
by chorem.org scm July 23, 2014

July 23, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git from b34d2c1 add method to anonymize User new 685819f add method for ban user new f4e8036 add good error when you want to change password The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit f4e8036d2ab21ead54de567f40b566a2a2128f82 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 23 12:27:35 2014 +0200 add good error when you want to change password commit 685819f509a94927c27163d7031b6cdddfb8f02e Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Wed Jul 23 10:32:28 2014 +0200 add method for ban user Summary of changes: .../chorem/pollen/rest/api/v1/PollenUserApi.java | 11 ++++-- pollen-rest-api/src/main/resources/mapping | 1 + .../pollen/services/service/PollenUserService.java | 42 ++++++++++++++++++---- .../src/main/webapp/js/controllers/userCtrl.js | 15 ++++++-- pollen-ui-angular/src/main/webapp/js/services.js | 4 +++ .../src/main/webapp/partials/user-admin-list.html | 1 + .../src/main/webapp/partials/user-edit.html | 12 +++---- 7 files changed, 68 insertions(+), 18 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 2

[pollen] branch feature/adminUser updated (0074cdd -> b34d2c1)
by chorem.org scm July 22, 2014

July 22, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git from 0074cdd can give the admin right at an user in user-list new b34d2c1 add method to anonymize User The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit b34d2c17b1f23ce42dfc2da8dca79d3cd1989aee Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Tue Jul 22 11:48:32 2014 +0200 add method to anonymize User Summary of changes: .../pollen/services/service/PollenUserService.java | 29 +++++++++++++++++++--- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 1 + .../src/main/webapp/js/controllers/userCtrl.js | 9 +++++++ .../src/main/webapp/partials/user-admin-list.html | 2 +- 5 files changed, 38 insertions(+), 4 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/adminUser created (now 0074cdd)
by chorem.org scm July 21, 2014

July 21, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/adminUser in repository pollen. See http://git.chorem.org/pollen.git at 0074cdd can give the admin right at an user in user-list This branch includes the following new commits: new 0074cdd can give the admin right at an user in user-list The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 0074cdd28558a007db521001d083055d70284627 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 21 17:55:46 2014 +0200 can give the admin right at an user in user-list -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/waitResourceBeforeSave deleted (was 9e27696)
by chorem.org scm July 21, 2014

July 21, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/waitResourceBeforeSave in repository pollen. See http://git.chorem.org/pollen.git was 9e27696 show error when no resource has send The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository. -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0

[pollen] branch develop updated (28bc3c4 -> 73e7c45)
by chorem.org scm July 21, 2014

July 21, 2014

This is an automated email from the git hooks/post-receive script. New change to branch develop in repository pollen. See http://git.chorem.org/pollen.git from 28bc3c4 delete old resource when editing choice adds 7cbcdac wait send resource before save choice and add icon loader adds 9e27696 show error when no resource has send new 73e7c45 Merge branch 'feature/waitResourceBeforeSave' into develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 73e7c4565b009d520773af129d690f69da729eaa Merge: 28bc3c4 9e27696 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 21 16:20:53 2014 +0200 Merge branch 'feature/waitResourceBeforeSave' into develop Summary of changes: pollen-ui-angular/bower.json | 3 +- pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 5 +- pollen-ui-angular/src/main/webapp/index.html | 3 + .../src/main/webapp/js/controllers/pollCtrl.js | 68 ++++++++++++++++------ pollen-ui-angular/src/main/webapp/js/directives.js | 14 ++++- pollen-ui-angular/src/main/webapp/less/style.less | 13 ++++- .../src/main/webapp/less/variables.less | 4 +- .../src/main/webapp/partials/printResource.html | 2 +- 9 files changed, 86 insertions(+), 27 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/waitResourceBeforeSave updated (7cbcdac -> 9e27696)
by chorem.org scm July 21, 2014

July 21, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/waitResourceBeforeSave in repository pollen. See http://git.chorem.org/pollen.git from 7cbcdac wait send resource before save choice and add icon loader new 9e27696 show error when no resource has send The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 9e27696cbf53550f606f5630f81d8d19003d97f4 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 21 16:19:29 2014 +0200 show error when no resource has send Summary of changes: pollen-ui-angular/src/main/webapp/i18n/en.js | 1 + pollen-ui-angular/src/main/webapp/i18n/fr.js | 5 +++-- .../src/main/webapp/js/controllers/pollCtrl.js | 14 +++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] branch feature/waitResourceBeforeSave created (now 7cbcdac)
by chorem.org scm July 21, 2014

July 21, 2014

This is an automated email from the git hooks/post-receive script. New change to branch feature/waitResourceBeforeSave in repository pollen. See http://git.chorem.org/pollen.git at 7cbcdac wait send resource before save choice and add icon loader This branch includes the following new commits: new 7cbcdac wait send resource before save choice and add icon loader The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7cbcdacee0c4dee8ec231973b3da30dea102b1b6 Author: Adrien Garandel <a.garandel(a)dralagen.fr> Date: Mon Jul 21 15:28:01 2014 +0200 wait send resource before save choice and add icon loader -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 1

[pollen] 02/02: delete old resource when editing choice
by chorem.org scm July 21, 2014

July 21, 2014

This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository pollen. See http://git.chorem.org/pollen.git commit 28bc3c4e3162ebd653ff510a7ca6870511e4671d Author: Adrien <a.garandel(a)dralagen.fr> Date: Mon Jul 21 10:59:47 2014 +0200 delete old resource when editing choice --- .../org/chorem/pollen/services/service/ChoiceService.java | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java index 4eb39ad..d8dcf14 100644 --- a/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java +++ b/pollen-services/src/main/java/org/chorem/pollen/services/service/ChoiceService.java @@ -210,6 +210,19 @@ public class ChoiceService extends PollenServiceSupport { toSave = getChoice(poll, choice.getEntityId()); + if (toSave.getChoiceType() == ChoiceType.RESOURCE) { + // check if new resource then delete old resource + if (choice.getChoiceType() != ChoiceType.RESOURCE + || + ! toSave.getChoiceValue().equals( + getPollenResourceService().getTopiaIdByReduceId(choice.getChoiceValue()) + )) { + + // delete the old resource + getPollenResourceDao().delete(getPollenResourceService().getResource0(toSave.getChoiceValue())); + } + } + } else { // create a new choice -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm(a)chorem.org>.

1 0