Skip to content

Commit

Permalink
fix(views): Confusing commented out node syntax
Browse files Browse the repository at this point in the history 
Fixes #1223

Thanks to @mcruz-umich for reporting this
  • Loading branch information
@maxpatiiuk
maxpatiiuk committed Oct 18, 2023
1 parent 3d913e3 commit 43ea47c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions config/common/common.views.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3358,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 @@ -7254,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

1 comment on commit 43ea47c

@mcruz-umich
Copy link

@mcruz-umich mcruz-umich commented on 43ea47c Oct 18, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This commenting-style pattern exists in other view xml files.
Therefore there are more to fix. At least the ones below....

I did a search on the /config directory for:
RegEx: (/-->)|()
There may be other patterns to search for.

Searching 464 files for "(/-->)|()" (regex)

/Applications/Specify/config/collectingevent_update_wb_datamodel.xml:
  130    </table>
  131  
  132:   <!--table classname="edu.ku.brc.specify.datamodel.GeologicTimePeriod" table="geologictimeperiod" tableid="46" lazy="true">
  133      <display objtitle="Geologic Time Period"/>
  134      <field column="Erathem/Era" name="erathem/era" type="java.lang.String" length="64"/>
  ...
  138    </table-->
  139    
  140:   <!--table classname="edu.ku.brc.specify.datamodel.LithoStrat" table="lithostrat" tableid="100" lazy="true">
  141      <field column="SuperGroup" name="superGroup" type="java.lang.String" length="64"/>
  142      <field column="LithoGroup" name="lithoGroup" type="java.lang.String" length="64"/>
  ...
  240    </table>
  241  
  242:   <!--table classname="edu.ku.brc.specify.datamodel.PaleoContext" table="paleocontext" tableid="32" searchable="true" abbrv="pc">
  243      <field column="Paleo Context Name" name="paleoContextName" type="java.lang.String" />
  244      <field column="Remarks" name="remarks" type="java.lang.String" />

/Applications/Specify/config/collectionobject_update_wb_datamodel.xml:
  323    </table>
  324  
  325:   <!--table classname="edu.ku.brc.specify.datamodel.GeologicTimePeriod" table="geologictimeperiod" tableid="46" lazy="true">
  326      <display objtitle="Geologic Time Period"/>
  327      <field column="Erathem/Era" name="erathem/era" type="java.lang.String" length="64"/>
  ...
  331    </table-->
  332    
  333:   <!--table classname="edu.ku.brc.specify.datamodel.LithoStrat" table="lithostrat" tableid="100" lazy="true">
  334      <field column="SuperGroup" name="superGroup" type="java.lang.String" length="64"/>
  335      <field column="LithoGroup" name="lithoGroup" type="java.lang.String" length="64"/>
  ...
  433    </table>
  434  
  435:   <!--table classname="edu.ku.brc.specify.datamodel.PaleoContext" table="paleocontext" tableid="32" searchable="true" abbrv="pc">
  436      <field column="Paleo Context Name" name="paleoContextName" type="java.lang.String" />
  437      <field column="Remarks" name="remarks" type="java.lang.String" />

/Applications/Specify/config/locality_update_wb_datamodel.xml:
   35    </table>
   36  
   37:    <!--table classname="edu.ku.brc.specify.datamodel.GeologicTimePeriod" table="geologictimeperiod" tableid="46" lazy="true">
   38      <display objtitle="Geologic Time Period"/>
   39      <field column="Erathem/Era" name="erathem/era" type="java.lang.String" length="64"/>
   ..
   50    </table>
   51  
   52:   <!--table classname="edu.ku.brc.specify.datamodel.LithoStrat" table="lithostrat" tableid="100" lazy="true">
   53      <field column="SuperGroup" name="superGroup" type="java.lang.String" length="64"/>
   54      <field column="LithoGroup" name="lithoGroup" type="java.lang.String" length="64"/>
   ..
  144      <field column="YesNo 5 (Locality Detail)" name="localityDetailYesNo5" type="boolean"/>
  145    </table>
  146:   <!--table classname="edu.ku.brc.specify.datamodel.PaleoContext" table="paleocontext" tableid="32" searchable="true" abbrv="pc">
  147      <field column="Paleo Context Name" name="paleoContextName" type="java.lang.String" />
  148      <field column="Remarks" name="remarks" type="java.lang.String" />

/Applications/Specify/config/querybuilder.xml:
  131          </table>
  132          <table name="CollectingEventAttribute">
  133:         	<!--alias name="Taxon" field="hostTaxon"/-->
  134      		<table name="Taxon" field="hostTaxon">
  135          		<table name="CommonNameTx" field="commonNames" >
  ...
  439      <table name="Geography">
  440        	<alias name="Agent" field="createdByAgent" />
  441:       	<!-- alias name="Geography" field="acceptedChildren" /-->
  442:       	<!-- alias name="Geography" field="children" /-->
  443        	<alias name="Geography" field="acceptedGeography" />
  444        	<alias name="Geography" field="parent" />
  ...
  551        		<alias name="Agent" field="modifiedByAgent" />
  552          </table>
  553:         <!-- alias name="CollectingEvent" field="collectingEvents"/-->
  554          <alias name="Agent" field="createdByAgent" />
  555          <alias name="Agent" field="modifiedByAgent" />

/Applications/Specify/config/S2nDwcMeta.xml:
   47    </core>
   48  
   49:   <!--extension encoding="ISO-8859-1" fieldsTerminatedBy="," linesTerminatedBy="\n" fieldsEnclosedBy='"' ignoreHeaderLines="1" rowType="http://rs.tdwg.org/dwc/terms/Identification">
   50      <files><location>indentifications.csv</location></files>
   51      <coreid index="0" />
   ..
   65    </extension-->
   66      
   67:     <!--extension encoding="ISO-8859-1" fieldsTerminatedBy="," linesTerminatedBy="\n" fieldsEnclosedBy='"' ignoreHeaderLines="1" rowType="http://rs.gbif.org/terms/1.0/Image">
   68        <files><location>images.csv</location></files>
   69        <coreid index="0" />

/Applications/Specify/config/specify_workbench_datamodel.xml:
  416    </table>
  417  
  418:   <!--uncomment this section and to upload container info.
  419    The container relationship with collectionobject is not supported
  420    Adding agent or other related data will require editing specify_workbench_upload_def.xml
  ...
  947      <field column="Prep Remarks 1" name="prepRemarks1" type="text" length="4096"/>
  948      
  949:     <!--no storage tree or preparationattributes for now-->
  950      <field column="Building 1" name="building1" type="java.lang.String" length="64"/>
  951      <field column="Collection 1" name="collection1" type="java.lang.String" length="64"/>
  ...
 1436        <field column="Superphylum" name="superphylum" type="java.lang.String" length="64"/>
 1437       <field column="Infradivision" name="infradivision" type="java.lang.String" length="64"/>
 1438:       <field column="Cohort" name="cohort" type="java.lang.String" length="64"/-->
 1439      <!-- ...for OU PBOT -->
 1440      

/Applications/Specify/config/specify_workbench_upload_def.xml:
 1235     	<field table="Taxon" name="superphylum" treename="taxon" maptofield="name" rankid="27"/>
 1236     	<field table="Taxon" name="infradivision" treename="taxon" maptofield="name" rankid="45"/>
 1237:    	<field table="Taxon" name="cohort" treename="taxon" maptofield="name" rankid="47"/-->
 1238      <!-- ...for OU PBOT -->
 1239  
 1240  
 1241  	<!-- for ATBI conversion -->
 1242:     <!--field table="Taxon" name="series" treename="taxon" maptofield="name" rankid="125"/>
 1243      <field table="Taxon" name="seriesAuthor" treename="taxon" maptofield="author" rankid="125"/>
 1244      <field table="Taxon" name="seriesCommonName" treename="taxon" maptofield="commonName" rankid="125"/>
 1245      <field table="Taxon" name="seriesSource" treename="taxon" maptofield="source" rankid="125"/>
 1246:     <field table="Taxon" name="seriesGUID" treename="taxon" maptofield="guid" rankid="125"/-->
 1247      
 1248      <field table="Taxon" name="superfamily" treename="taxon" maptofield="name" rankid="130"/>

/Applications/Specify/config/SymbiotaDwcMeta.xml:
   69    </extension>
   70      
   71:     <!--extension encoding="ISO-8859-1" fieldsTerminatedBy="," linesTerminatedBy="\n" fieldsEnclosedBy='"' ignoreHeaderLines="1" rowType="http://rs.gbif.org/terms/1.0/Image">
   72        <files><location>images.csv</location></files>
   73        <coreid index="0" />

/Applications/Specify/config/backstop/dataobj_formatters.xml:
  608              	<field>paleoContextName</field>
  609              	<!-- sep is apparently ignored if formatter is set? -->
  610:                 <!--field sep=", " formatter="GeologicTimePeriod">chronosStrat</field>
  611                  <field sep=", " formatter="LithoStrat">lithoStrat</field-->
  612                  <field sep=", " >chronosStrat.fullName</field>

/Applications/Specify/config/backstop/gbif.views.xml:
   38                      <cell type="label" labelfor="3"/>
   39                      <cell type="field" id="3" name="Name" uitype="text" cols="120"/>
   40:                     <!--cell type="label" labelfor="6"/>
   41:                     <cell type="field" id="6" name="addresses.State" uitype="text" cols="15"/-->
   42                  </row>
   43                  <!--

/Applications/Specify/config/backstop/global.views.xml:
  653                      <cell type="label" label="Name"/>
  654                      <cell type="field" id="3" name="name" uitype="text" cols="25"/>
  655:                     <!--cell type="label" labelfor="6"/>
  656:                     <cell type="field" id="6" name="addresses.State" uitype="text" cols="15"/-->
  657                  </row>
  658:                 <!--row>
  659                      <cell type="label" label="Country"/>
  660                      <cell type="field" id="Country" name="mailingAddress.country" uitype="text" cols="25"/>

/Applications/Specify/config/backstop/preferences.views.xml:
  538              
  539              <columnDef>p,4px,p,f:p:g</columnDef>
  540:             <!--rowDef>p,2px,p,10px, p,2px,p,10px, p,2px,p,10px, p,2px,p,10px, p,2px,p,10px, p,2px,p,10px, p,2px,p,10px, p,2px,p,10px, p,2px,p,10px</rowDef-->
  541  			<rowDef auto="true" cell="p" sep="2dlu"/>
  542                 

/Applications/Specify/config/backstop/search_config.xml:
   13          <table id="60" tableid="63" indexed="false" name="CollObjToPrep" priority="1" color="30, 144, 144">
   14              <joins>
   15:                 <!--join tableid="1" primary="true">collectionobject.CollectionObjectID</join-->
   16                  <join tableid="63" >preparation.PreparationID</join>
   17              </joins>

/Applications/Specify/config/backstop/system.views.xml:
  406                      <cell type="command" id="CopyToCB" name="CopyToCB" label="" initialize="icon=ClipboardCopy;size=24;tooltip=CPY_TO_CB_TT" ignore="true"/>
  407                  </row>
  408:                 <!--row>
  409                      <cell type="label" labelfor="4" label="Retype Password"/>
  410                      <cell type="field" id="4" name="password" uitype="text" cols="15"/>

/Applications/Specify/config/backstop/viewset_registry.xml:
    4      <file type="system" name="SystemSetup" title="System Setup" file="system.views.xml"/>
    5      <file type="system" name="Search"      title="Search"       file="search.views.xml"/>
    6:     <!--file type="system" name="gbif"        title="gbif"         file="gbif.views.xml" /-->
    7  
    8      <file type="system" name="Global"      title="Global"       file="global.views.xml"/>

/Applications/Specify/config/botany/botany.views.xml:
  778             
  779              <desc><![CDATA[Form for ExsiccataItem]]></desc>
  780:             <!--columnDef>p,2px,p,2px,100px,2px,p,2px,100px,2px,100px,p:g</columnDef-->
  781              <columnDef>p,2px,100px,2px,p,2px,100px,2px,p,p:g</columnDef>
  782              <rowDef auto="true" sep="2px" cell="p"/>

/Applications/Specify/config/botany/manager/botany.views.xml:
  778             
  779              <desc><![CDATA[Form for ExsiccataItem]]></desc>
  780:             <!--columnDef>p,2px,p,2px,100px,2px,p,2px,100px,2px,100px,p:g</columnDef-->
  781              <columnDef>p,2px,100px,2px,p,2px,100px,2px,p,p:g</columnDef>
  782              <rowDef auto="true" sep="2px" cell="p"/>

/Applications/Specify/config/common/common.views.xml:
 3068                      <cell type="field" id="st" name="status" uitype="combobox"/>
 3069                  </row>
 3070:                 <!--row>
 3071                      <cell type="label" labelfor="ldnumber1"/>
 3072                      <cell type="field" id="ldnumber1" name="number1" uitype="formattedtext" />
 ....
 3083                      <cell type="label" labelfor="rem"/>
 3084                      <cell type="field" id="rem" name="remarks" uitype="textareabrief" rows="2" colspan="14"/>
 3085:                     <!--cell type="subview" id="attachments" viewname="ObjectAttachment" name="deaccessionAttachments" initialize="btn=true;icon=AccessionAttachment;align=right"/-->
 3086                  </row>
 3087:                 <!--row>
 3088                      <cell type="subview" viewname="DeaccessionAgent" id="8" name="deaccessionAgents" desc="Agents" colspan="12" rows="2"/>
 3089                  </row-->
 3090:                 <!--row>
 3091                      <cell type="subview" viewname="DisposalSub" id="44" name="disposals" colspan="12"/>
 3092                  </row>
 ....
 3100                       <cell type="subview" viewname="PHSub" id="44" name="preparationHolders" colspan="12"/>
 3101                   </row>-->
 3102:                 <!--row>
 3103                      <cell type="separator" label="" colspan="7"/>
 3104                  </row-->
 3105:                 <!--row>
 3106                      <cell type="label" labelfor="10"/>
 3107                      <cell type="field" id="10" name="modifiedByAgent" uitype="label" readonly="true"  uifieldformatter="Agent"/>
 ....
 4358                       <cell type="subview" viewname="ExchangeOutPrep" id="10" name="exchangeOutPreps" defaulttype="table" colspan="13" rows="4"/>
 4359                  </row>
 4360:                 <!--row>
 4361                      <cell type="label" labelfor="dom"/>
 4362                      <cell type="field" id="dom" name="descriptionOfMaterial" uitype="text" colspan="10"/>
 ....
 5219                      <!--<cell type="label" labelfor="3"/>
 5220                      <cell type="field" id="3" name="giftDate" uitype="formattedtext" uifieldformatter="Date"  default="today"/>
 5221:                     <cell type="label" labelfor="4"/-->
 5222                  </row>
 5223                  <!--<row>
 ....
 5949                      <cell type="field" id="4" name="remarks" uitype="textareabrief" colspan="6" rows="2"/>
 5950                  </row>
 5951:                 <!--row>
 5952                      <cell type="subview" viewname="DisposalPreparation2" id="deaccPrep" name="disposalPreparations" colspan="9"/>
 5953                  </row-->

/Applications/Specify/config/common/interactionstask.xml:
   24    </entry>
   25  
   26:   <!--entry name="deaccession" table="deaccession" view="Deaccession" type="Interactions" action="NEW_DEACC" icon="Deaccession" isonleft="true"
   27           issrchsrv="false" order="0" enabled="true" visible="true" tooltip="">
   28    </entry-->
   ..
  246    </entry>
  247    
  248:   <!--entry name="returnloan" table="loan" label="RET_LOAN" type="Interactions" action="RET_LOAN" icon="Loan"
  249           issrchsrv="false" isonleft="true" order="0" enabled="true" visible="true" tooltip="">
  250      <draggableFlavors/>

/Applications/Specify/config/defaultperms/prefsperms.xml:
    1  <hashtable>
    2:   <!--entry>
    3      <string>ATTACHMENTS</string>
    4      <hashtable>

/Applications/Specify/config/invertebrate/invertebrate.views.xml:
  132              <altviews>
  133                  <altview name="CollectionRelRight Table View" viewdef="CollectionRelRight Table" mode="view"/>
  134:                 <!--altview name="CollectionRelRight Table Edit" viewdef="CollectionRelRight Table" mode="edit"/-->
  135                  <altview name="CollectionRelRight View" viewdef="CollectionRelRight" mode="view"/>
  136:                 <!--altview name="CollectionRelRight Edit" viewdef="CollectionRelRight" mode="edit" default="true"/-->
  137              </altviews>
  138          </view>

/Applications/Specify/config/invertebrate/manager/invertebrate.views.xml:
  132              <altviews>
  133                  <altview name="CollectionRelRight Table View" viewdef="CollectionRelRight Table" mode="view"/>
  134:                 <!--altview name="CollectionRelRight Table Edit" viewdef="CollectionRelRight Table" mode="edit"/-->
  135                  <altview name="CollectionRelRight View" viewdef="CollectionRelRight" mode="view"/>
  136:                 <!--altview name="CollectionRelRight Edit" viewdef="CollectionRelRight" mode="edit" default="true"/-->
  137              </altviews>
  138          </view>

57 matches across 22 files

Please sign in to comment.