Skip to content

Commit cc126b4

Browse files
bbimberbbimber
authored
Merge pull request #287 from LabKey/develop
Merge labkey/develop into BimberLab
2 parents 5902217 + a7dad3f commit cc126b4

File tree

10 files changed

+30
-31
lines changed

10 files changed

+30
-31
lines changed

‎OpenLdapSync/resources/views/ldapSettings.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="LDAP Sync Settings">
2-
<permissions>
3-
<permission name="admin"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.AdminPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="clientapi"/>
77
<dependency path="clientapi_core"/>

‎SequenceAnalysis/resources/views/importFasta.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="Import Sequence Data">
2-
<permissions>
3-
<permission name="insert"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.InsertPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="laboratory.context"/>
77
<dependency path="SequenceAnalysis/sequenceAnalysis"/>

‎SequenceAnalysis/resources/views/importTracks.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="Import Tracks">
2-
<permissions>
3-
<permission name="insert"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.InsertPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="laboratory.context"/>
77
<dependency path="SequenceAnalysis/sequenceAnalysis"/>

‎SequenceAnalysis/resources/views/sequenceDefaults.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="DISCVR-Seq Settings">
2-
<permissions>
3-
<permission name="admin"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.AdminPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="laboratory.context"/>
77
<dependency path="SequenceAnalysis/sequenceAnalysis"/>

‎SequenceAnalysis/resources/views/siteAdmin.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="DISCVR-Seq Site Settings">
2-
<permissions>
3-
<permission name="admin"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.AdminPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="laboratory.context"/>
77
<dependency path="SequenceAnalysis/sequenceAnalysis"/>

‎blast/resources/views/settings.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="BLAST Settings">
2-
<permissions>
3-
<permission name="admin"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.AdminPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="laboratory.context" />
77
</dependencies>

‎jbrowse/resources/views/databaseDetails.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="JBrowse Session" frame="none">
2-
<permissions>
3-
<permission name="admin"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.AdminPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="laboratory.context" />
77
</dependencies>

‎jbrowse/resources/views/genotypeTable.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="Genotypes">
2-
<permissions>
3-
<permission name="read"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.ReadPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="laboratory.context" />
77
<dependency path="internal/jQuery"/>

‎jbrowse/resources/views/jbrowseSearch.view.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<view xmlns="http://labkey.org/data/xml/view" title="JBrowse Search">
2-
<permissions>
3-
<permission name="read"/>
4-
</permissions>
2+
<permissionClasses>
3+
<permissionClass name="org.labkey.api.security.permissions.ReadPermission"/>
4+
</permissionClasses>
55
<dependencies>
66
<dependency path="gen/jbrowse2SearchWebpart.lib.xml"/>
77
<dependency path="LDK.context"/>

‎jbrowse/src/client/entryPoints.js‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,24 +7,23 @@ module.exports = {
77
apps: [{
88
name: 'jbrowseBrowser',
99
title: 'JBrowse Genome Browser',
10-
permission: 'read',
10+
permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
1111
path: './src/client/JBrowse/Browser'
1212
},{
1313
name: 'jbrowse2SearchWebpart',
1414
title: 'JBrowse Search',
15-
permission: 'read',
1615
template: 'app',
1716
generateLib: true,
1817
path: './src/client/JBrowse/Search/webpart'
1918
},{
2019
name: 'variantSearch',
2120
title: 'Variant Search',
22-
permission: 'read',
21+
permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
2322
path: './src/client/JBrowse/VariantSearch'
2423
},{
2524
name: 'variantTable',
2625
title: 'Variant Table',
27-
permission: 'read',
26+
permissionClasses: ['org.labkey.api.security.permissions.ReadPermission'],
2827
path: './src/client/JBrowse/VariantTable'
2928
}]
3029
};

0 commit comments

Comments
 (0)