Merge pull request #1951 from normanjaeckel/Autoupdate
Fixed problem with some REST requests during autoupdate. Fixed #1935.
This commit is contained in:
commit
c40dfb120b
@ -188,7 +188,8 @@ angular.module('OpenSlidesApp.core', [
|
||||
}
|
||||
DS.eject(data.collection, data.id);
|
||||
}
|
||||
// TODO: handle other statuscodes
|
||||
// If you want to handle more status codes, change server
|
||||
// restrictions in utils/autoupdate.py.
|
||||
});
|
||||
}
|
||||
])
|
||||
|
@ -79,14 +79,18 @@ class OpenSlidesSockJSConnection(SockJSConnection):
|
||||
This method is called after succesful response of AsyncHTTPClient().
|
||||
See send_object().
|
||||
"""
|
||||
collection, obj_id = get_collection_and_id_from_url(response.request.url)
|
||||
data = {
|
||||
'url': response.request.url,
|
||||
'status_code': response.code,
|
||||
'collection': collection,
|
||||
'id': obj_id,
|
||||
'data': json.loads(response.body.decode())}
|
||||
self.send(data)
|
||||
if response.code in (200, 404):
|
||||
# Only send something to the client in case of one of these status
|
||||
# codes. You have to change the client code (autoupdate.onMessage)
|
||||
# if you want to handle some more codes.
|
||||
collection, obj_id = get_collection_and_id_from_url(response.request.url)
|
||||
data = {
|
||||
'url': response.request.url,
|
||||
'status_code': response.code,
|
||||
'collection': collection,
|
||||
'id': obj_id,
|
||||
'data': json.loads(response.body.decode())}
|
||||
self.send(data)
|
||||
|
||||
@classmethod
|
||||
def send_object(cls, object_url):
|
||||
|
Loading…
Reference in New Issue
Block a user