mirrors/deluge
0
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-08-05 16:08:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

[Web] Fix peers tab failing to set flag location

Browse source 
The request.country returns bytes not a string so decode.
This commit is contained in:
thelamer 2019-06-10 05:50:06 -07:00 • committed by Calum Lind
commit a34543100c
2 changed files with 10 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
CHANGELOG.md
View file

@ -1,5 +1,11 @@
# Changelog # Changelog
## 2.0.3 (WiP)
### Web UI
- Fix TypeError in Peers Tab setting country flag.
## 2.0.2 (2019-06-08) ## 2.0.2 (2019-06-08)
### Packaging ### Packaging
@ -47,7 +53,7 @@
- Add Option To Specify Outgoing Connection Interface. - Add Option To Specify Outgoing Connection Interface.
- Fix potential for host_id collision when creating hostlist entries. - Fix potential for host_id collision when creating hostlist entries.
### GtkUI ### Gtk UI
- Ported to GTK3 (3rd-party plugins will need updated). - Ported to GTK3 (3rd-party plugins will need updated).
- Allow changing ownership of torrents. - Allow changing ownership of torrents.
@ -62,7 +68,7 @@
- Top: Ctrl+Alt+Shift+Up - Top: Ctrl+Alt+Shift+Up
- Bottom: Ctrl+Alt+Shift+Down - Bottom: Ctrl+Alt+Shift+Down
### WebUI ### Web UI
- Server (deluge-web) now daemonizes by default, use '-d' or '--do-not-daemonize' to disable. - Server (deluge-web) now daemonizes by default, use '-d' or '--do-not-daemonize' to disable.
- Fixed the '--base' option to work for regular use, not just with reverse proxies. - Fixed the '--base' option to work for regular use, not just with reverse proxies.

3
deluge/ui/web/server.py
View file

@ -202,7 +202,8 @@ class Flag(resource.Resource):
return self return self
def render(self, request): def render(self, request):
path = ('ui', 'data', 'pixmaps', 'flags', request.country.lower() + '.png') flag = request.country.decode('utf-8').lower() + '.png'
path = ('ui', 'data', 'pixmaps', 'flags', flag)
filename = common.resource_filename('deluge', os.path.join(*path)) filename = common.resource_filename('deluge', os.path.join(*path))
if os.path.exists(filename): if os.path.exists(filename):
request.setHeader( request.setHeader(