Skip to content

Commit fdfde83

Browse files
bbimberbbimber
committed
Update merge conflicts
2 parents 9bcb88e + 9dcebfa commit fdfde83

File tree

7 files changed

+142
-36
lines changed

7 files changed

+142
-36
lines changed

‎LDK/api-src/org/labkey/api/ldk/buttons/ShowEditUIButton.java‎

Lines changed: 106 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,106 @@
1+
/*
2+
* Copyright (c) 2014-2019 LabKey Corporation
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
package org.labkey.api.ldk.buttons;
17+
18+
import org.labkey.api.data.TableInfo;
19+
import org.labkey.api.ldk.LDKService;
20+
import org.labkey.api.ldk.table.SimpleButtonConfigFactory;
21+
import org.labkey.api.module.Module;
22+
import org.labkey.api.security.permissions.Permission;
23+
import org.labkey.api.util.PageFlowUtil;
24+
25+
import java.util.Map;
26+
27+
/**
28+
* User: bimber
29+
* Date: 7/14/13
30+
* Time: 4:05 PM
31+
*/
32+
public class ShowEditUIButton extends SimpleButtonConfigFactory
33+
{
34+
protected String _schemaName;
35+
protected String _queryName;
36+
private Map<String, String> _urlParamMap = null;
37+
private boolean _copyFilters = true;
38+
39+
protected Class<? extends Permission>[] _perms;
40+
41+
public ShowEditUIButton(Module owner, String schemaName, String queryName, Class<? extends Permission>... perms)
42+
{
43+
this(owner, schemaName, queryName, "Edit Records", perms);
44+
}
45+
46+
public ShowEditUIButton(Module owner, String schemaName, String queryName, String label, Class<? extends Permission>... perms)
47+
{
48+
super(owner, label, "");
49+
50+
_schemaName = schemaName;
51+
_queryName = queryName;
52+
_perms = perms;
53+
}
54+
55+
@Override
56+
public boolean isAvailable(TableInfo ti)
57+
{
58+
if (!super.isAvailable(ti))
59+
return false;
60+
61+
for (Class<? extends Permission> perm : _perms)
62+
{
63+
if (!ti.getUserSchema().getContainer().hasPermission(ti.getUserSchema().getUser(), perm))
64+
return false;
65+
}
66+
67+
return true;
68+
}
69+
70+
public void setCopyFilters(boolean copyFilters)
71+
{
72+
_copyFilters = copyFilters;
73+
}
74+
75+
public void setUrlParamMap(Map<String, String> urlParamMap)
76+
{
77+
_urlParamMap = urlParamMap;
78+
}
79+
80+
protected String getHandlerName()
81+
{
82+
return "LDK.Utils.editUIButtonHandler";
83+
}
84+
85+
@Override
86+
protected String getJsHandler(TableInfo ti)
87+
{
88+
String schema = _schemaName == null || LDKService.ALL_SCHEMAS.equals(_schemaName) ? ti.getPublicSchemaName() : _schemaName;
89+
String query = _queryName == null || LDKService.ALL_TABLES.equalsIgnoreCase(_queryName) ? ti.getPublicName() : _queryName;
90+
String ret = getHandlerName() + "(" + PageFlowUtil.jsString(schema) + "," + PageFlowUtil.jsString(query) + ",dataRegionName, {";
91+
92+
String delim = "";
93+
if (_urlParamMap != null)
94+
{
95+
for (String key : _urlParamMap.keySet())
96+
{
97+
ret += delim + PageFlowUtil.jsString(key) + ":" + PageFlowUtil.jsString(_urlParamMap.get(key));
98+
delim = ",";
99+
}
100+
}
101+
102+
ret += "}, " + _copyFilters + ");";
103+
104+
return ret;
105+
}
106+
}

‎LDK/resources/web/LDK/LDKApi.lib.xml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@
4747
<dependencies>
4848
<dependency path="clientapi"/>
4949
<dependency path="clientapi_core"/>
50+
<dependency path="Ext4"/>
5051
<dependency path="Ext4ClientApi"/>
5152
<dependency path="ux/CheckCombo/CheckCombo.js"/>
5253
<dependency path="ux/CheckCombo/CheckCombo.css"/>

‎LDK/src/org/labkey/ldk/query/BuiltInColumnsCustomizer.java‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.labkey.ldk.query;
22

3-
import org.apache.logging.log4j.Logger;
43
import org.apache.logging.log4j.LogManager;
5-
import org.labkey.api.data.BaseColumnInfo;
4+
import org.apache.logging.log4j.Logger;
65
import org.labkey.api.data.ColumnInfo;
6+
import org.labkey.api.data.MutableColumnInfo;
77
import org.labkey.api.data.TableCustomizer;
88
import org.labkey.api.data.TableInfo;
99
import org.labkey.api.gwt.client.FacetingBehaviorType;
@@ -31,11 +31,11 @@ public void customize(TableInfo table)
3131
{
3232
for (ColumnInfo col : table.getColumns())
3333
{
34-
COL_ENUM.processColumn( (BaseColumnInfo)col );
34+
COL_ENUM.processColumn( (MutableColumnInfo)col );
3535

3636
if (_disableFacetingForNumericCols && col.isNumericType() && col.getFk() == null)
3737
{
38-
((BaseColumnInfo)col).setFacetingBehaviorType(FacetingBehaviorType.ALWAYS_OFF);
38+
((MutableColumnInfo)col).setFacetingBehaviorType(FacetingBehaviorType.ALWAYS_OFF);
3939
}
4040
}
4141

@@ -46,7 +46,7 @@ private enum COL_ENUM
4646
{
4747
created(Timestamp.class){
4848
@Override
49-
public void customizeColumn(BaseColumnInfo col)
49+
public void customizeColumn(MutableColumnInfo col)
5050
{
5151
setNonEditable(col);
5252
col.setHidden(true);
@@ -56,7 +56,7 @@ public void customizeColumn(BaseColumnInfo col)
5656
},
5757
createdby(Integer.class){
5858
@Override
59-
public void customizeColumn(BaseColumnInfo col)
59+
public void customizeColumn(MutableColumnInfo col)
6060
{
6161
setNonEditable(col);
6262
col.setHidden(true);
@@ -66,7 +66,7 @@ public void customizeColumn(BaseColumnInfo col)
6666
},
6767
modified(Timestamp.class){
6868
@Override
69-
public void customizeColumn(BaseColumnInfo col)
69+
public void customizeColumn(MutableColumnInfo col)
7070
{
7171
setNonEditable(col);
7272
col.setHidden(true);
@@ -76,7 +76,7 @@ public void customizeColumn(BaseColumnInfo col)
7676
},
7777
modifiedby(Integer.class){
7878
@Override
79-
public void customizeColumn(BaseColumnInfo col)
79+
public void customizeColumn(MutableColumnInfo col)
8080
{
8181
setNonEditable(col);
8282
col.setHidden(true);
@@ -86,23 +86,23 @@ public void customizeColumn(BaseColumnInfo col)
8686
},
8787
container(String.class){
8888
@Override
89-
public void customizeColumn(BaseColumnInfo col)
89+
public void customizeColumn(MutableColumnInfo col)
9090
{
9191
setNonEditable(col);
9292
col.setLabel("Folder");
9393
}
9494
},
9595
rowid(Integer.class){
9696
@Override
97-
public void customizeColumn(BaseColumnInfo col)
97+
public void customizeColumn(MutableColumnInfo col)
9898
{
9999
setNonEditable(col);
100100
col.setAutoIncrement(true);
101101
}
102102
},
103103
entityid(String.class){
104104
@Override
105-
public void customizeColumn(BaseColumnInfo col)
105+
public void customizeColumn(MutableColumnInfo col)
106106
{
107107
setNonEditable(col);
108108
col.setShownInDetailsView(false);
@@ -111,7 +111,7 @@ public void customizeColumn(BaseColumnInfo col)
111111
},
112112
objectid(String.class){
113113
@Override
114-
public void customizeColumn(BaseColumnInfo col)
114+
public void customizeColumn(MutableColumnInfo col)
115115
{
116116
setNonEditable(col);
117117
col.setShownInDetailsView(false);
@@ -125,16 +125,16 @@ public void customizeColumn(BaseColumnInfo col)
125125
this.dataType = dataType;
126126
}
127127

128-
private static void setNonEditable(BaseColumnInfo col)
128+
private static void setNonEditable(MutableColumnInfo col)
129129
{
130130
col.setUserEditable(false);
131131
col.setShownInInsertView(false);
132132
col.setShownInUpdateView(false);
133133
}
134134

135-
abstract public void customizeColumn(BaseColumnInfo col);
135+
abstract public void customizeColumn(MutableColumnInfo col);
136136

137-
public static void processColumn(BaseColumnInfo col)
137+
public static void processColumn(MutableColumnInfo col)
138138
{
139139
for (COL_ENUM colEnum : COL_ENUM.values())
140140
{

‎LDK/src/org/labkey/ldk/query/ColumnOrderCustomizer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package org.labkey.ldk.query;
22

33
import org.labkey.api.data.AbstractTableInfo;
4-
import org.labkey.api.data.BaseColumnInfo;
54
import org.labkey.api.data.ColumnInfo;
5+
import org.labkey.api.data.MutableColumnInfo;
66
import org.labkey.api.data.TableCustomizer;
77
import org.labkey.api.data.TableInfo;
88

@@ -70,7 +70,7 @@ public boolean isReorderCandidate(ColumnInfo col)
7070
});
7171

7272
for (ColumnInfo c : columns)
73-
table.addColumn( (BaseColumnInfo)c );
73+
table.addColumn( (MutableColumnInfo) c );
7474
}
7575

7676
public void setDefaultVisible(AbstractTableInfo table)

‎laboratory/src/org/labkey/laboratory/query/AssayRunTemplatesCustomizer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
package org.labkey.laboratory.query;
22

33
import org.labkey.api.data.AbstractTableInfo;
4-
import org.labkey.api.data.BaseColumnInfo;
54
import org.labkey.api.data.ColumnInfo;
65
import org.labkey.api.data.DisplayColumn;
76
import org.labkey.api.data.DisplayColumnFactory;
87
import org.labkey.api.data.JdbcType;
8+
import org.labkey.api.data.MutableColumnInfo;
99
import org.labkey.api.data.SQLFragment;
1010
import org.labkey.api.data.TableCustomizer;
1111
import org.labkey.api.data.TableInfo;
@@ -78,7 +78,7 @@ public DisplayColumn createRenderer(ColumnInfo colInfo)
7878

7979
for (ColumnInfo ci : newCols)
8080
{
81-
ati.addColumn( (BaseColumnInfo) ci);
81+
ati.addColumn( (MutableColumnInfo) ci);
8282
}
8383
}
8484

‎laboratory/src/org/labkey/laboratory/query/LaboratoryTableCustomizer.java‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,10 @@
33
import org.apache.commons.collections4.MultiValuedMap;
44
import org.apache.commons.collections4.multimap.ArrayListValuedHashMap;
55
import org.apache.commons.lang3.StringUtils;
6-
import org.apache.logging.log4j.Logger;
76
import org.apache.logging.log4j.LogManager;
7+
import org.apache.logging.log4j.Logger;
88
import org.jetbrains.annotations.Nullable;
99
import org.labkey.api.data.AbstractTableInfo;
10-
import org.labkey.api.data.BaseColumnInfo;
1110
import org.labkey.api.data.ColumnInfo;
1211
import org.labkey.api.data.Container;
1312
import org.labkey.api.data.ContainerFilter;
@@ -302,7 +301,7 @@ public TableInfo getLookupTableInfo()
302301
// get forWrite==true because we modify this table
303302
TableInfo ti = ((UserSchema)getSchema()).getTable(_tableName, getLookupContainerFilter(), true, true);
304303

305-
((BaseColumnInfo)ti.getColumn(qd.getTargetColumn())).setKeyField(true);
304+
((MutableColumnInfo)ti.getColumn(qd.getTargetColumn())).setKeyField(true);
306305

307306
Set<ColumnInfo> birthCols = new HashSet<>();
308307
Set<ColumnInfo> deathCols = new HashSet<>();
@@ -398,7 +397,7 @@ public TableInfo getLookupTableInfo()
398397

399398
if (ti != null)
400399
{
401-
BaseColumnInfo col = (BaseColumnInfo)ti.getColumn(pkColRawName);
400+
MutableColumnInfo col = (MutableColumnInfo)ti.getColumn(pkColRawName);
402401
col.setKeyField(true);
403402
col.setHidden(true);
404403
}
@@ -467,12 +466,12 @@ public TableInfo getLookupTableInfo()
467466

468467
if (ti != null)
469468
{
470-
BaseColumnInfo col = (BaseColumnInfo)ti.getColumn(pkColRawName);
469+
MutableColumnInfo col = (MutableColumnInfo)ti.getColumn(pkColRawName);
471470
col.setKeyField(true);
472471
col.setHidden(true);
473472

474-
((BaseColumnInfo)ti.getColumn("projects")).setLabel("Overlapping Groups");
475-
((BaseColumnInfo)ti.getColumn("groups")).setLabel("Overlapping Sub-groups");
473+
((MutableColumnInfo)ti.getColumn("projects")).setLabel("Overlapping Groups");
474+
((MutableColumnInfo)ti.getColumn("groups")).setLabel("Overlapping Sub-groups");
476475
}
477476

478477
return ti;
@@ -514,11 +513,11 @@ public TableInfo getLookupTableInfo()
514513

515514
if (ti != null)
516515
{
517-
BaseColumnInfo col = (BaseColumnInfo)ti.getColumn(pkColRawName);
516+
MutableColumnInfo col = (MutableColumnInfo)ti.getColumn(pkColRawName);
518517
col.setKeyField(true);
519518
col.setHidden(true);
520519

521-
((BaseColumnInfo)ti.getColumn("lastStartDate")).setLabel("Most Recent Start Date");
520+
((MutableColumnInfo)ti.getColumn("lastStartDate")).setLabel("Most Recent Start Date");
522521
}
523522

524523
return ti;
@@ -577,12 +576,12 @@ public TableInfo getLookupTableInfo()
577576

578577
if (ti != null)
579578
{
580-
BaseColumnInfo col = (BaseColumnInfo) ti.getColumn(pkColRawName);
579+
MutableColumnInfo col = (MutableColumnInfo) ti.getColumn(pkColRawName);
581580
col.setKeyField(true);
582581
col.setHidden(true);
583582

584-
((BaseColumnInfo)ti.getColumn("projects")).setLabel("All Groups/Projects");
585-
((BaseColumnInfo)ti.getColumn("groups")).setLabel("All Sub-Groups");
583+
((MutableColumnInfo)ti.getColumn("projects")).setLabel("All Groups/Projects");
584+
((MutableColumnInfo)ti.getColumn("groups")).setLabel("All Sub-Groups");
586585
}
587586

588587
return ti;
@@ -624,11 +623,11 @@ public TableInfo getLookupTableInfo()
624623

625624
if (ti != null)
626625
{
627-
BaseColumnInfo col = (BaseColumnInfo) ti.getColumn(pkColRawName);
626+
MutableColumnInfo col = (MutableColumnInfo) ti.getColumn(pkColRawName);
628627
col.setKeyField(true);
629628
col.setHidden(true);
630629

631-
((BaseColumnInfo)ti.getColumn("lastStartDate")).setLabel("Most Recent Start Date");
630+
((MutableColumnInfo)ti.getColumn("lastStartDate")).setLabel("Most Recent Start Date");
632631
}
633632

634633
return ti;
@@ -808,7 +807,7 @@ public TableInfo getLookupTableInfo()
808807

809808
if (ti != null)
810809
{
811-
BaseColumnInfo col = (BaseColumnInfo)ti.getColumn(pkColRawName);
810+
MutableColumnInfo col = (MutableColumnInfo)ti.getColumn(pkColRawName);
812811
col.setKeyField(true);
813812
col.setHidden(true);
814813
}

‎laboratory/src/org/labkey/laboratory/query/SamplesCustomizer.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.labkey.laboratory.query;
22

33
import org.labkey.api.data.AbstractTableInfo;
4-
import org.labkey.api.data.BaseColumnInfo;
54
import org.labkey.api.data.ColumnInfo;
65
import org.labkey.api.data.JdbcType;
6+
import org.labkey.api.data.MutableColumnInfo;
77
import org.labkey.api.data.SQLFragment;
88
import org.labkey.api.data.TableCustomizer;
99
import org.labkey.api.data.TableInfo;
@@ -62,7 +62,7 @@ private void appendAmountColumn(AbstractTableInfo ti)
6262
int idx = columns.indexOf(quantity);
6363
columns.add(idx + 1, col);
6464
for (ColumnInfo c : columns)
65-
ti.addColumn( (BaseColumnInfo)c );
65+
ti.addColumn( (MutableColumnInfo)c );
6666
}
6767
}
6868
}

0 commit comments

Comments
 (0)