Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge Spaces Management - Meeds-io/MIPs#160 #178

Merged
merged 2 commits into from
Nov 18, 2024
Merged

Merge Spaces Management - Meeds-io/MIPs#160 #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6699fc9
feat: Add Spaces Administrators by Template - MEED-7751 - Meeds-io/MI…
boubaker Nov 11, 2024
9ce2a7b
feat: Include All managing spaces including when space template maste…
boubaker Nov 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions poll-services/src/main/java/io/meeds/poll/service/PollServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ private Poll postPollActivity(String message,
return pollStorage.updatePoll(createdPoll);
}

private boolean canViewPoll(Space pollSpace, org.exoplatform.services.security.Identity currentIdentity) {
return spaceService.isMember(pollSpace, currentIdentity.getUserId()) || currentIdentity.isMemberOf(userACL.getAdminGroups())
private boolean canViewPoll(Space space, org.exoplatform.services.security.Identity currentIdentity) {
return spaceService.isMember(space, currentIdentity.getUserId()) || currentIdentity.isMemberOf(userACL.getAdminGroups())
|| StringUtils.equals(userACL.getSuperUser(), currentIdentity.getUserId())
|| spaceService.isSuperManager(currentIdentity.getUserId());
|| spaceService.isSuperManager(space, currentIdentity.getUserId());
}
}
3 changes: 3 additions & 0 deletions poll-webapp/src/main/webapp/vue-app/connectorEventExtensions/components/PollEventForm.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,9 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
:labels="spaceSuggesterLabels"
:include-users="false"
:width="220"
:search-options="{
filterType: 'accessible',
}"
name="spacesSuggester"
class="user-suggester mt-n2"
include-spaces
Expand Down