Permalink
Browse files

Select folder, show root

  • Loading branch information...
1 parent 30ef0e4 commit 7fa06eade472fdc36d3882a0a214287b4c2f871c @RuudBurger RuudBurger committed May 25, 2012
Showing with 5 additions and 3 deletions.
  1. +4 −2 couchpotato/core/plugins/browser/main.py
  2. +1 −1 couchpotato/static/scripts/page/settings.js
@@ -62,13 +62,15 @@ def getDriveLetters(self):
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,
})
@@ -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()

0 comments on commit 7fa06ea

Please sign in to comment.