code review

bloomberg · Jan 24, 2023 · d5aa791 · d5aa791
1 parent e0f3382
commit d5aa791
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/pybossa/api/task.py b/pybossa/api/task.py
@@ -63,8 +63,7 @@ def _forbidden_attributes(self, data):
 
     def _update_attribute(self, new, old):
         for key, value in old.info.items():
-            if not new.info.get(key):
-                new.info[key] = value
+            new.info.setdefault(key, value)
 
         gold_task = bool(new.gold_answers)
         n_taskruns = len(new.task_runs)

diff --git a/pybossa/api/task_run.py b/pybossa/api/task_run.py
@@ -116,8 +116,7 @@ def _update_object(self, taskrun):
 
     def _update_attribute(self, new, old):
         for key, value in old.info.items():
-            if not new.info.get(key):
-                new.info[key] = value
+            new.info.setdefault(key, value)
 
     def _forbidden_attributes(self, data):
         for key in data.keys():

diff --git a/pybossa/auth/taskrun.py b/pybossa/auth/taskrun.py
@@ -75,7 +75,6 @@ def _update(self, user, taskrun):
         project = self.project_repo.get(taskrun.project_id)
         allow_taskrun_edit = project.info.get("allow_taskrun_edit") or False
         return user.admin or (allow_taskrun_edit and taskrun.user_id == user.id)
-        return user.admin or taskrun.user_id == user.id
 
 
     def _delete(self, user, taskrun):