diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-24 21:27:43 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2013-03-24 21:27:43 +0100 |
| commit | 7b4c75f0dd755e28fcffc0e4fdd05452458a3b09 (patch) | |
| tree | 43ef5fe76ff5ff235cc52b79f16b9a8b6047bca8 /module/remote | |
| parent | Merge remote-tracking branch 'origin/stable' (diff) | |
| download | pyload-7b4c75f0dd755e28fcffc0e4fdd05452458a3b09.tar.xz | |
added view type for input fields
Diffstat (limited to 'module/remote')
| -rw-r--r-- | module/remote/apitypes.py | 5 | ||||
| -rw-r--r-- | module/remote/apitypes_debug.py | 2 | ||||
| -rw-r--r-- | module/remote/pyload.thrift | 1 | ||||
| -rw-r--r-- | module/remote/wsbackend/AsyncHandler.py | 1 |
4 files changed, 4 insertions, 5 deletions
diff --git a/module/remote/apitypes.py b/module/remote/apitypes.py index 83eb19450..e81c960c8 100644 --- a/module/remote/apitypes.py +++ b/module/remote/apitypes.py @@ -127,16 +127,15 @@ class AddonService(BaseObject): self.media = media class ConfigHolder(BaseObject): - __slots__ = ['name', 'label', 'description', 'long_description', 'items', 'info', 'handler'] + __slots__ = ['name', 'label', 'description', 'long_description', 'items', 'info'] - def __init__(self, name=None, label=None, description=None, long_description=None, items=None, info=None, handler=None): + def __init__(self, name=None, label=None, description=None, long_description=None, items=None, info=None): self.name = name self.label = label self.description = description self.long_description = long_description self.items = items self.info = info - self.handler = handler class ConfigInfo(BaseObject): __slots__ = ['name', 'label', 'description', 'category', 'user_context', 'activated'] diff --git a/module/remote/apitypes_debug.py b/module/remote/apitypes_debug.py index 6909464d4..7b1b5e7f3 100644 --- a/module/remote/apitypes_debug.py +++ b/module/remote/apitypes_debug.py @@ -21,7 +21,7 @@ classes = { 'AccountInfo' : [basestring, basestring, int, bool, int, int, int, bool, bool, bool, (dict, basestring, basestring)], 'AddonInfo' : [basestring, basestring, basestring], 'AddonService' : [basestring, basestring, (list, basestring), (None, int)], - 'ConfigHolder' : [basestring, basestring, basestring, basestring, (list, ConfigItem), (None, (list, AddonInfo)), (None, (list, InteractionTask))], + 'ConfigHolder' : [basestring, basestring, basestring, basestring, (list, ConfigItem), (None, (list, AddonInfo))], 'ConfigInfo' : [basestring, basestring, basestring, basestring, bool, (None, bool)], 'ConfigItem' : [basestring, basestring, basestring, Input, basestring, basestring], 'DownloadInfo' : [basestring, basestring, basestring, int, basestring, basestring], diff --git a/module/remote/pyload.thrift b/module/remote/pyload.thrift index 76e755de0..2aeb54091 100644 --- a/module/remote/pyload.thrift +++ b/module/remote/pyload.thrift @@ -250,7 +250,6 @@ struct ConfigHolder { 4: string long_description, 5: list<ConfigItem> items, 6: optional list<AddonInfo> info, - 7: optional list<InteractionTask> handler, // if null plugin is not loaded } struct ConfigInfo { diff --git a/module/remote/wsbackend/AsyncHandler.py b/module/remote/wsbackend/AsyncHandler.py index b40f0ea4e..d9e302fbb 100644 --- a/module/remote/wsbackend/AsyncHandler.py +++ b/module/remote/wsbackend/AsyncHandler.py @@ -80,6 +80,7 @@ class AsyncHandler(AbstractHandler): for req in self.clients: # filter events that these user is no owner of # TODO: events are security critical, this should be revised later + # TODO: permissions? interaction etc if not req.api.user.isAdmin(): skip = False for arg in args: |