diff options
| author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-04-24 18:28:12 -0400 |
|---|---|---|
| committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2011-04-24 18:28:12 -0400 |
| commit | 2f43501216ff63c7d4ea761ee6692824f025d4e5 (patch) | |
| tree | 4fc6acc4ee712f9a75ffb0d7dc55726d0012ae1d | |
| parent | a78733da96750f0d3db8c246e04a5ef1e3dfa724 (diff) | |
| download | askbot-2f43501216ff63c7d4ea761ee6692824f025d4e5.tar.gz askbot-2f43501216ff63c7d4ea761ee6692824f025d4e5.tar.bz2 askbot-2f43501216ff63c7d4ea761ee6692824f025d4e5.zip | |
fixed two bugs: one re-enabled deletion of interesting-ignored tag, second - javascript in refreshing question list upon change of display tag filter setting
| -rw-r--r-- | askbot/models/__init__.py | 3 | ||||
| -rw-r--r-- | askbot/skins/default/media/js/live_search.js | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/askbot/models/__init__.py b/askbot/models/__init__.py index b11cb976..983188a6 100644 --- a/askbot/models/__init__.py +++ b/askbot/models/__init__.py @@ -876,8 +876,9 @@ def user_mark_tags( * ``action`` - eitrer "add" or "remove" """ cleaned_wildcards = list() - assert(reason in ('good', 'bad')) assert(action in ('add', 'remove')) + if action == 'add': + assert(reason in ('good', 'bad')) if wildcards: cleaned_wildcards = self.update_wildcard_tag_selections( action = action, diff --git a/askbot/skins/default/media/js/live_search.js b/askbot/skins/default/media/js/live_search.js index 0f6b79c3..39ed2d14 100644 --- a/askbot/skins/default/media/js/live_search.js +++ b/askbot/skins/default/media/js/live_search.js @@ -493,6 +493,7 @@ var liveSearch = function(){ return { refresh: function(){ + query = $('input#keywords'); refresh_main_page(); }, init: function(mode){ |