From 7fbc879538d721c9ed4caf1f14ef9f47e1b010a2 Mon Sep 17 00:00:00 2001 From: timo Date: Fri, 22 Mar 2019 12:56:15 -0500 Subject: [PATCH 1/5] updated mammal.views from Theresa --- config/mammal/mammal.views.xml | 2 +- config/mammal/manager/mammal.views.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config/mammal/mammal.views.xml b/config/mammal/mammal.views.xml index a6460fb7ef..f4ae630835 100644 --- a/config/mammal/mammal.views.xml +++ b/config/mammal/mammal.views.xml @@ -138,7 +138,7 @@ - + diff --git a/config/mammal/manager/mammal.views.xml b/config/mammal/manager/mammal.views.xml index a6460fb7ef..f4ae630835 100644 --- a/config/mammal/manager/mammal.views.xml +++ b/config/mammal/manager/mammal.views.xml @@ -138,7 +138,7 @@ - + From 64b8d7834b4fc9fcd363e906620dd03b83b6b37c Mon Sep 17 00:00:00 2001 From: timo Date: Fri, 22 Mar 2019 15:10:28 -0500 Subject: [PATCH 2/5] fix for regression created by fix for #222 --- .../ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java b/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java index 60688a5ddb..260c9203f4 100755 --- a/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java +++ b/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java @@ -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)) From 11d1884aee7ed83f6306baf561ab85028b75516f Mon Sep 17 00:00:00 2001 From: timo Date: Mon, 25 Mar 2019 14:57:36 -0500 Subject: [PATCH 3/5] fix for cea and cta matching. #277 --- .../tasks/subpane/wb/wbuploader/UploadTable.java | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java b/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java index 260c9203f4..3e1350b70f 100755 --- a/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java +++ b/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java @@ -1136,7 +1136,7 @@ public final void setParentTables(Vector> pare { pte.getImportTable().addChild(this); } - else if (needToMatchChildren() && pte.getImportTable().isOneToOneChild()) + else if (needToMatchChildren(true) && pte.getImportTable().isOneToOneChild()) { addChild(pte.getImportTable()); } @@ -3069,19 +3069,22 @@ 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() && + return (buildingUploader || !skipChildrenMatching.get()) && (tblClass.equals(CollectingEvent.class) || tblClass.equals(Accession.class) || tblClass.equals(Agent.class) From 4fca738089783c7520b726ef56a8cf3675419555 Mon Sep 17 00:00:00 2001 From: timo Date: Mon, 25 Mar 2019 16:08:36 -0500 Subject: [PATCH 4/5] fix for cta matching. #277 --- .../brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java b/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java index 3e1350b70f..adfe7a8ae6 100755 --- a/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java +++ b/src/edu/ku/brc/specify/tasks/subpane/wb/wbuploader/UploadTable.java @@ -3085,7 +3085,8 @@ protected boolean needToMatchChildren(boolean buildingUploader) // temporary fix. Really should determine based on cascade rules and the fields in the // dataset. return (buildingUploader || !skipChildrenMatching.get()) && - (tblClass.equals(CollectingEvent.class) + (tblClass.equals(CollectingEvent.class) + || tblClass.equals(CollectingTrip.class) || tblClass.equals(Accession.class) || tblClass.equals(Agent.class) || tblClass.equals(CollectionObject.class) From acc8b5937c3cd7a3ec2b31967024898c37152075 Mon Sep 17 00:00:00 2001 From: timo Date: Wed, 27 Mar 2019 14:13:51 -0500 Subject: [PATCH 5/5] fix for query combo box permissions issue. #278 --- src/edu/ku/brc/af/ui/forms/ViewFactory.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/edu/ku/brc/af/ui/forms/ViewFactory.java b/src/edu/ku/brc/af/ui/forms/ViewFactory.java index 89a6a28d09..4497f7fda8 100644 --- a/src/edu/ku/brc/af/ui/forms/ViewFactory.java +++ b/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; }