Browse Source

Select folder, show root

pull/358/merge
Ruud 13 years ago
parent
commit
7fa06eade4
  1. 6
      couchpotato/core/plugins/browser/main.py
  2. 2
      couchpotato/static/scripts/page/settings.js

6
couchpotato/core/plugins/browser/main.py

@ -62,13 +62,15 @@ class FileBrowser(Plugin):
def view(self):
path = getParam('path', '/')
try:
dirs = self.getDirectories(path = getParam('path', '/'), show_hidden = getParam('show_hidden', True))
dirs = self.getDirectories(path = path, show_hidden = getParam('show_hidden', True))
except:
dirs = []
return jsonified({
'is_root': getParam('path', '/') == '/',
'is_root': path == '/' or not path,
'empty': len(dirs) == 0,
'dirs': dirs,
})

2
couchpotato/static/scripts/page/settings.js

@ -702,7 +702,7 @@ Option.Directory = new Class({
var v = self.input.get('text');
var previous_dir = self.getParentDir();
if(previous_dir != v && previous_dir.length > 1){
if(previous_dir != v && previous_dir.length >= 1 && !json.is_root){
self.back_button.set('data-value', previous_dir)
self.back_button.set('html', '« '+self.getCurrentDirname(previous_dir))
self.back_button.show()

Loading…
Cancel
Save