|
|
|
@ -1117,7 +1117,6 @@ public class CKANPackage extends CKAN implements Moderated {
|
|
|
|
|
* --------------------------------------------------------------------------------------------------------
|
|
|
|
|
*
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
protected CMItemStatus getCMItemStatus() {
|
|
|
|
|
|
|
|
|
|
String cmItemStatusString = CMItemStatus.APPROVED.getValue();
|
|
|
|
@ -1169,6 +1168,15 @@ public class CKANPackage extends CKAN implements Moderated {
|
|
|
|
|
if(moderationEnabled && moderationThread==null) {
|
|
|
|
|
moderationThread = ModerationThread.getDefaultInstance();
|
|
|
|
|
moderationThread.setCKANUser(ckanUser);
|
|
|
|
|
|
|
|
|
|
String itemAuthorCkanUsername = "";
|
|
|
|
|
JsonNode jsonNode = getExtraField(result, Moderated.SYSTEM_CM_ITEM_AUTHOR);
|
|
|
|
|
if(jsonNode!=null) {
|
|
|
|
|
itemAuthorCkanUsername = jsonNode.asText();
|
|
|
|
|
moderationThread.setItemAuthorCkanUsername(itemAuthorCkanUsername);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return moderationEnabled;
|
|
|
|
|
}
|
|
|
|
@ -1372,6 +1380,7 @@ public class CKANPackage extends CKAN implements Moderated {
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
addExtraField(jsonNode, Moderated.SYSTEM_CM_ITEM_VISIBILITY, cmItemVisibility.getValue());
|
|
|
|
|
addExtraField(jsonNode, Moderated.SYSTEM_CM_ITEM_AUTHOR, ckanUser.getName());
|
|
|
|
|
|
|
|
|
|
((ObjectNode) jsonNode).put(PRIVATE_KEY, true);
|
|
|
|
|
/*
|
|
|
|
|