Merge branch 'fix-3070' of github.com:antgonza/qiita into fix-3070

Author: antgonza

qiita_pet/handlers/api_proxy/artifact.py

@@ -345,7 +345,7 @@ def artifact_status_put_req(artifact_id, user_id, visibility):
     else:
         pd.visibility = visibility
 
-    LogEntry.create('Warning', '%s changed artifact %s (%d) to %s' % (
+    LogEntry.create('Warning', '%s changed artifact %s (study %d) to %s' % (
         user_id, artifact_id, sid, visibility))
 
     return {'status': status,

qiita_pet/handlers/api_proxy/tests/test_artifact.py

@@ -314,7 +314,7 @@ def test_artifact_status_put_req_private(self):
         self.assertEqual(obs, exp)
         # testing that the log message is generated
         self.assertEqual(LogEntry.newest_records(1)[0].msg,
-                         'admin@foo.bar changed artifact 1 (1) to private')
+                         'admin@foo.bar changed artifact 1 (study 1) to private')
 
     def test_artifact_status_put_req_private_bad_permissions(self):
         obs = artifact_status_put_req(1, 'test@foo.bar', 'private')