Merge branch 'master' of github.com:okfn/ckan into fix-SA-warning

ckan · Nov 20, 2012 · 996d1b2 · 996d1b2
2 parents d1acb58 + 9c5f314
commit 996d1b2
Show file tree

Hide file tree

Showing 22 changed files with 1,671 additions and 1,980 deletions.
diff --git a/ckan/lib/cli.py b/ckan/lib/cli.py
@@ -130,6 +130,15 @@ def command(self):
             if self.verbose:
                 print 'Initialising DB: SUCCESS'
         elif cmd == 'clean' or cmd == 'drop':
+
+            # remove any *.pyc version files to prevent conflicts
+            v_path = os.path.join(os.path.dirname(__file__),
+                               '..', 'migration', 'versions', '*.pyc')
+            import glob
+            filelist = glob.glob(v_path)
+            for f in filelist:
+                os.remove(f)
+
             model.repo.clean_db()
             search.clear()
             if self.verbose:

diff --git a/ckan/logic/auth/get.py b/ckan/logic/auth/get.py
@@ -200,10 +200,14 @@ def dashboard_activity_list(context, data_dict):
 
 
 def dashboard_new_activities_count(context, data_dict):
+    # FIXME: This should go through check_access() not call is_authorized()
+    # directly, but wait until 2939-orgs is merged before fixing this.
     return ckan.new_authz.is_authorized('dashboard_activity_list',
             context, data_dict)
 
 
 def dashboard_mark_all_new_activities_as_old(context, data_dict):
+    # FIXME: This should go through check_access() not call is_authorized()
+    # directly, but wait until 2939-orgs is merged before fixing this.
     return ckan.new_authz.is_authorized('dashboard_activity_list',
             context, data_dict)