JE-403: Fixed texts. Fixed classes for choices.js fields and disabled…

… state
itk-dev · Dec 20, 2023 · 2928ecc · 2928ecc
1 parent 9e83d9e
commit 2928ecc
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -11,6 +11,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 * Added project lead to client when syncing projects.
 * Remove description from create invoice page.
 * Added generate description button to invoice when client is set.
+* Fixed texts.
+* Fixed classes for choices.js fields and disabled state.
 
 ## [1.1.2]
 

diff --git a/assets/controllers/choices_controller.js b/assets/controllers/choices_controller.js
@@ -10,7 +10,11 @@ export default class extends Controller {
 
     connect() {
         this.choicesTargets.forEach((target) => {
-            new Choices(target, {allowHTML: true, itemSelectText: ''});
+            const notDisabled = !target.disabled;
+
+            if (notDisabled) {
+                new Choices(target, {allowHTML: true, itemSelectText: ''});
+            }
         })
     }
 }
diff --git a/src/Controller/InvoiceEntryWorklogController.php b/src/Controller/InvoiceEntryWorklogController.php
@@ -47,7 +47,7 @@ public function worklogs(Request $request, Invoice $invoice, InvoiceEntry $invoi
             'required' => false,
             'label' => 'worklog.version',
             'label_attr' => ['class' => 'label'],
-            'row_attr' => ['class' => 'form-row'],
+            'row_attr' => ['class' => 'form-row form-choices'],
             'attr' => [
                 'class' => 'form-element',
                 'data-choices-target' => 'choices',
@@ -69,7 +69,7 @@ public function worklogs(Request $request, Invoice $invoice, InvoiceEntry $invoi
             'required' => false,
             'label' => 'worklog.epic',
             'label_attr' => ['class' => 'label'],
-            'row_attr' => ['class' => 'form-row'],
+            'row_attr' => ['class' => 'form-row form-choices'],
             'attr' => [
                 'class' => 'form-element',
                 'data-choices-target' => 'choices',

diff --git a/translations/messages.da.yaml b/translations/messages.da.yaml
@@ -172,7 +172,7 @@ invoices:
   client_helptext: 'Vælg hvilken kundekonto fakturaen skal udstedes til.'
   default_material_number_helptext: 'Vælg forudvalgt "Materialenummer". Det bliver sat automatisk i alle fakturaindgange.'
   default_receiver_account_helptext: 'Vælg forudvalgt "Til konto". Det bliver sat automatisk i alle fakturaindgange.'
-  payer_account_helptext: 'Hvis valgt indsættes følgende først i tekstfeltet i fakturaen: "Betales af [KONTO]".'
+  payer_account_helptext: 'Anvendes kun når der er tale om ITK projekt posteringer på PSP-element. Hvis valgt indsættes følgende i starten af tekstfeltet i fakturaen: "Betales af [KONTO]".'
   client_type_internal: 'Intern'
   client_type_external: 'Ekstern'
   client_ean: 'EAN'
@@ -269,6 +269,7 @@ worklog:
   period_to_helptext: ''
   worker_helptext: ''
   version_helptext: ''
+  epic_helptext: ''
   owned_by_other: 'Anden faktura'
   action_save: 'Gem valgte worklogs'
   error_already_billed: 'Fejl: Indeholder worklog der allerede er faktureret. Prøv at genindlæse siden...'