Merge pull request I-TECH-UW#1038 from mozzy11/develop

minor fix
mherman22 · May 8, 2024 · b5a7201 · b5a7201
2 parents b9dd70f + 5cf5902
commit b5a7201
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/frontend/src/components/admin/menu/DictionaryManagement.js b/frontend/src/components/admin/menu/DictionaryManagement.js
@@ -197,6 +197,7 @@ function DictionaryManagement() {
                     data-modal-primary-focus
                     id="dictNumber"
                     labelText="Dictionary Number"
+                    disabled
                     onChange={(e) => setDictionaryNumber(e.target.value)}
                     style={{
                       marginBottom: "1rem",

diff --git a/...troller/DictionaryMenuRestController.java → ...er/rest/DictionaryMenuRestController.java b/...troller/DictionaryMenuRestController.java → ...er/rest/DictionaryMenuRestController.java
@@ -1,4 +1,4 @@
-package org.openelisglobal.dictionary.rest.controller;
+package org.openelisglobal.dictionary.controller.rest;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.ArrayList;

diff --git a/src/test/java/org/openelisglobal/AppTestConfig.java b/src/test/java/org/openelisglobal/AppTestConfig.java
@@ -49,7 +49,7 @@
         "org.openelisglobal.address",
         "org.openelisglobal.dictionary",
         "org.openelisglobal.person",
-        "org.openelisglobal.dictionary.rest.controller",
+        "org.openelisglobal.dictionary.controller.rest",
         "org.openelisglobal.dictionary.service",
         "org.openelisglobal.dictionarycategory.service",
         "org.openelisglobal.dictionary.daoimpl",
@@ -69,7 +69,7 @@
         "org.openelisglobal.view",
 }, excludeFilters = {
         @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.patient.controller.*"),
-        @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.dictionary.controller.*"),
+        @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.dictionary.controller.*.java"),
         @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.config.*"),
         @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.fhir.*"),
         @ComponentScan.Filter(type = FilterType.REGEX, pattern = "org.openelisglobal.*.fhir.*")