Skip to content

Commit 9d548be

Browse files
committed
Change default permission for Bulk Edit
1 parent 12b4827 commit 9d548be

File tree

5 files changed

+21
-3
lines changed

5 files changed

+21
-3
lines changed

LDK/api-src/org/labkey/api/ldk/buttons/ShowBulkEditButton.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
import org.labkey.api.module.Module;
2020
import org.labkey.api.query.DetailsURL;
2121
import org.labkey.api.security.permissions.AdminPermission;
22+
import org.labkey.api.security.permissions.Permission;
2223

2324
/**
2425
* User: bimber
@@ -31,8 +32,13 @@ public class ShowBulkEditButton extends SimpleButtonConfigFactory
3132
protected String _queryName;
3233

3334
public ShowBulkEditButton(Module owner, String schemaName, String queryName)
35+
{
36+
this(owner, schemaName, queryName, AdminPermission.class);
37+
}
38+
39+
public ShowBulkEditButton(Module owner, String schemaName, String queryName, Class<? extends Permission> permission)
3440
{
3541
super(owner, "Bulk Edit", DetailsURL.fromString("/ldk/apiBulkEdit.view?schemaName=" + schemaName + "&queryName=" + queryName));
36-
setPermission(AdminPermission.class);
42+
setPermission(permission);
3743
}
3844
}
Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package org.labkey.api.ldk.security;
2+
3+
import org.labkey.api.security.permissions.AbstractPermission;
4+
5+
public class DataAdminPermission extends AbstractPermission
6+
{
7+
public DataAdminPermission() {
8+
super("DataAdminPermission", "Required for certain operations involving large-scale management of data");
9+
}
10+
}

LDK/resources/views/apiBulkEdit.view.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="Bulk Edit Using Client API">
22
<requiresPermissions>
3-
<permissionClass name="org.labkey.api.security.permissions.AdminPermission"/>
3+
<permissionClass name="org.labkey.api.ldk.security.DataAdminPermission"/>
44
</requiresPermissions>
55
<dependencies>
66
<dependency path="ldk.context"/>

laboratory/src/org/labkey/laboratory/LaboratoryModule.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -196,7 +196,7 @@ protected void doStartupAfterSpringConfig(ModuleContext moduleContext)
196196
btn4.setPermission(UpdatePermission.class);
197197
LDKService.get().registerQueryButton(btn4, LaboratoryModule.SCHEMA_NAME, LaboratorySchema.TABLE_SAMPLES);
198198

199-
LDKService.get().registerQueryButton(new ShowBulkEditButton(this, LaboratoryModule.SCHEMA_NAME, LaboratorySchema.TABLE_SAMPLES), LaboratoryModule.SCHEMA_NAME, LaboratorySchema.TABLE_SAMPLES);
199+
LDKService.get().registerQueryButton(new ShowBulkEditButton(this, LaboratoryModule.SCHEMA_NAME, LaboratorySchema.TABLE_SAMPLES, LaboratoryAdminPermission.class), LaboratoryModule.SCHEMA_NAME, LaboratorySchema.TABLE_SAMPLES);
200200

201201
SimpleButtonConfigFactory btn5 = new SimpleButtonConfigFactory(this, "Manage Freezers", DetailsURL.fromString("/query/executeQuery.view?schemaName=laboratory&query.queryName=freezers"));
202202
btn5.setPermission(LaboratoryAdminPermission.class);

laboratory/src/org/labkey/laboratory/security/LaboratoryAdminRole.java

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

33
import org.labkey.api.laboratory.security.LaboratoryAdminPermission;
4+
import org.labkey.api.ldk.security.DataAdminPermission;
45
import org.labkey.api.security.permissions.DeletePermission;
56
import org.labkey.api.security.permissions.InsertPermission;
67
import org.labkey.api.security.permissions.ReadPermission;
@@ -21,6 +22,7 @@ public LaboratoryAdminRole()
2122
InsertPermission.class,
2223
UpdatePermission.class,
2324
DeletePermission.class,
25+
DataAdminPermission.class,
2426
LaboratoryAdminPermission.class
2527
);
2628
}

0 commit comments

Comments
 (0)