Merge 25.7 to develop

Author: labkey-teamcity

ehr/resources/schemas/dbscripts/postgresql/ehr_lookups-25.002-25.003.sql

@@ -0,0 +1 @@
+ALTER TABLE ehr_lookups.treatment_frequency ADD COLUMN LSID LSIDtype;

ehr/resources/schemas/dbscripts/sqlserver/ehr_lookups-25.002-25.003.sql

@@ -0,0 +1 @@
+ALTER TABLE ehr_lookups.treatment_frequency ADD Lsid LsidType null;

ehr/resources/schemas/ehr_lookups.xml

@@ -963,6 +963,17 @@
                 <shownInInsertView>false</shownInInsertView>
                 <shownInUpdateView>false</shownInUpdateView>
             </column>
+            <column columnName="lsid">
+                <datatype>lsidtype</datatype>
+                <isReadOnly>true</isReadOnly>
+                <isHidden>true</isHidden>
+                <isUserEditable>false</isUserEditable>
+                <fk>
+                    <fkColumnName>ObjectUri</fkColumnName>
+                    <fkTable>Object</fkTable>
+                    <fkDbSchema>exp</fkDbSchema>
+                </fk>
+            </column>
             <column columnName="meaning">
             </column>
             <column columnName="sort_order">

ehr/src/org/labkey/ehr/EHRModule.java

@@ -133,7 +133,7 @@ public String getName()
     @Override
     public @Nullable Double getSchemaVersion()
     {
-        return 25.002;
+        return 25.003;
     }
 
     @Override

ehr/test/src/org/labkey/test/tests/ehr/AbstractGenericEHRTest.java

@@ -340,7 +340,6 @@ protected List<String> skipLinksForCrawling()
                 "query-begin.view",
                 "query-searchPanel.view",
                 "query-executeQuery.view",
-                "study-manageStudy.view",
                 "ehr-animalHistory.view",
                 "ehr-updateQuery.view",
                 "ehr-updateTable.view",
@@ -354,7 +353,8 @@ protected List<String> skipLinksForCrawling()
                 "ldk-updateQuery",
                 "junit-begin.view",
                 "admin-",
-                "ehr-datasets.view"
+                "ehr-datasets.view",
+                "study-"    // Don't crawl any study links
         );
     }