diff options
Diffstat (limited to 'pyload/datatypes')
| -rw-r--r-- | pyload/datatypes/PyFile.py | 1 | ||||
| -rw-r--r-- | pyload/datatypes/User.py | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/pyload/datatypes/PyFile.py b/pyload/datatypes/PyFile.py index 8f33b09fd..5e5d56d17 100644 --- a/pyload/datatypes/PyFile.py +++ b/pyload/datatypes/PyFile.py @@ -218,6 +218,7 @@ class PyFile(object): sleep(0.5) self.abort = False + self.setStatus("aborted") self.release() def finishIfDone(self): diff --git a/pyload/datatypes/User.py b/pyload/datatypes/User.py index fbfb24378..ca5ac1813 100644 --- a/pyload/datatypes/User.py +++ b/pyload/datatypes/User.py @@ -51,12 +51,12 @@ class User(UserData): return self.role == role + def hasAccess(self, obj): + return self.primary is None or obj.owner == self.true_primary + def isAdmin(self): return self.hasRole(Role.Admin) - def isOwner(self, obj): - return self.primary is None or obj.owner == self.true_primary - @property def primary(self): """ Primary user id, Internal user handle used for most operations |