CSCEXAM-1404 User agreement prompt for all user roles

CSCfi · Feb 4, 2025 · 17bfdb3 · 17bfdb3
1 parent 57b7ae0
commit 17bfdb3
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 6 deletions.
diff --git a/conf/routes b/conf/routes
@@ -473,7 +473,7 @@ PUT           /app/maintenance/:id
 DELETE        /app/maintenance/:id                                                controllers.facility.MaintenancePeriodController.removeMaintenancePeriod(id: Long)
 
 #######################################################
-GET           /attributes                                                         controllers.user.SessionController.getAttributes(request: Request)
+GET           /app/attributes                                                     controllers.user.SessionController.getAttributes(request: Request)
 
 # static assets
 GET           /*path                                                              controllers.assets.FrontendController.assetOrDefault(path)
diff --git a/ui/src/app/administrative/settings/settings.service.ts b/ui/src/app/administrative/settings/settings.service.ts
@@ -10,14 +10,15 @@ import { AppConfig } from 'src/app/administrative/administrative.model';
 export class SettingsService {
     constructor(private http: HttpClient) {}
 
-    updateAgreement$ = (config: AppConfig) => this.http.put('/app/settings/agreement', { value: config.eula });
+    updateAgreement$ = (config: AppConfig, bypassAgreementUpdate = false) =>
+        this.http.put('/app/settings/agreement', { value: config.eula, majorUpdate: bypassAgreementUpdate });
 
     updateDeadline$ = (config: AppConfig) => this.http.put('/app/settings/deadline', { value: config.reviewDeadline });
 
     updateReservationWindow$ = (config: AppConfig) =>
         this.http.put('/app/settings/reservationWindow', { value: config.reservationWindowSize });
 
-    listAttributes$ = () => this.http.get<string[]>('/attributes');
+    listAttributes$ = () => this.http.get<string[]>('/app/attributes');
 
     getConfig$ = () => this.http.get<AppConfig>('/app/config');
 }
diff --git a/ui/src/assets/i18n/en.json b/ui/src/assets/i18n/en.json
@@ -1238,5 +1238,6 @@
     "i18n_language_inspection_reports_title": "Language inspection reports",
     "i18n_login_title": "Login",
     "i18n_logout_title": "Logged out",
-    "i18n_assessment_questions_title": "Assessment questions"
+    "i18n_assessment_questions_title": "Assessment questions",
+    "i18n_minor_agreement_update": "Muutos jota ei tarvitse tiedottaa käyttäjille"
 }
diff --git a/ui/src/assets/i18n/fi.json b/ui/src/assets/i18n/fi.json
@@ -1238,5 +1238,6 @@
     "i18n_language_inspection_reports_title": "Kielentarkastuksen raportit",
     "i18n_login_title": "Kirjautuminen",
     "i18n_logout_title": "Kirjattu ulos",
-    "i18n_assessment_questions_title": "Arvioinnin kysymykset"
+    "i18n_assessment_questions_title": "Arvioinnin kysymykset",
+    "i18n_minor_agreement_update": "Muutos jota ei tarvitse tiedottaa käyttäjille"
 }
diff --git a/ui/src/assets/i18n/sv.json b/ui/src/assets/i18n/sv.json
@@ -1238,5 +1238,6 @@
     "i18n_language_inspection_reports_title": "Språkgranskningsrapporter SV",
     "i18n_login_title": "Logga in SV",
     "i18n_logout_title": "Logga ut SV",
-    "i18n_assessment_questions_title": "Bedömningsfrågor SV"
+    "i18n_assessment_questions_title": "Bedömningsfrågor SV",
+    "i18n_minor_agreement_update": "Muutos jota ei tarvitse tiedottaa käyttäjille SV"
 }