CSCEXAM-1406 Revert semantics of minor/major update

CSCfi · Feb 4, 2025 · 8f3e62b · 8f3e62b
1 parent a3689ec
commit 8f3e62b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/app/controllers/admin/SettingsController.java b/app/controllers/admin/SettingsController.java
@@ -133,7 +133,7 @@ public Result updateUserAgreement(Http.Request request) {
         JsonNode body = request.body().asJson();
         String eula = body.get("value").asText();
         GeneralSettings gs = getOrCreateSettings("eula", eula, null);
-        if (!body.get("majorUpdate").asBoolean()) {
+        if (!body.get("minorUpdate").asBoolean()) {
             // Since the EULA has changed, force users to accept it again.
             String updStatement = "update app_user set user_agreement_accepted = :hasNot";
             Update<User> update = DB.createUpdate(User.class, updStatement);

diff --git a/ui/src/app/administrative/settings/settings.component.html b/ui/src/app/administrative/settings/settings.component.html
@@ -33,7 +33,7 @@
             <label class="form-check-label ms-2" for="exclude-update">{{
                 'i18n_minor_agreement_update' | translate
             }}</label>
-            <input id="exclude-update" class="form-check-input" type="checkbox" [(ngModel)]="majorAgreementUpdate" />
+            <input id="exclude-update" class="form-check-input" type="checkbox" [(ngModel)]="minorAgreementUpdate" />
         </div>
     </div>
 

diff --git a/ui/src/app/administrative/settings/settings.component.ts b/ui/src/app/administrative/settings/settings.component.ts
@@ -32,7 +32,7 @@ import { SettingsService } from './settings.service';
 export class SettingsComponent implements OnInit {
     config!: AppConfig;
     attributes: string[] = [];
-    majorAgreementUpdate = false;
+    minorAgreementUpdate = false;
 
     constructor(
         private Settings: SettingsService,
@@ -46,7 +46,7 @@ export class SettingsComponent implements OnInit {
     }
 
     updateAgreement = () =>
-        this.Settings.updateAgreement$(this.config, this.majorAgreementUpdate).subscribe({
+        this.Settings.updateAgreement$(this.config, this.minorAgreementUpdate).subscribe({
             next: this.onSuccess,
             error: this.onError,
         });

diff --git a/ui/src/app/administrative/settings/settings.service.ts b/ui/src/app/administrative/settings/settings.service.ts
@@ -11,7 +11,7 @@ export class SettingsService {
     constructor(private http: HttpClient) {}
 
     updateAgreement$ = (config: AppConfig, bypassAgreementUpdate = false) =>
-        this.http.put('/app/settings/agreement', { value: config.eula, majorUpdate: bypassAgreementUpdate });
+        this.http.put('/app/settings/agreement', { value: config.eula, minorUpdate: bypassAgreementUpdate });
 
     updateDeadline$ = (config: AppConfig) => this.http.put('/app/settings/deadline', { value: config.reviewDeadline });