Skip to content
Snippets Groups Projects
Commit be96fb2d authored by Sonia Zorba's avatar Sonia Zorba
Browse files

Minor fixes on nodes sharing implementation

parent 82262c27
No related branches found
No related tags found
No related merge requests found
Pipeline #1221 passed
...@@ -102,12 +102,14 @@ public class NodesHtmlGenerator { ...@@ -102,12 +102,14 @@ public class NodesHtmlGenerator {
List<String> personGroups = new ArrayList<>(); List<String> personGroups = new ArrayList<>();
List<String> peopleGroups = new ArrayList<>(); List<String> peopleGroups = new ArrayList<>();
for (String value : values) { for (String value : values) {
if (!value.isBlank()) {
if (value.startsWith("people.")) { if (value.startsWith("people.")) {
personGroups.add(value.substring("people.".length()).replace("\\.", ".")); personGroups.add(value.substring("people.".length()).replace("\\.", "."));
} else { } else {
peopleGroups.add(value); peopleGroups.add(value);
} }
} }
}
if (!personGroups.isEmpty()) { if (!personGroups.isEmpty()) {
Element personIcon = cell.appendElement("span"); Element personIcon = cell.appendElement("span");
personIcon.attr("class", "icon person-icon"); personIcon.attr("class", "icon person-icon");
......
...@@ -195,7 +195,7 @@ public class SharingService { ...@@ -195,7 +195,7 @@ public class SharingService {
if (identity.getType() == IdentityType.EDU_GAIN if (identity.getType() == IdentityType.EDU_GAIN
&& identity.getEppn().endsWith("@" + trustedEppnScope)) { && identity.getEppn().endsWith("@" + trustedEppnScope)) {
String username = identity.getEppn().substring(0, identity.getEppn().indexOf("@")); String username = identity.getEppn().substring(0, identity.getEppn().indexOf("@"));
existingUsers.put(user.getId(), username); existingUsers.put(user.getId(), username.toLowerCase());
break; break;
} }
} }
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
<div id="footer-fix"></div> <div id="footer-fix"></div>
<footer class="text-center" id="site-footer"> <footer class="text-center" id="site-footer">
&nbsp;Powered by <img alt="IA2 logo" src="./assets/ia2-logo-footer.png"> &nbsp;Powered by <img alt="IA2 logo" src="./assets/ia2-logo-footer.png">
<strong class="text-primary"><a href="http://www.ia2.inaf.it/" target="blank_">IA2</a></strong>&nbsp; <strong class="text-primary"><a href="http://www.ia2.inaf.it/" target="_blank">IA2</a></strong>&nbsp;
</footer> </footer>
<div id="loading" v-if="loading" class="loading"> <div id="loading" v-if="loading" class="loading">
<div class="spinner-wrapper"> <div class="spinner-wrapper">
......
...@@ -52,7 +52,7 @@ export default { ...@@ -52,7 +52,7 @@ export default {
groupArr.splice(0, groupArr.length); groupArr.splice(0, groupArr.length);
for (let group of nodeArr.split(' ')) { for (let group of nodeArr.split(' ')) {
if (group.startsWith('people.')) { if (group.startsWith('people.')) {
userArr.push(group.substring('people.'.length).replaceAll('\\\\', '\\')); userArr.push(group.substring('people.'.length).replaceAll('\\', ''));
} else if (group.trim() !== '') { } else if (group.trim() !== '') {
groupArr.push(group.replaceAll('\\\\', '\\')); groupArr.push(group.replaceAll('\\\\', '\\'));
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment