more enhancements

Author: squirrelo

qiita_pet/handlers/study_handlers/listing_handlers.py

@@ -67,6 +67,7 @@ def _build_study_info(studytype, user, results=None):
     infolist = []
     for row, info in enumerate(study_info):
         study = Study(info['study_id'])
+        status = study.status
         # Just passing the email address as the name here, since
         # name is not a required field in qiita.qiita_user
         owner = study_person_linkifier((info['email'], info['email']))
@@ -77,7 +78,7 @@ def _build_study_info(studytype, user, results=None):
                                for p in info['pmid']])
         else:
             pmids = ""
-        if info["number_samples_collected"] is '':
+        if info["number_samples_collected"] is None:
             info["number_samples_collected"] = "0"
         shared = _get_shared_links_for_study(study)
         meta_complete_glyph = "ok" if info["metadata_complete"] else "remove"
@@ -92,11 +93,11 @@ def _build_study_info(studytype, user, results=None):
                      studytype, str(row), str(study.id), info["study_title"])
         meta_complete = "<span class='glyphicon glyphicon-%s'></span>" % \
             meta_complete_glyph
-        if info["status"] == 'public':
+        if status == 'public':
             shared = "Not Available"
         else:
             shared = ("<span id='shared_html_{0}'>{1}</span><br/>"
-                      "<a class='btn btn-primary' data-toggle='modal' "
+                      "<a class='btn btn-primary btn-xs' data-toggle='modal' "
                       "data-target='#share-study-modal-view' "
                       "onclick='modify_sharing({0});'>Modify</a>".format(
                           study.id, shared))
@@ -112,7 +113,7 @@ def _build_study_info(studytype, user, results=None):
             "pi": PI,
             "pmid": pmids,
             "owner": owner,
-            "status": study.status,
+            "status": status,
             "abstract": info["study_abstract"]
 
         })
@@ -207,7 +208,7 @@ def get(self, ignore):
         query = self.get_argument('query')
         echo = int(self.get_argument('sEcho'))
 
-        if user != self.current_user:
+        if user != self.current_user.id:
             raise HTTPError(403, 'Unauthorized search!')
         res = None
         if query:

qiita_pet/test/test_study_handlers.py

@@ -57,7 +57,7 @@ def test_build_study_info(self):
         self.assertEqual(obs, self.exp)
 
     def test_build_study_info_new_study(self):
-        Study(1).status = 'public'
+        ProcessedData(1).status = 'public'
         info = {
             'timeseries_type_id': 1,
             'portal_type_id': 1,
@@ -85,10 +85,10 @@ def test_build_study_info_new_study(self):
             ', 1)\'><span class=\'glyphicon glyphicon-file\' aria-hidden=\''
             'true\'></span></a> | <a href=\'/study/description/2\' id=\''
             'study1-title\'>test_study_1</a>',
-            'num_raw_data': 0, 'id': 2L, 'num_samples': 'None',
+            'num_raw_data': 0, 'id': 2, 'num_samples': '0',
             'shared': "<span id='shared_html_2'></span><br/><a class='btn "
-            "btn-primary' data-toggle='modal' data-target='#share-study-modal-"
-            "view' onclick='modify_sharing(2);'>Modify</a>",
+            "btn-primary btn-xs' data-toggle='modal' data-target='#share-study"
+            "-modal-view' onclick='modify_sharing(2);'>Modify</a>",
             'pmid': '', 'pi':
             '<a target="_blank" href="mailto:PI_dude@foo.bar">PIDude</a>'})
         self.assertEqual(obs, self.exp)
@@ -305,8 +305,8 @@ class TestSearchStudiesAJAX(TestHandlerBase):
             'bar</a>',
             'shared': '<span id=\'shared_html_1\'><a target="_blank" href="'
             'mailto:shared@foo.bar">Shared</a></span><br/><a class=\'btn '
-            'btn-primary\' data-toggle=\'modal\' data-target=\'#share-study-'
-            'modal-view\' onclick=\'modify_sharing(1);\'>Modify</a>',
+            'btn-primary btn-xs\' data-toggle=\'modal\' data-target=\'#share'
+            '-study-modal-view\' onclick=\'modify_sharing(1);\'>Modify</a>',
             'meta_complete': "<span class='glyphicon glyphicon-ok'>"
             "</span>",
             'pmid': '<a target="_blank" href="http://www.ncbi.nlm.nih.gov/'
@@ -361,6 +361,14 @@ def test_get_failure(self):
         self.assertEqual(response.body, 'Malformed search query. '
                          'Please read "search help" and try again.')
 
+        response = self.get('/study/search/', {
+            'type': 'standard',
+            'user': 'FAKE@foo.bar',
+            'query': 'ph',
+            'sEcho': '1021'
+            })
+        self.assertEqual(response.code, 403)
+
 
 class TestMetadataSummaryHandler(TestHandlerBase):
     def test_error_prep_and_sample(self):