Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix mistakes in XML files #1203

Open
wants to merge 3 commits into
base: develop
Choose a base branch
from
+21 −25
Open

Fix mistakes in XML files #1203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e5d1e62
Fix mistakes in XML Files
maxpatiiuk Mar 31, 2023
3d913e3
Merge remote-tracking branch 'origin/develop' into xml-fixes
maxpatiiuk Mar 31, 2023
43ea47c
fix(views): Confusing commented out node syntax
maxpatiiuk Oct 18, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions config/backstop/global.views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@

<view name="AttachmentMetadata"
class="edu.ku.brc.specify.datamodel.AttachmentMetadata"
resourecelabels="false">
resourcelabels="false">
<desc><![CDATA[The AttachmentMetadata subform.]]></desc>
<altviews>
<altview name="AttachmentMetadata View" viewdef="AttachmentMetadata" label="Form" mode="view" default="true"/>
Expand Down Expand Up @@ -421,7 +421,7 @@

<view name="ReportProperties"
class="java.util.prefs.Preferences"
useresourcelabels="false">
resourcelabels="false">
<desc><![CDATA[Report Properties Form.]]></desc>
<altviews>
<altview name="Report Properties" viewdef="ReportProperties" label="Properties" mode="edit" validated="true"/>
Expand Down
26 changes: 11 additions & 15 deletions config/common/common.views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@
</view>

<view name="BorrowAgent"
Objtitle="Borrow Agent"
objtitle="Borrow Agent"
class="edu.ku.brc.specify.datamodel.BorrowAgent">
<desc><![CDATA[Agent subform for the Borrow form]]></desc>
<altviews>
Expand Down Expand Up @@ -187,7 +187,7 @@
<view name="CollectingTrip"
class="edu.ku.brc.specify.datamodel.CollectingTrip"
busrules="edu.ku.brc.specify.datamodel.busrules.CollectingTripBusRules"
resourelabels="false">
resourcelabels="false">
<desc><![CDATA[CollectingTrip Form]]></desc>
<altviews>
<altview name="CollectingTrip View" viewdef="CollectingTrip" mode="view" default="true"/>
Expand All @@ -199,7 +199,7 @@
class="edu.ku.brc.specify.datamodel.CollectingTrip"
busrules="edu.ku.brc.specify.datamodel.busrules.CollectingTripBusRules"
isinternal="false"
resourelabels="false">
resourcelabels="false">
<desc><![CDATA[CollectingTrip Form]]></desc>
<altviews>
<altview name="CollectingTripForm View" viewdef="CollectingTripForm" mode="view" default="true"/>
Expand Down Expand Up @@ -264,9 +264,7 @@
</view>

<view name="CollectionObjectProperty"
class="edu.ku.brc.specify.datamodel.CollectionObjectProperty"
gettable="edu.ku.brc.af.ui.forms.DataGetterForObj"
settable="edu.ku.brc.af.ui.forms.DataSetterForObj">
class="edu.ku.brc.specify.datamodel.CollectionObjectProperty">
<desc><![CDATA[Subform within the Collection Object form.]]></desc>
<altviews>
<altview name="CollectionObjectProperty View" viewdef="CollectionObjectProperty" mode="view" />
Expand Down Expand Up @@ -806,7 +804,7 @@
<view name="FieldNotebookPage"
class="edu.ku.brc.specify.datamodel.FieldNotebookPage"
busrules="edu.ku.brc.specify.datamodel.busrules.FieldNotebookPageBusRules"
resourcelables="false">
resourcelabels="false">
<desc><![CDATA[Field Notebook Page.]]></desc>
<altviews>
<altview name="FieldNotebookPage Edit" viewdef="FieldNotebookPage" mode="edit"/>
Expand All @@ -818,7 +816,7 @@

<view name="FieldNotebookPageSet"
class="edu.ku.brc.specify.datamodel.FieldNotebookPageSet"
resourcelables="false">
resourcelabels="false">
<desc><![CDATA[Field Notebook Page.]]></desc>
<altviews>
<altview name="FieldNotebookPageSet Edit" viewdef="FieldNotebookPageSet" mode="edit"/>
Expand Down Expand Up @@ -1157,9 +1155,7 @@
</view>

<view name="PreparationProperty"
class="edu.ku.brc.specify.datamodel.PreparationProperty"
gettable="edu.ku.brc.af.ui.forms.DataGetterForObj"
settable="edu.ku.brc.af.ui.forms.DataSetterForObj">
class="edu.ku.brc.specify.datamodel.PreparationProperty">
<desc><![CDATA[Subform within the Collection Object form.]]></desc>
<altviews>
<altview name="PreparationProperty View" viewdef="PreparationProperty" mode="view" />
Expand Down Expand Up @@ -3362,7 +3358,7 @@
<row>
<cell type="label" labelfor="rem"/>
<cell type="field" id="rem" name="remarks" uitype="textareabrief" rows="2" colspan="14"/>
<!--cell type="subview" id="attachments" viewname="ObjectAttachment" name="deaccessionAttachments" initialize="btn=true;icon=AccessionAttachment;align=right"/-->
<!--<cell type="subview" id="attachments" viewname="ObjectAttachment" name="deaccessionAttachments" initialize="btn=true;icon=AccessionAttachment;align=right"/>-->
</row>
<!--row>
<cell type="subview" viewname="DeaccessionAgent" id="8" name="deaccessionAgents" desc="Agents" colspan="12" rows="2"/>
Expand Down Expand Up @@ -3394,7 +3390,7 @@

<viewdef name="DeaccessionAccession Table"
type="formtable"
class="edu.ku.brc.specify.datamodel.Deccession"
class="edu.ku.brc.specify.datamodel.Deaccession"
gettable="edu.ku.brc.af.ui.forms.DataGetterForObj"
settable="edu.ku.brc.af.ui.forms.DataSetterForObj">
<desc><![CDATA[Horizontal interpretation of the Deaccession form from inside the Accession form.]]></desc>
Expand Down Expand Up @@ -6027,7 +6023,7 @@
<row>
<cell type="label" labelfor="1"/>
<cell type="field" id="1" name="catalogedDate" uitype="formattedtext" uifieldformatter="Date"/>
<cell type="label" labelfor="2" uitype="text"/>
<cell type="label" labelfor="2"/>
<cell type="field" id="2" name="catalogNumber" uitype="formattedtext"/>
<cell type="label" labelfor="3"/>
<cell type="field" id="3" name="fieldNumber" uitype="text"/>
Expand Down Expand Up @@ -7258,7 +7254,7 @@
<cell type="field" id="1" name="preparation.barCode" uitype="formattedtext"/>
<!--<cell type="label" labelfor="3"/>
<cell type="field" id="3" name="giftDate" uitype="formattedtext" uifieldformatter="Date" default="today"/>
<cell type="label" labelfor="4"/-->
<cell type="label" labelfor="4"/>-->
</row>
<!--<row>
<cell type="label" labelfor="5"/>
Expand Down
8 changes: 4 additions & 4 deletions config/vascplant/manager/vascplant.views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@
<cell type="label" labelfor="9"/>
<cell type="field" id="9" name="addendum" uitype="text"/>
<cell type="field" id="3" name="isCurrent" uitype="checkbox"/>
<row>
<cell type="label" labelfor="13"/>
<cell type="field" id="13" name="preferredTaxon" uitype="text" readonly="true" colspan = "5"/>
</row>
</row>
<row>
<cell type="label" labelfor="13"/>
<cell type="field" id="13" name="preferredTaxon" uitype="text" readonly="true" colspan = "5"/>
</row>
<row>
<cell type="label" labelfor="10"/>
Expand Down
8 changes: 4 additions & 4 deletions config/vascplant/vascplant.views.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -241,10 +241,10 @@
<cell type="label" labelfor="9"/>
<cell type="field" id="9" name="addendum" uitype="text"/>
<cell type="field" id="3" name="isCurrent" uitype="checkbox"/>
<row>
<cell type="label" labelfor="13"/>
<cell type="field" id="13" name="preferredTaxon" uitype="text" readonly="true" colspan = "5"/>
</row>
</row>
<row>
<cell type="label" labelfor="13"/>
<cell type="field" id="13" name="preferredTaxon" uitype="text" readonly="true" colspan = "5"/>
</row>
<row>
<cell type="label" labelfor="10"/>
Expand Down
Loading