Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into xml-fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
maxpatiiuk committed Mar 31, 2023
2 parents e5d1e62 + 326e783 commit 680ba46
Show file tree
Hide file tree
Showing 40 changed files with 20,355 additions and 21,210 deletions.
513 changes: 250 additions & 263 deletions config/accessions/accessions.views.xml

Large diffs are not rendered by default.

1,076 changes: 517 additions & 559 deletions config/backstop/editorpanel.views.xml

Large diffs are not rendered by default.

23 changes: 13 additions & 10 deletions config/backstop/gbif.views.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,24 @@

<viewset name="gbif" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
<views>
<view
name="GBIFCollection"
usedefbusrule="false"
resourcelabels="false">

<view name="GBIFCollection"
usedefbusrule="false"
resourcelabels="false">
<desc><![CDATA[GBIF Collection Registration Form]]></desc>
<altviews>
<altview name="GBIFCollection View" viewdef="GBIFCollection" mode="edit" validated="true" default="true"/>
<altview name="GBIFCollection Edit" viewdef="GBIFCollection" mode="edit"/>
</altviews>
</view>
</views>

</views>
<viewdefs>
<viewdef type="form"
name="GBIFCollection"
gettable="edu.ku.brc.af.ui.forms.DataGetterForHashMap"
settable="edu.ku.brc.af.ui.forms.DataSetterForHashMap">

<viewdef name="GBIFCollection"
type="form"
gettable="edu.ku.brc.af.ui.forms.DataGetterForHashMap"
settable="edu.ku.brc.af.ui.forms.DataSetterForHashMap">

<desc><![CDATA[GBIF Collection Registration Form]]></desc>
<enableRules/>
Expand Down Expand Up @@ -50,5 +52,6 @@
-->
</rows>
</viewdef>
</viewdefs>

</viewdefs>
</viewset>
4,324 changes: 2,128 additions & 2,196 deletions config/backstop/global.views.xml

Large diffs are not rendered by default.

Loading

0 comments on commit 680ba46

Please sign in to comment.