From 02afd8a32edb13ea7fc2266ac80092ea15c0930c Mon Sep 17 00:00:00 2001 From: Alvin Li Date: Wed, 9 Oct 2013 15:52:53 +0800 Subject: * treat 'apps/utils' as regular django app; which used to store general tools for used in other apps * moved 'templatetags' from 'apps/indicator' to 'apps/utils' * '.gitignore' to ignore 'fixtures_bak' * moved js plugins from 'apps/indicator/static/plugins' to 'staticfiles/plugins' apps/recommend: * updated 'recommend.models'; o commented 'recommend.models.ResearchCombination' (not used) * implemented views 'add_edit_blog_info' and 'ajax_add_edit_configs'; * added pages 'templates/recommend/add_edit_blog_info.html', 'add_edit_blog_info_error.html'; o related css and javascripts files * added 'tools.py'; * added 'utils/tools.py' for placing generic functions; * deleted 'initial_data.json' (mv 'fixtures' to 'fixtures_bak'); * small fixes to 'indicator.models', 'sciblog.models' and 'sfaccount.views' * fixed automatically show 'proper_nouns' annotation in blog: recovered the line 'import signals' in 'sciblog.models' * added 'is_ok()' method for 'recommend.models.ResearchConfig'; --- 97suifangqa/apps/sciblog/managers.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to '97suifangqa/apps/sciblog/managers.py') diff --git a/97suifangqa/apps/sciblog/managers.py b/97suifangqa/apps/sciblog/managers.py index ae6beb3..8ec0773 100644 --- a/97suifangqa/apps/sciblog/managers.py +++ b/97suifangqa/apps/sciblog/managers.py @@ -10,13 +10,13 @@ class AnnotationManager(models.Manager): u''' 获取段落注释 ''' - return self.filter(type = 0) + return self.filter(type = self.PARAGRAPH) def propernouns(self): u''' 获取专有名词 ''' - return self.filter(type = 1) + return self.filter(type = self.PROPER_NOUN) def all_json(self, user = AnonymousUser()): u''' -- cgit v1.2.2