* merged commits from 'maxwell lou' by time '20131028_09:52';HEADmaster

* moved 'ValueKind' model from 'recommend/models' to 'indicator/models'
* added field 'type' for 'indicator.models.Indicator'
* added field 'kind' for 'indicator.models.IndicatorRecord',
  'InnateConfine'
* updated methods for models 'Indicator', 'IndicatorRecord',
  'InnateConfine'
* updated views and templates for 'apps/indicator'
* added 'INDICATOR_RECOMMEND_PERIOD' into 'settings.py'
* added 'type' field for 'indicator.models.Indicator' in
  'search_indexes.py'
* added a confirm step for 'EditHistoryData' page when delete a record

* removed dir 'backupdata'; 'queries.txt' moved to 'backup' dir
* moved *.json to 'backup' dir
* removed 'apps/managers*.py'
* updated 'indicator/popup/IndexDesc.html'
* created dir 'apps/indicator/obsolete';
* moved 'indicator/forms.py' to dir 'obsolete';
* splitted views related forms.py from 'views.py', and placed in
  'obsolete/views_forms.py'

* loadded newest data into database
* cleaned pervious data files in 'backup' dir
* updated 'README.txt'; added a solution to a redis problem

* added field 'type' of 'indicator.models.Indicator';
  for filtering search results and only returning 'NORMAL_TYPE'

1 files changed, 49 insertions, 0 deletions

diff --git a/97suifangqa/apps/sciblog/fixtures/sciblogForTest.json b/97suifangqa/apps/sciblog/fixtures/sciblogForTest.json
new file mode 100644
index 0000000..32dfd7a
--- /dev/null
+++ b/97suifangqa/apps/sciblog/fixtures/sciblogForTest.json
@@ -0,0 +1,49 @@
+[
+    {
+        "pk": 1, 
+        "model": "sciblog.sciblog", 
+        "fields": {
+            "subhead": "subtitleForTest", 
+            "sample": [], 
+            "readed_count": 0, 
+            "references": [], 
+            "catched_by": [], 
+            "query": [], 
+            "endpoint_content": "", 
+            "treatment_content": "", 
+            "baseline": [], 
+            "title": "forTest", 
+            "clinic_conditions": [], 
+            "hospital": [], 
+            "source": null, 
+            "understanded_count": 0, 
+            "safety": "", 
+            "entitle": "enTitleForTest", 
+            "konwledge_piece": [], 
+            "method": "", 
+            "conclusion": "", 
+            "detectionAssay": "", 
+            "ifvalue": 1.0, 
+            "journal": "", 
+            "authors": "default authors", 
+            "abstractAE": "", 
+            "confused_count": 0, 
+            "collected_by": [], 
+            "guidline": null, 
+            "aim": "", 
+            "publish_date": null, 
+            "abstract_result": "", 
+            "endpoints": []
+        }
+    }, 
+    {
+        "pk": 1, 
+        "model": "sciblog.usercollection", 
+        "fields": {
+            "lastCollectBlogTime": null, 
+            "lastCatchBlogTime": null, 
+            "user": 6, 
+            "lastCollectAnnotationTime": null
+        }
+    }
+]
\ No newline at end of file