diff -r 31271426f879 -r 004a32370ba5 lib/actions/add.py --- a/lib/actions/add.py Sat Dec 27 20:23:39 2008 -0500 +++ b/lib/actions/add.py Sun Dec 28 12:24:02 2008 -0500 @@ -40,7 +40,7 @@ kw = unique(kw) return kw -def edit(db, prefs, form): +def edit(db, prefs, form, id): name = url = "" if form.has_key("ctitle"): name = form["ctitle"].value @@ -52,7 +52,7 @@ 'id' : elem[0], 'keyword' : elem[1], 'checked' : 0 }, kw) - print_edit(keywords, title, url, prefs) + print_edit(id, kw, name, url, prefs) def confirm(step, bk, kw, prefs): tmpl = Template("add_confirm.tmpl", prefs) @@ -70,12 +70,12 @@ tmpl.set("desc", bk.desc) print tmpl.process() -def print_edit(keywords, title, url, prefs): +def print_edit(id, keywords, title, url, prefs): tmpl = Template("add_bk.tmpl", prefs) tmpl.set('ctitle', title) tmpl.set('curl', url) tmpl.set('desc', '') - tmpl.set('bkid', -1) + tmpl.set('bkid', id) tmpl.set('Keywords', keywords) print tmpl.process() @@ -94,9 +94,9 @@ bk = get_bk_from_form(form) kw = get_unique_keywords(form, db) db.update_bookmark(bk) - load_index(db, prefs) + load_index(db, prefs, form, "result", "Bookmark update") elif step == 'cancel' or (action == 'delete' and id == -1): - load_index(db, prefs) + load_index(db, prefs, form, "err", "Operation cancel") else: if step == 'update': bk = get_bk_from_form(form)