s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Let the user specify an edit summary

Browse Source
This commit is contained in:
Antonin Delpeuch 2018-01-02 18:34:32 +01:00
parent 5faa432aa6
commit 5e99e0d2e3
4 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
extensions/wikidata/module/scripts/dialogs/perform-edits-dialog.html
View File

@ -8,6 +8,7 @@
</p>
<div class="wikibase-perform-edits-area">
<p>You are logged in as <span bind="loggedInUsername"></span>.</p>
<p>Edit summary: <input type="text" name="editSummary" bind="editSummary" value="#openrefine" /></p>
<div class="wikibase-login-buttons">
<button class="button cancel-button" bind="cancelButton">Cancel</button>
<button class="button button-primary" bind="performEditsButton">Perform edits</button>

1
extensions/wikidata/module/scripts/dialogs/perform-edits-dialog.js
View File

@ -24,6 +24,7 @@ PerformEditsDialog.launch = function(logged_in_username) {
{},
{ strategy : "SNAK_QUALIFIERS",
action: "MERGE",
summary: elmts.editSummary.val(),
},
{ includeEngine: true, cellsChanged: true, columnStatsChanged: true },
{ onDone:

4
extensions/wikidata/src/org/openrefine/wikidata/commands/PerformWikibaseEditsCommand.java
View File

@ -18,9 +18,11 @@ public class PerformWikibaseEditsCommand extends EngineDependentCommand {
throws Exception {
String strategy = request.getParameter("strategy");
String action = request.getParameter("action");
String summary = request.getParameter("summary");
return new PerformWikibaseEditsOperation(engineConfig,
DuplicateDetectionStrategy.valueOf(strategy),
OnDuplicateAction.valueOf(action));
OnDuplicateAction.valueOf(action),
summary);
}
}

27
extensions/wikidata/src/org/openrefine/wikidata/operations/PerformWikibaseEditsOperation.java
View File

@ -5,6 +5,7 @@ import java.io.LineNumberReader;
import java.io.Writer;
import java.util.HashMap;
import java.util.List;
import java.util.ArrayList;
import java.util.Map;
import java.util.Properties;
@ -24,6 +25,7 @@ import org.wikidata.wdtk.datamodel.interfaces.DataObjectFactory;
import org.wikidata.wdtk.datamodel.interfaces.EntityIdValue;
import org.wikidata.wdtk.datamodel.interfaces.ItemDocument;
import org.wikidata.wdtk.datamodel.interfaces.ItemIdValue;
import org.wikidata.wdtk.datamodel.interfaces.MonolingualTextValue;
import org.wikidata.wdtk.util.WebResourceFetcherImpl;
import org.wikidata.wdtk.wikibaseapi.ApiConnection;
import org.wikidata.wdtk.wikibaseapi.WikibaseDataEditor;
@ -59,14 +61,17 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {
private DuplicateDetectionStrategy strategy;
private OnDuplicateAction duplicateAction;
private String summary;
public PerformWikibaseEditsOperation(
JSONObject engineConfig,
DuplicateDetectionStrategy strategy,
OnDuplicateAction duplicateAction) {
OnDuplicateAction duplicateAction,
String summary) {
super(engineConfig);
this.strategy = strategy;
this.duplicateAction = duplicateAction;
this.summary = summary;
// getEngine(request, project);
}
@ -76,10 +81,15 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {
JSONObject engineConfig = obj.getJSONObject("engineConfig");
String strategy = obj.getString("duplicate_strategy");
String action = obj.getString("duplicate_action");
String summary = obj.getString("summary");
if (summary == null) {
summary = "#openrefine";
}
return new PerformWikibaseEditsOperation(
engineConfig,
DuplicateDetectionStrategy.valueOf(strategy),
OnDuplicateAction.valueOf(action));
OnDuplicateAction.valueOf(action),
summary);
}
@ -95,6 +105,8 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {
writer.value(strategy.name());
writer.key("duplicate_action");
writer.value(duplicateAction.name());
writer.key("summary");
writer.value(summary);
writer.key("engineConfig");
writer.value(getEngineConfig());
writer.endObject();
@ -111,7 +123,7 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {
project,
createEngine(project),
getBriefDescription(project),
"#openrefine"
summary
);
}
@ -223,6 +235,9 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {
// New item
if (update.getItemId().getId() == "Q0") {
NewEntityIdValue newCell = (NewEntityIdValue)update.getItemId();
update.normalizeLabelsAndAliases();
ItemDocument itemDocument = factory.getItemDocument(
update.getItemId(),
update.getLabels(),
@ -236,7 +251,11 @@ public class PerformWikibaseEditsOperation extends EngineDependentOperation {
newItemLibrary.setQid(newCell, createdDoc.getItemId().getId());
} else {
// Existing item
wbde.updateStatements(update.getItemId(),
wbde.updateTermsStatements(update.getItemId(),
update.getLabels(),
update.getDescriptions(),
update.getAliases(),
new ArrayList<MonolingualTextValue>(),
update.getAddedStatements(),
update.getDeletedStatements(), _summary);
}