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.
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
Adds support for communities and subcommunities #1235
Merged
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
d90af81
First pass at allowing users to set the community and subcommunity of…
hectorcorrea 99cc222
Minor tweaks
hectorcorrea 7fe2a82
Adjust tests to pass the new fields
hectorcorrea 572ff15
Added a few tests
hectorcorrea bcdbd79
Merge branch 'main' into communities
carolyncole File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,46 @@ | ||
<div class="section-title"> | ||
<% if @work.group.communities.count == 1 %> | ||
<!-- Special case for PPPL that has a single community --> | ||
<details> | ||
<summary>Community</summary> | ||
The community for this dataset. | ||
</details> | ||
<select id="communities" name="communities[]" class="form-select" > | ||
<option selected><%= @work.group.communities.first %></option> | ||
</select> | ||
<% else %> | ||
<details> | ||
<summary>Communities</summary> | ||
Select one or more communities for this dataset. | ||
</details> | ||
<select id="communities" name="communities[]" class="form-select" multiple > | ||
<% @work.group.communities.each do |community| %> | ||
<% if @work.resource.communities.include?(community) %> | ||
<option selected><%= community %></option> | ||
<% else %> | ||
<option><%= community %></option> | ||
<% end %> | ||
<% end %> | ||
</select> | ||
<% end %> | ||
|
||
<% if @work.group.subcommunities.count > 0 %> | ||
<br/> | ||
<!-- Display subcommunities only for those groups that have them. --> | ||
<details> | ||
<summary>Subcommunities</summary> | ||
Select one or more subcommunities for this dataset. | ||
</details> | ||
|
||
<select id="subcommunities" name="subcommunities[]" class="form-select" multiple > | ||
<% @work.group.subcommunities.each do |subcommunity| %> | ||
<% if @work.resource.subcommunities.include?(subcommunity) %> | ||
<option selected><%= subcommunity %></option> | ||
<% else %> | ||
<option><%= subcommunity %></option> | ||
<% end %> | ||
<% end %> | ||
</select> | ||
<% end %> | ||
</div> | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Eventually we might want to make communities and subcommunities configurable somehow, but for now we are just trying to see if this new design works for PPPL.