Merge branch 'develop'

Author: benanhalt

config/mammal/mammal.views.xml

@@ -138,7 +138,7 @@
                     <cell type="label" labelfor="3"/>
                     <cell type="field" id="3" name="accession" uitype="querycbx" initialize="name=AccessionCO;title=AccessionCO" isrequired="false"/>
                     <cell type="label" labelfor="14"/>
-                    <cell type="field" id="14" name="altCatalogNumber" uitype="formattedtext"/>
+                    <cell type="field" id="14" name="altCatalogNumber" uitype="text"/>
                 </row>
                 <row>
                     <cell type="label" labelfor="4"/>

config/mammal/manager/mammal.views.xml

@@ -138,7 +138,7 @@
                     <cell type="label" labelfor="3"/>
                     <cell type="field" id="3" name="accession" uitype="querycbx" initialize="name=AccessionCO;title=AccessionCO" isrequired="false"/>
                     <cell type="label" labelfor="14"/>
-                    <cell type="field" id="14" name="altCatalogNumber" uitype="formattedtext"/>
+                    <cell type="field" id="14" name="altCatalogNumber" uitype="text"/>
                 </row>
                 <row>
                     <cell type="label" labelfor="4"/>

src/edu/ku/brc/af/ui/forms/ViewFactory.java

@@ -1401,7 +1401,7 @@ protected boolean createItem(final DBTableInfo                 parentTableInfo,
                         if (perm != null)
                         {
                             //PermissionSettings.dumpPermissions("QCBX: "+tblInfo.getShortClassName(), perm.getOptions());
-                            if (perm.isViewOnly() || !perm.canView())
+                            if (!perm.canView())
                             {
                                 uiType = FormCellField.FieldType.textfieldinfo;
                             }

src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java

@@ -1136,7 +1136,7 @@ public final void setParentTables(Vector<Vector<Uploader.ParentTableEntry>> pare
                 {
                     pte.getImportTable().addChild(this);
                 }
-                else if (needToMatchChildren() && pte.getImportTable().isOneToOneChild())
+                else if (needToMatchChildren(true) && pte.getImportTable().isOneToOneChild())
                 {
                 	addChild(pte.getImportTable());
                 }
@@ -2645,7 +2645,7 @@ else if (child.getTblClass().equals(CollectingEventAuthorization.class))
                 }
             }
         }
-        if (tblClass.equals(CollectingTrip.class)) {
+        else if (tblClass.equals(CollectingTrip.class)) {
             for (UploadTable child : specialChildren) {
                 logDebug(child.getTable().getName());
                 if (child.getTblClass().equals(CollectingTripAttribute.class))
@@ -3069,20 +3069,24 @@ else if (tblClass.equals(Locality.class)) {
         return result;
     }
 
+    protected boolean needToMatchChildren() {
+        return needToMatchChildren(false);
+    }
     /**
      *
      * @return
      */
-    protected boolean needToMatchChildren()
+    protected boolean needToMatchChildren(boolean buildingUploader)
     {
-        if (updateMatches) {
+        if (!buildingUploader && uploader.isUpdateUpload()) {
             return !matchUsingExportedRecord();
         }
 
         // temporary fix. Really should determine based on cascade rules and the fields in the
         // dataset.
-        return !skipChildrenMatching.get() &&
-        	(tblClass.equals(CollectingEvent.class) 
+        return (buildingUploader || !skipChildrenMatching.get()) &&
+        	(tblClass.equals(CollectingEvent.class)
+                || tblClass.equals(CollectingTrip.class)
         		|| tblClass.equals(Accession.class)
                 || tblClass.equals(Agent.class)
         		|| tblClass.equals(CollectionObject.class)