mirror of
https://github.com/jellyfin/jellyfin-web
synced 2025-03-30 19:56:21 +00:00
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
This commit is contained in:
commit
16e88f9a52
2 changed files with 13 additions and 0 deletions
|
@ -143,6 +143,14 @@
|
||||||
</div>
|
</div>
|
||||||
<br />
|
<br />
|
||||||
<ul data-role="listview" class="ulForm">
|
<ul data-role="listview" class="ulForm">
|
||||||
|
<li>
|
||||||
|
<label for="txtDeleteLeftOverFiles">Episode Copy/Move </label>
|
||||||
|
<select name="copyOrMoveFile" id="copyOrMoveFile" data-mini="true">
|
||||||
|
<option value="true">Copy</option>
|
||||||
|
<option value="false">Move</option>
|
||||||
|
</select>
|
||||||
|
<div class="fieldDescription">Copy or move files from the "Watch Folder"</div>
|
||||||
|
</li>
|
||||||
<li>
|
<li>
|
||||||
<input type="checkbox" id="chkOverwriteExistingEpisodes" name="chkOverwriteExistingEpisodes" />
|
<input type="checkbox" id="chkOverwriteExistingEpisodes" name="chkOverwriteExistingEpisodes" />
|
||||||
<label for="chkOverwriteExistingEpisodes">Overwrite existing episodes</label>
|
<label for="chkOverwriteExistingEpisodes">Overwrite existing episodes</label>
|
||||||
|
|
|
@ -71,6 +71,9 @@
|
||||||
$('#txtMultiEpisodePattern', page).val(tvOptions.MultiEpisodeNamePattern).trigger('change');
|
$('#txtMultiEpisodePattern', page).val(tvOptions.MultiEpisodeNamePattern).trigger('change');
|
||||||
|
|
||||||
$('#txtDeleteLeftOverFiles', page).val(tvOptions.LeftOverFileExtensionsToDelete.join(';'));
|
$('#txtDeleteLeftOverFiles', page).val(tvOptions.LeftOverFileExtensionsToDelete.join(';'));
|
||||||
|
|
||||||
|
$('#copyOrMoveFile', page).val(tvOptions.CopyOriginalFile.toString()).selectmenu('refresh');
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
$(document).on('pageinit', "#libraryFileOrganizerPage", function () {
|
$(document).on('pageinit', "#libraryFileOrganizerPage", function () {
|
||||||
|
@ -150,6 +153,8 @@
|
||||||
var watchLocation = $('#txtWatchFolder', form).val();
|
var watchLocation = $('#txtWatchFolder', form).val();
|
||||||
tvOptions.WatchLocations = watchLocation ? [watchLocation] : [];
|
tvOptions.WatchLocations = watchLocation ? [watchLocation] : [];
|
||||||
|
|
||||||
|
tvOptions.CopyOriginalFile = $('#copyOrMoveFile', form).val();
|
||||||
|
|
||||||
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
|
ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult);
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue