mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Merge remote-tracking branch and fix conflicts

Browse source
This commit is contained in:
ferferga 2020-04-03 00:54:22 +02:00
commit 60329961b5
3 changed files with 21 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/components/itemidentifier/itemidentifier.js
View file

@ -296,8 +296,6 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
var html = "";
var providerIds = item.ProviderIds || {};
for (var i = 0, length = idList.length; i < length; i++) {
var idInfo = idList[i];
@ -306,9 +304,12 @@ define(["dialogHelper", "loading", "connectionManager", "require", "globalize",
html += '<div class="inputContainer">';
var idLabel = globalize.translate("LabelDynamicExternalId", idInfo.Name);
var fullName = idInfo.Name;
if (idInfo.Type) {
fullName = idInfo.Name + " " + globalize.translate(idInfo.Type);
}
var value = providerIds[idInfo.Key] || "";
var idLabel = globalize.translate("LabelDynamicExternalId", idInfo.Name);
html += '<input is="emby-input" class="txtLookupId" data-providerkey="' + idInfo.Key + '" id="' + id + '" label="' + idLabel + '"/>';