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

Sprint 9 Staging #457

Merged
merged 7 commits into from
Jan 23, 2025
Merged

Sprint 9 Staging #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9eea90b
Removed administrator role change permission
Dbreck-TAMU Jan 13, 2025
0bd9fe0
Updated display view sorting
Dbreck-TAMU Jan 13, 2025
bbc302f
Updated other applicable works sorting
Dbreck-TAMU Jan 15, 2025
f5049aa
Adjusted name case
Dbreck-TAMU Jan 15, 2025
4f2941d
Restored domain properties
Dbreck-TAMU Jan 15, 2025
46c1837
Merge pull request #455 from TAMULib/sprint9-454-sort-creative-works
Dbreck-TAMU Jan 16, 2025
3e8d6e1
Merge pull request #453 from TAMULib/sprint9-452-adjust-role-permissions
Dbreck-TAMU Jan 16, 2025
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
9 changes: 6 additions & 3 deletions src/main/java/edu/tamu/scholars/middleware/config/WebSecurityConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -152,7 +152,6 @@ public CookieSerializer cookieSerializer() {
serializer.setCookiePath("/");
serializer.setCookieName("SESSION");
serializer.setDomainName(domainName);

return serializer;
}

Expand All @@ -174,10 +173,14 @@ protected SecurityFilterChain configure(HttpSecurity http) throws Exception {
"/directoryViews/{id}",
"/discoveryViews/{id}",
"/displayViews/{id}",
"/themes/{id}",
"/users/{id}")
"/themes/{id}"
)
.hasRole("ADMIN")

.antMatchers(PATCH,
"/users/{id}"
).hasRole("SUPER_ADMIN")

.antMatchers(POST,
"/registration")
.permitAll()
Expand Down
48 changes: 24 additions & 24 deletions src/main/resources/defaults/displayViews.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,7 @@
- field: subtype
value: Album
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -428,7 +428,7 @@
- field: subtype
value: Audio Track
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -441,7 +441,7 @@
- field: subtype
value: Choreography
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -454,7 +454,7 @@
- field: subtype
value: Composition
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -467,7 +467,7 @@
- field: subtype
value: Costume
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -480,7 +480,7 @@
- field: subtype
value: Dance
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -493,7 +493,7 @@
- field: subtype
value: Digital Media
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -506,7 +506,7 @@
- field: subtype
value: Drawing
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -519,7 +519,7 @@
- field: subtype
value: Exhibition
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -532,7 +532,7 @@
- field: subtype
value: Event
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -545,7 +545,7 @@
- field: subtype
value: Film
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -558,7 +558,7 @@
- field: subtype
value: Illustration
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -571,7 +571,7 @@
- field: subtype
value: Installation
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -584,7 +584,7 @@
- field: subtype
value: Interactive Media
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -597,7 +597,7 @@
- field: subtype
value: Painting
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -610,7 +610,7 @@
- field: subtype
value: Performance
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -623,7 +623,7 @@
- field: subtype
value: Photograph
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -636,7 +636,7 @@
- field: subtype
value: Play
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -649,7 +649,7 @@
- field: subtype
value: Print
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -662,7 +662,7 @@
- field: subtype
value: Project
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -675,7 +675,7 @@
- field: subtype
value: Score
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -688,7 +688,7 @@
- field: subtype
value: Screenplay
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -701,7 +701,7 @@
- field: subtype
value: Sculpture
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand All @@ -714,7 +714,7 @@
- field: subtype
value: Time Based Media
sort:
- field: dateTimeIntervalStart
- field: dateTimeInterval.start
direction: DESC
date: true
- field: title
Expand Down