jenkins-bot has submitted this change and it was merged.
Change subject: Provide sensible name for flickr imports with empty title
......................................................................
Provide sensible name for flickr imports with empty title
Followup to patch 42775
Bug: 43320
Change-Id: Id1b7f45f08f727a999d700863bb0830c73e389c5
---
M resources/mw.FlickrChecker.js
1 file changed, 4 insertions(+), 3 deletions(-)
Approvals:
Kaldari: Looks good to me, approved
jenkins-bot: Verified
diff --git a/resources/mw.FlickrChecker.js b/resources/mw.FlickrChecker.js
index 68cbef8..49f862f 100644
--- a/resources/mw.FlickrChecker.js
+++ b/resources/mw.FlickrChecker.js
@@ -87,15 +87,16 @@
var licenseValue =
license.licenseValue;
var sameTitleExists =
false;
if ( licenseValue !==
'invalid' ) {
-
$.each(
_this.imageUploads, function ( index, image ) {
if (
image.name === item.title + '.jpg' ) {
sameTitleExists = true;
return false; // Break out of the loop
}
} );
- // if the photo
is untitled or a same title exists, generate a title
- if ( item.title
=== '' || sameTitleExists ) {
+ // if the photo
is untitled or the same title exists, generate a title
+ if ( item.title
=== '' ) {
+
fileName = item.ownername + ' - ' + item.id + '.jpg';
+ } else if (
sameTitleExists ) {
fileName = item.title + ' - ' + item.id + '.jpg';
} else {
fileName = item.title + '.jpg';
--
To view, visit https://gerrit.wikimedia.org/r/58998
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id1b7f45f08f727a999d700863bb0830c73e389c5
Gerrit-PatchSet: 2
Gerrit-Project: mediawiki/extensions/UploadWizard
Gerrit-Branch: master
Gerrit-Owner: Yuvipanda <[email protected]>
Gerrit-Reviewer: Kaldari <[email protected]>
Gerrit-Reviewer: MarkTraceur <[email protected]>
Gerrit-Reviewer: Nischayn22 <[email protected]>
Gerrit-Reviewer: Yuvipanda <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
