Commit 9b0205d9 authored by Kristof Csillag's avatar Kristof Csillag

Merge pull request #534 from hypothesis/521-streamer-updates-are-broken

fixes #521
parents eef0811f cbfc19fe
...@@ -90,7 +90,7 @@ class Displayer ...@@ -90,7 +90,7 @@ class Displayer
@idTable[annotation.id] = annotation @idTable[annotation.id] = annotation
replies.splice pos, 0, annotation replies.splice pos, 0, annotation
when 'edit' when 'update'
$scope.change_annotation_content annotation.id, annotation $scope.change_annotation_content annotation.id, annotation
when 'delete' when 'delete'
......
...@@ -50,11 +50,11 @@ class Streamer ...@@ -50,11 +50,11 @@ class Streamer
@sfilter.setActionCreate(params.action_create) @sfilter.setActionCreate(params.action_create)
else else
@sfilter.setActionCreate(params.action_create is 'true') @sfilter.setActionCreate(params.action_create is 'true')
if params.action_edit if params.action_update
if (typeof params.action_edit) is 'boolean' if (typeof params.action_update) is 'boolean'
@sfilter.setActionEdit(params.action_edit) @sfilter.setActionUpdate(params.action_update)
else else
@sfilter.setActionEdit(params.action_edit is 'true') @sfilter.setActionUpdate(params.action_update is 'true')
if params.action_delete if params.action_delete
if (typeof params.action_delete) is 'boolean' if (typeof params.action_delete) is 'boolean'
@sfilter.setActionDelete(params.action_delete) @sfilter.setActionDelete(params.action_delete)
...@@ -140,7 +140,7 @@ class Streamer ...@@ -140,7 +140,7 @@ class Streamer
$location.search $location.search
'match_policy': $scope.filter.match_policy 'match_policy': $scope.filter.match_policy
'action_create': $scope.filter.actions.create 'action_create': $scope.filter.actions.create
'action_edit': $scope.filter.actions.edit 'action_update': $scope.filter.actions.update
'action_delete': $scope.filter.actions.delete 'action_delete': $scope.filter.actions.delete
'load_past': $scope.filter.past_data.load_past 'load_past': $scope.filter.past_data.load_past
'go_back': $scope.filter.past_data.go_back 'go_back': $scope.filter.past_data.go_back
......
...@@ -67,7 +67,7 @@ class StreamFilter ...@@ -67,7 +67,7 @@ class StreamFilter
clauses : [] clauses : []
actions : actions :
create: true create: true
edit: true update: true
delete: true delete: true
past_data: past_data:
load_past: "none" load_past: "none"
...@@ -81,7 +81,7 @@ class StreamFilter ...@@ -81,7 +81,7 @@ class StreamFilter
getClauses: -> return @filter.clauses getClauses: -> return @filter.clauses
getActions: -> return @filter.actions getActions: -> return @filter.actions
getActionCreate: -> return @filter.actions.create getActionCreate: -> return @filter.actions.create
getActionEdit: -> return @filter.actions.edit getActionUpdate: -> return @filter.actions.update
getActionDelete: -> return @filter.actions.delete getActionDelete: -> return @filter.actions.delete
setPastDataNone: -> setPastDataNone: ->
...@@ -129,8 +129,8 @@ class StreamFilter ...@@ -129,8 +129,8 @@ class StreamFilter
@filter.actions.create = action @filter.actions.create = action
this this
setActionEdit: (action) -> setActionUpdate: (action) ->
@filter.actions.edit = action @filter.actions.update = action
this this
setActionDelete: (action) -> setActionDelete: (action) ->
...@@ -171,7 +171,7 @@ class StreamFilter ...@@ -171,7 +171,7 @@ class StreamFilter
resetFilter: -> resetFilter: ->
@setMatchPolicyIncludeAny() @setMatchPolicyIncludeAny()
@setActionCreate(true) @setActionCreate(true)
@setActionEdit(true) @setActionUpdate(true)
@setActionDelete(true) @setActionDelete(true)
@setPastDataNone() @setPastDataNone()
@noClauses() @noClauses()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment