Skip to content

Commit

Permalink
Merge branch 'fix/import' into 'develop'
Browse files Browse the repository at this point in the history 
OEQ-2052 - fix: import key resoruce issue

See merge request edalex-group/development/oeq/openequella!427
  • Loading branch information
@edalex-yinzi
edalex-yinzi committed Aug 1, 2024
2 parents 6a9cfa8 + 02c8407 commit 2510ac7
Show file tree
Hide file tree
Showing 30 changed files with 48 additions and 39 deletions.
2 changes: 1 addition & 1 deletion ...lugins/Core/com.equella.core/src/com/tle/core/hierarchy/convert/KeyResourceConverter.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ public void doExport(TemporaryFileHandle staging, Institution institution, Conve
final SubTemporaryFile keyResourceExportFolder =
new SubTemporaryFile(staging, KEY_RESOURCES_IMPORT_EXPORT_FOLDER);
// write out the format details
xmlHelper.writeExportFormatXmlFile(keyResourceExportFolder, true);
xmlHelper.writeExportFormatXmlFile(keyResourceExportFolder, false);

hierarchyDao
.getAllKeyResources(institution)
Expand Down
4 changes: 2 additions & 2 deletions autotest/Tests/tests/acl/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/asc/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/cal/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/canvas/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/contribute/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
3 changes: 3 additions & 0 deletions autotest/Tests/tests/dinuk/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/facet/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/fiveo/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/flakey/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
3 changes: 3 additions & 0 deletions autotest/Tests/tests/flickrindepth/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/hierarchy/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/ldap/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/ldapad/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
3 changes: 3 additions & 0 deletions autotest/Tests/tests/login/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/manageresources/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/moodle/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/myresources/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/replicated/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/reporting/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
0 ...st/institution/keyresources/77/113997.xml → .../rest/institution/keyresources/113997.xml
View file
File renamed without changes.
0 ...st/institution/keyresources/80/116944.xml → .../rest/institution/keyresources/116944.xml
View file
File renamed without changes.
0 ...st/institution/keyresources/28/117276.xml → .../rest/institution/keyresources/117276.xml
View file
File renamed without changes.
0 ...est/institution/keyresources/12/15116.xml → ...s/rest/institution/keyresources/15116.xml
View file
File renamed without changes.
0 ...st/institution/keyresources/95/161887.xml → .../rest/institution/keyresources/161887.xml
View file
File renamed without changes.
0 ...st/institution/keyresources/96/161888.xml → .../rest/institution/keyresources/161888.xml
View file
File renamed without changes.
0 ...t/institution/keyresources/127/172415.xml → .../rest/institution/keyresources/172415.xml
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions autotest/Tests/tests/rest/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/vanilla/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
4 changes: 2 additions & 2 deletions autotest/Tests/tests/workflow/institution/keyresources/export.fmt
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
<com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>true</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>
<bucketed>false</bucketed>
</com.tle.core.institution.convert.AbstractConverter_-FormatFile>

0 comments on commit 2510ac7

Please sign in to comment.