Skip to content

#3529 Captions/depictions are not saved to Commons #3588

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 16 commits into from
Apr 9, 2020
Merged

#3529 Captions/depictions are not saved to Commons #3588

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
55a4d08
#3529 Captions/depictions are not saved to Commons - update flow to u…
macgills Mar 27, 2020
9d8d59d
#3529 Captions/depictions are not saved to Commons - fix invoking of …
macgills Mar 27, 2020
596f187
#3529 Captions/depictions are not saved to Commons - fix unit tests
macgills Mar 27, 2020
977c156
#3529 Captions/depictions are not saved to Commons - use constant for…
macgills Mar 27, 2020
13dac58
#3529 Captions/depictions are not saved to Commons - remove captions …
macgills Mar 27, 2020
5cb17f8
Merge branch 'structured-data' into macgills/3529-depiction-caption-u…
macgills Apr 7, 2020
63c51e5
#3529 Captions/depictions are not saved to Commons - delete unused Co…
macgills Apr 7, 2020
ce0bfa8
#3529 Captions/depictions are not saved to Commons - prefix id with M…
macgills Apr 7, 2020
1f0df96
#3529 Captions/depictions are not saved to Commons - make edits of de…
macgills Apr 8, 2020
c9c738f
Merge branch 'structured-data' into macgills/3529-depiction-caption-u…
macgills Apr 8, 2020
6d19e75
Merge branch 'structured-data' into macgills/3529-depiction-caption-u…
macgills Apr 9, 2020
50261ce
#3529 Captions/depictions are not saved to Commons - remove unused mo…
macgills Apr 9, 2020
4a7ebff
#3529 Captions/depictions are not saved to Commons - weaken type of c…
macgills Apr 9, 2020
e26f231
#3529 Captions/depictions are not saved to Commons - mark Media field…
macgills Apr 9, 2020
3a6ad68
#3529 Captions/depictions are not saved to Commons - add semi colon
macgills Apr 9, 2020
b6f9e69
#3529 Captions/depictions are not saved to Commons - fix test
macgills Apr 9, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
254 changes: 69 additions & 185 deletions app/src/main/java/fr/free/nrw/commons/Media.java
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions app/src/main/java/fr/free/nrw/commons/MediaDataExtractor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,9 +55,9 @@ private Media combineToMedia(final Media media, final Boolean deletionStatus, fi
final String caption, final JsonObject depiction) {
media.setDiscussion(discussion);
media.setCaption(caption);
media.setDepiction(formatDepictions(depiction));
media.setDepictionList(formatDepictions(depiction));
if (deletionStatus) {
media.setRequestedDeletion();
media.setRequestedDeletion(true);
}
return media;
}
Expand Down
Loading