* 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, 0 insertions, 81 deletions

diff --git a/97suifangqa/apps/location/fixtures_bak/initial_data.json b/97suifangqa/apps/location/fixtures_bak/initial_data.json
deleted file mode 100644
index a06ec34..0000000
--- a/97suifangqa/apps/location/fixtures_bak/initial_data.json
+++ /dev/null
@@ -1,81 +0,0 @@
-[
-    {
-        "pk": 1,
-        "model": "location.hospital",
-        "fields": {
-            "city": null,
-            "name": "\u53f0\u5927\u533b\u9662\u5185\u79d1\u90e8",
-            "unit": null
-        }
-    },
-    {
-        "pk": 2,
-        "model": "location.hospital",
-        "fields": {
-            "city": null,
-            "name": "\u9999\u6e2f\u739b\u4e3d\u533b\u9662",
-            "unit": null
-        }
-    },
-    {
-        "pk": 3,
-        "model": "location.hospital",
-        "fields": {
-            "city": null,
-            "name": "\u5317\u4eac\u4f51\u5b89\u533b\u9662\u6d88\u5316\u5185\u79d1",
-            "unit": null
-        }
-    },
-    {
-        "pk": 4,
-        "model": "location.hospital",
-        "fields": {
-            "city": 1,
-            "name": "\u4e0a\u6d77\u745e\u91d1\u533b\u9662\u611f\u67d3\u79d1",
-            "unit": null
-        }
-    },
-    {
-        "pk": 5,
-        "model": "location.hospital",
-        "fields": {
-            "city": null,
-            "name": "\u5df4\u9ece\u5927\u5b66",
-            "unit": null
-        }
-    },
-    {
-        "pk": 6,
-        "model": "location.hospital",
-        "fields": {
-            "city": null,
-            "name": "Songklanagarind\u533b\u9662",
-            "unit": null
-        }
-    },
-    {
-        "pk": 7,
-        "model": "location.hospital",
-        "fields": {
-            "city": null,
-            "name": "Erasmus MC \u5927\u5b66\u533b\u5b66\u4e2d\u5fc3",
-            "unit": null
-        }
-    },
-    {
-        "pk": 1,
-        "model": "location.city",
-        "fields": {
-            "name": "\u4e0a\u6d77",
-            "nation": 1
-        }
-    },
-    {
-        "pk": 1,
-        "model": "location.nation",
-        "fields": {
-            "name": "\u4e2d\u56fd",
-            "img": ""
-        }
-    }
-]
\ No newline at end of file