hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-07 01:54:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

[Task 70080] applied feedback to the scripts prototype

Browse Source
This commit is contained in:
Raf Ponsaerts
2020-05-06 11:02:47 +02:00
parent 4031e41a5d
commit 861cdfb2b8
6 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataExportScriptConfiguration.java
View File

@@ -45,7 +45,7 @@ public class MetadataExportScriptConfiguration<T extends MetadataExport> extends
try {
return authorizeService.isAdmin(context);
} catch (SQLException e) {
throw new RuntimeException("SQLException occured", e);
throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
}
}

2
dspace-api/src/main/java/org/dspace/app/bulkedit/MetadataImportScriptConfiguration.java
View File

@@ -45,7 +45,7 @@ public class MetadataImportScriptConfiguration<T extends MetadataImport> extends
try {
return authorizeService.isAdmin(context);
} catch (SQLException e) {
throw new RuntimeException("SQLException occured", e);
throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
}
}

2
dspace-api/src/main/java/org/dspace/discovery/IndexDiscoveryScriptConfiguration.java
View File

@@ -35,7 +35,7 @@ public class IndexDiscoveryScriptConfiguration<T extends IndexClient> extends Sc
try {
return authorizeService.isAdmin(context);
} catch (SQLException e) {
throw new RuntimeException("SQLException occured", e);
throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
}
}

2
dspace-api/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java
View File

@@ -44,7 +44,7 @@ public class MockDSpaceRunnableScriptConfiguration<T extends MockDSpaceRunnableS
try {
return authorizeService.isAdmin(context);
} catch (SQLException e) {
throw new RuntimeException("SQLException occurred", e);
throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
}
}

4
dspace-server-webapp/src/main/java/org/dspace/app/rest/repository/ScriptRestRepository.java
View File

@@ -102,10 +102,6 @@ public class ScriptRestRepository extends DSpaceRestRepository<ScriptRest, Strin
if (!scriptToExecute.isAllowedToExecute(context)) {
throw new AuthorizeException("Current user is not eligible to execute script with name: " + scriptName);
}
EPerson currentUser = context.getCurrentUser();
// if (currentUser != null) {
// scriptToExecute.setEpersonIdentifier(currentUser.getID());
// }
RestDSpaceRunnableHandler restDSpaceRunnableHandler = new RestDSpaceRunnableHandler(
context.getCurrentUser(), scriptName, dSpaceCommandLineParameters);
List<String> args = constructArgs(dSpaceCommandLineParameters);

2
dspace-server-webapp/src/test/java/org/dspace/scripts/MockDSpaceRunnableScriptConfiguration.java
View File

@@ -44,7 +44,7 @@ public class MockDSpaceRunnableScriptConfiguration<T extends MockDSpaceRunnableS
try {
return authorizeService.isAdmin(context);
} catch (SQLException e) {
throw new RuntimeException("SQLException occured", e);
throw new RuntimeException("SQLException occurred when checking if the current user is an admin", e);
}
}