Merge branch 'develop' into fb_pipelineFileLike

Author: labkey-jeckels

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

@@ -0,0 +1,12 @@
+
+CREATE TABLE ehr_lookups.editable_lookups
+(
+    rowId SERIAL NOT NULL,
+    sch varchar(255),
+    query varchar(255),
+    category varchar(255),
+    title varchar(255),
+    description varchar(255),
+
+    CONSTRAINT PK_editable_lookups PRIMARY KEY (rowId)
+);

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

@@ -0,0 +1,11 @@
+
+CREATE TABLE ehr_lookups.editable_lookups
+(
+    rowid INT IDENTITY(1,1) NOT NULL,
+    sch NVARCHAR(255),
+    query NVARCHAR(255),
+    category NVARCHAR(255),
+    title NVARCHAR(255),
+    description NVARCHAR(255),
+    CONSTRAINT pk_editable_lookups PRIMARY KEY (rowid )
+);

ehr/resources/schemas/ehr_lookups.xml

@@ -2981,4 +2981,18 @@
         </columns>
     </table>
 
+    <table tableName="editable_lookups" tableDbType="TABLE">
+        <description>Table containing the list of lookups that can be edited by admin users.</description>
+        <auditLogging>DETAILED</auditLogging>
+        <columns>
+            <column columnName="rowid" />
+            <!-- schema and schemaName are reserved so using sch -->
+            <column columnName="sch" />
+            <column columnName="query" />
+            <column columnName="category" />
+            <column columnName="title" />
+            <column columnName="description" />
+        </columns>
+    </table>
+
 </tables>

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

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

ehr/src/org/labkey/ehr/table/DefaultEHRCustomizer.java

@@ -1280,7 +1280,7 @@ private void customizeEditableLookups(AbstractTableInfo table)
         String name = "title";
         if (table.getColumn(name) != null)
         {
-            DetailsURL url = DetailsURL.fromString("ehr-updateTable.view?schemaName=ehr_lookups&query.queryName=${value}");
+            DetailsURL url = DetailsURL.fromString("ehr-updateTable.view?schemaName=${sch}&query.queryName=${query}");
             MutableColumnInfo col = ((MutableColumnInfo) table.getColumn(name));
             col.setURL(url);
             col.setLabel("Table");