This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See http://git.codelutin.com/observe.git commit 6910618ff8f85c397bda93c616688cda3a9058b6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Oct 2 15:16:33 2015 +0200 adapter le rapport de connexion au base a la gestion de la sécurité (suite au rebase) (refs #7549) --- .../ird/observe/ui/storage/StorageUIHandler.java | 12 ----------- .../ird/observe/ui/storage/tabs/SecurityModel.java | 25 ++++++++++++++++++++++ .../ftl/dataSourceConnectionReport_fr.ftl | 20 ++++++++--------- 3 files changed, 35 insertions(+), 22 deletions(-) diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java index 1068a85..1ce6ffc 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/StorageUIHandler.java @@ -900,18 +900,6 @@ public class StorageUIHandler { addCloseTag("ul", sb); } - protected void computeSecurityreport(StorageUIModel model, StringBuilder sb) { - - addTag("h3", sb, t("observe.storage.report.selected.security")); - addOpenTag("ul", sb); - SecurityModel security = model.getSecurityModel(); - addTag("li", sb, t("observe.storage.report.security.owner", security.getAdministrateur())); - addTag("li", sb, t("observe.storage.report.security.techniciens", security.getTechnicien())); - addTag("li", sb, t("observe.storage.report.security.readers", security.getUtilisateur())); - addTag("li", sb, t("observe.storage.report.security.referentiels", security.getReferentiel())); - addCloseTag("ul", sb); - } - public static void addTag(String tag, StringBuilder sb, String message) { sb.append('<').append(tag).append('>'); sb.append(message); diff --git a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java index 2b4aa4d..96b3fa0 100644 --- a/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java +++ b/observe-application-swing/src/main/java/fr/ird/observe/ui/storage/tabs/SecurityModel.java @@ -24,6 +24,7 @@ package fr.ird.observe.ui.storage.tabs; import com.google.common.base.Function; import com.google.common.base.Predicates; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import com.google.common.collect.Sets; import fr.ird.observe.services.dto.ObserveDbUserDto; import fr.ird.observe.services.dto.ObserveDbUserDtos; @@ -33,6 +34,7 @@ import java.beans.PropertyChangeListener; import java.beans.PropertyChangeSupport; import java.io.Serializable; import java.util.Collection; +import java.util.List; import java.util.Set; /** @@ -77,6 +79,29 @@ public class SecurityModel implements Serializable { return roles; } + public List<String> getUserNamesByRole(ObserveDbRole role) { + List<String> names = Lists.newLinkedList(Iterables.transform( + Iterables.filter(users, ObserveDbUserDtos.newRolePredicate(role)), + ObserveDbUserDtos.getNameFunction())); + return names; + } + + public List<String> getDataUserNames() { + return getUserNamesByRole(ObserveDbRole.USER); + } + + public List<String> getReferentialUserNames() { + return getUserNamesByRole(ObserveDbRole.REFERENTIAL); + } + + public List<String> getTechnicalUserNames() { + return getUserNamesByRole(ObserveDbRole.TECHNICAL); + } + + public List<String> getUnusedUserNames() { + return getUserNamesByRole(ObserveDbRole.UNUSED); + } + public Set<ObserveDbUserDto> getUsers() { return Sets.newHashSet(users); } diff --git a/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl b/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl index 3d578a4..5209f90 100644 --- a/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl +++ b/observe-application-swing/src/main/resources/ftl/dataSourceConnectionReport_fr.ftl @@ -194,12 +194,12 @@ </#if> <h3>Sécurité</h3> - <ul> - <li><strong>Propriétaire : : </strong>${securityModel.administrateu}</li> - <li><strong>Techniciens : : </strong>${securityModel.technicien}</li> - <li><strong>Lecteurs : : </strong>${securityModel.utilisateur}</li> - <li><strong>Référentiels : : </strong>${securityModel.referentiel}</li> - </ul> + <ul> + <li><strong>Propriétaire : </strong>${securityModel.administrateur.name}</li> + <li><strong>Techniciens : </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Lecteurs : </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Référentiels : </strong>${securityModel.referentialUserNames?join(", ")}</li> + </ul> </#if> @@ -306,10 +306,10 @@ <h3>Sécurité</h3> <ul> - <li><strong>Propriétaire : : </strong>${securityModel.administrateu}</li> - <li><strong>Techniciens : : </strong>${securityModel.technicien}</li> - <li><strong>Lecteurs : : </strong>${securityModel.utilisateur}</li> - <li><strong>Référentiels : : </strong>${securityModel.referentiel}</li> + <li><strong>Propriétaire : </strong>${securityModel.administrateur.name}</li> + <li><strong>Techniciens : </strong>${securityModel.technicalUserNames?join(", ")}</li> + <li><strong>Lecteurs : </strong>${securityModel.dataUserNames?join(", ")}</li> + <li><strong>Référentiels : </strong>${securityModel.referentialUserNames?join(", ")}</li> </ul> </#if> -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.