Merge pull request #2296 from antgonza/awaiting_approval-list

fix awaiting_approval list bug

Author: josenavas

qiita_pet/handlers/study_handlers/listing_handlers.py

@@ -72,7 +72,8 @@ def _build_study_info(user, search_type, study_proc=None, proc_samples=None):
         if user.level == 'admin':
             user_study_set = (user_study_set |
                               Study.get_by_status('sandbox') |
-                              Study.get_by_status('private') -
+                              Study.get_by_status('private') |
+                              Study.get_by_status('awaiting_approval') -
                               Study.get_by_status('public'))
         study_set = user_study_set
     elif search_type == 'public':

qiita_pet/handlers/study_handlers/tests/test_listing_handlers.py

@@ -74,6 +74,9 @@ def test_build_study_info(self):
         obs = _build_study_info(User('demo@microbio.me'), 'public')
         self.assertEqual(obs, [])
 
+        obs = _build_study_info(User('admin@foo.bar'), 'user')
+        self.assertEqual(obs, self.exp)
+
         # make all the artifacts public - (1) the only study in the tests,
         for a in Study(1).artifacts():
             a.visibility = 'public'
@@ -88,6 +91,28 @@ def test_build_study_info(self):
         obs = _build_study_info(User('demo@microbio.me'), 'public')
         self.assertEqual(obs, self.exp)
 
+        obs = _build_study_info(User('admin@foo.bar'), 'user')
+        self.assertEqual(obs, [])
+
+        # make all the artifacts awaiting_approval - (1) the only study
+        # in the tests,
+        for a in Study(1).artifacts():
+            a.visibility = 'awaiting_approval'
+        self.exp[0]['status'] = 'awaiting_approval'
+
+        obs = _build_study_info(User('test@foo.bar'), 'user')
+        self.assertEqual(obs, self.exp)
+
+        obs = _build_study_info(User('test@foo.bar'), 'public')
+        self.assertEqual(obs, [])
+
+        obs = _build_study_info(User('demo@microbio.me'), 'public')
+        self.assertEqual(obs, [])
+
+        obs = _build_study_info(User('admin@foo.bar'), 'user')
+        self.assertEqual(obs, self.exp)
+
+        # awaiting_approval
         # return to it's private status
         for a in Study(1).artifacts():
             a.visibility = 'private'