d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #10557 from Chocobo1/rootfolder 

Fix "Create subfolder" option is not working in WebUI
adaptive-webui-19844
Mike Tzou 6 years ago committed by GitHub
parent
2d7b833ae6 8aa8b19f37
commit
d001927d47
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 31 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 18
      src/webui/www/private/download.html
  2. 9
      src/webui/www/private/scripts/download.js
  3. 18
      src/webui/www/private/upload.html

18
src/webui/www/private/download.html
Unescape View File

@ -72,11 +72,11 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="start_torrent">QBT_TR(Start torrent)QBT_TR[CONTEXT=AddNewTorrentDialog]</label> <label for="startTorrent">QBT_TR(Start torrent)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
</td> </td>
<td> <td>
<input type="checkbox" id="start_torrent" checked="checked" /> <input type="hidden" id="startTorrentHidden" name="paused" />
<input type="hidden" id="add_paused" name="paused" value="false" readonly /> <input type="checkbox" id="startTorrent" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -89,10 +89,11 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="root_folder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</label> <label for="rootFolder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
</td> </td>
<td> <td>
<input type="checkbox" id="root_folder" name="root_folder" value="true" checked="checked" /> <input type="hidden" id="rootFolderHidden" name="root_folder" />
<input type="checkbox" id="rootFolder" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -151,6 +152,9 @@
var submitted = false; var submitted = false;
$('downloadForm').addEventListener("submit", function() { $('downloadForm').addEventListener("submit", function() {
$('startTorrentHidden').value = $('startTorrent').checked ? 'false' : 'true';
$('rootFolderHidden').value = $('rootFolder').checked ? 'true' : 'false';
$('download_spinner').style.display = "block"; $('download_spinner').style.display = "block";
submitted = true; submitted = true;
}); });
@ -159,10 +163,6 @@
if (submitted) if (submitted)
window.parent.closeWindows(); window.parent.closeWindows();
}); });
$('start_torrent').addEventListener('change', function() {
$('add_paused').value = !$('start_torrent').checked;
});
</script> </script>
<div id="download_spinner" class="mochaSpinner"></div> <div id="download_spinner" class="mochaSpinner"></div>
</body> </body>

9
src/webui/www/private/scripts/download.js
Unescape View File

@ -55,11 +55,13 @@ var getPreferences = function() {
alert("Could not contact qBittorrent"); alert("Could not contact qBittorrent");
}, },
onSuccess: function(pref) { onSuccess: function(pref) {
if (pref) { if (!pref)
return;
defaultSavePath = pref.save_path; defaultSavePath = pref.save_path;
$('savepath').setProperty('value', defaultSavePath); $('savepath').setProperty('value', defaultSavePath);
$('root_folder').checked = pref.create_subfolder_enabled; $('rootFolder').checked = pref.create_subfolder_enabled;
$('start_torrent').checked = !pref.start_paused_enabled; $('startTorrent').checked = !pref.start_paused_enabled;
if (pref.auto_tmm_enabled == 1) { if (pref.auto_tmm_enabled == 1) {
$('autoTMM').selectedIndex = 1; $('autoTMM').selectedIndex = 1;
@ -69,7 +71,6 @@ var getPreferences = function() {
$('autoTMM').selectedIndex = 0; $('autoTMM').selectedIndex = 0;
} }
} }
}
}).send(); }).send();
}; };

18
src/webui/www/private/upload.html
Unescape View File

@ -60,11 +60,11 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="start_torrent">QBT_TR(Start torrent)QBT_TR[CONTEXT=AddNewTorrentDialog]</label> <label for="startTorrent">QBT_TR(Start torrent)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
</td> </td>
<td> <td>
<input type="checkbox" id="start_torrent" checked="checked" /> <input type="hidden" id="startTorrentHidden" name="paused" />
<input type="hidden" id="add_paused" name="paused" value="false" readonly /> <input type="checkbox" id="startTorrent" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -77,10 +77,11 @@
</tr> </tr>
<tr> <tr>
<td> <td>
<label for="root_folder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</label> <label for="rootFolder">QBT_TR(Create subfolder)QBT_TR[CONTEXT=AddNewTorrentDialog]</label>
</td> </td>
<td> <td>
<input type="checkbox" id="root_folder" name="root_folder" value="true" checked="checked" /> <input type="hidden" id="rootFolderHidden" name="root_folder" />
<input type="checkbox" id="rootFolder" />
</td> </td>
</tr> </tr>
<tr> <tr>
@ -127,6 +128,9 @@
var submitted = false; var submitted = false;
$('uploadForm').addEventListener("submit", function() { $('uploadForm').addEventListener("submit", function() {
$('startTorrentHidden').value = $('startTorrent').checked ? 'false' : 'true';
$('rootFolderHidden').value = $('rootFolder').checked ? 'true' : 'false';
$('upload_spinner').style.display = "block"; $('upload_spinner').style.display = "block";
submitted = true; submitted = true;
}); });
@ -135,10 +139,6 @@
if (submitted) if (submitted)
window.parent.closeWindows(); window.parent.closeWindows();
}); });
$('start_torrent').addEventListener('change', function() {
$('add_paused').value = !$('start_torrent').checked;
});
</script> </script>
<div id="upload_spinner" class="mochaSpinner"></div> <div id="upload_spinner" class="mochaSpinner"></div>
</body> </body>

Write Preview
Loading…
Cancel
Save