diff -r c078d8a04d76 -r 6784c4350b41 lib/folders.py
--- a/lib/folders.py Wed Dec 31 01:53:22 2008 -0500
+++ b/lib/folders.py Wed Dec 31 15:41:32 2008 -0500
@@ -1,21 +1,5 @@
from templates import Template
from keywords import set_selection, sort_keywords
-from __future__ import nested_scopes
-
-def do_folder_action(db, form, folder):
- if form['action'].value == 'add':
- if form.has_key('sel'):
- keyword = int(form['sel'].value)
- db.add_folder(keyword, folder)
- print "Folder successfully add."
- return keyword
- elif form['action'].value == 'delete':
- if form.has_key('delete'):
- keyword = int(form['delete'].value)
- db.remove_folders(keyword)
- print "Folder successfully remove."
- return keyword
- return -1
def sort_kw_with_removed(l, r):
result = l['removed'] - r['removed']
@@ -39,11 +23,8 @@
def do_folders(db, prefs, form, status, status_msg):
folder = 0
- if form:
- if form.has_key('folder'):
- folder = int(form['folder'].value)
- if form.has_key('action'):
- do_folder_action(db, form, folder)
+ if form.has_key('folder'):
+ folder = int(form['folder'].value)
parents = db.get_folder_parents_and_self(folder)
parents.reverse()
children = db.get_subfolders(folder)