Skip to content

Commit 808db1e

Browse files
cnathecnathe
committed
Merge 23.11 to develop
# Conflicts: # OConnor/resources/views/add_keyword.html # OConnor/resources/views/all_purchases.html # OConnor/resources/views/enabled_grants.html # OConnor/resources/views/enabled_shipping.html # OConnor/resources/views/enabled_vendor_quotes.html # OConnor/resources/views/enabled_vendors.html # OConnor/resources/views/grant_summary.html # OConnor/resources/views/inventory_all_samples.html # OConnor/resources/views/inventory_cells_available.html # OConnor/resources/views/inventory_dna_available.html # OConnor/resources/views/inventory_oligo_available.html # OConnor/resources/views/inventory_virus_available.html # OConnor/resources/views/mark_cancelled.html # OConnor/resources/views/mark_invoiced.html # OConnor/resources/views/mark_ordered.html # OConnor/resources/views/mark_received.html # OConnor/resources/views/my_purchases.html # OConnor/resources/views/popular_purchases.html # OConnor/resources/views/purchase_item.html
2 parents 18575f9 + dae001c commit 808db1e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+128
-140
lines changed

‎OConnor/resources/views/AnimalList.html‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11

22
<script type="text/javascript" nonce="<%=scriptNonce%>">
33

4-
LABKEY.requiresScript('oconnor/moreInfo.js');
5-
6-
74
Ext.onReady(main);
85

96
function main(){

‎OConnor/resources/views/AnimalList.view.xml‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,7 @@
33
frame="none"
44
>
55

6-
6+
<dependencies>
7+
<dependency path="oconnor/moreInfo.js" />
8+
</dependencies>
79
</view>

‎OConnor/resources/views/BloodDraws.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11

22
<script type="text/javascript" nonce="<%=scriptNonce%>">
33

4-
LABKEY.requiresScript('oconnor/moreInfo.js');
5-
64
Ext.onReady(main);
75

86
function main(){

‎OConnor/resources/views/BloodDraws.view.xml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
title="Blood Draws"
33
frame="none"
44
>
5-
6-
5+
6+
<dependencies>
7+
<dependency path="oconnor/moreInfo.js" />
8+
</dependencies>
79
</view>

‎OConnor/resources/views/Elispot_Matrix.html‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
<html>
22
<script type="text/javascript" nonce="<%=scriptNonce%>">
33

4-
LABKEY.requiresScript('oconnor/oconnorFunctions.js');
5-
64
function toExperiment(experiment){
75

86
LABKEY.Query.selectRows({

‎OConnor/resources/views/Elispot_Matrix.view.xml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22
title="Matrix ELISpot Analysis"
33
frame="none"
44
>
5-
6-
5+
6+
<dependencies>
7+
<dependency path="oconnor/oconnorFunctions.js" />
8+
</dependencies>
9+
710
</view>

‎OConnor/resources/views/add_keyword.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
<html>
22
<head>
33
<script type="text/javascript" nonce="<%=scriptNonce%>">
4-
LABKEY.Utils.requiresScript("oconnor/oconnorAlabrityConfig.js");
5-
</script>
6-
<script type="text/javascript" nonce="<%=scriptNonce%>">
7-
LABKEY.Utils.requiresScript("oconnor/oconnorPurchaseCommon.js");
8-
</script>
9-
<script type="text/javascript" nonce="<%=scriptNonce%>">
104
Ext.onReady(function(){
115

126
var pageButtons = [{text: 'Add Keyword', requiresSelection: true, handler: addKeyword}];

‎OConnor/resources/views/add_keyword.view.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<view xmlns="http://labkey.org/data/xml/view">
2+
<dependencies>
3+
<dependency path="oconnor/oconnorAlabrityConfig.js" />
4+
<dependency path="oconnor/oconnorPurchaseCommon.js" />
5+
</dependencies>
6+
</view>

‎OConnor/resources/views/all_purchases.html‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
<html>
22
<head>
33
<script type="text/javascript" nonce="<%=scriptNonce%>">
4-
LABKEY.requiresScript("oconnor/oconnorAlabrityConfig.js");
5-
</script>
6-
<script type="text/javascript" nonce="<%=scriptNonce%>">
7-
LABKEY.requiresScript("oconnor/oconnorPurchaseCommon.js");
8-
</script>
9-
<script type="text/javascript" nonce="<%=scriptNonce%>">
104
Ext.onReady(function(){
115

126
createGrid(dbSchemaName, 'all_orders', 'all', '', 'a', 'b','');

‎OConnor/resources/views/all_purchases.view.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<view xmlns="http://labkey.org/data/xml/view">
2+
<dependencies>
3+
<dependency path="oconnor/oconnorAlabrityConfig.js" />
4+
<dependency path="oconnor/oconnorPurchaseCommon.js" />
5+
</dependencies>
6+
</view>

0 commit comments

Comments
 (0)