Skip to content

Commit

Permalink
rref #5367
Browse files Browse the repository at this point in the history
rref #5366

ref #66
ref #65
  • Loading branch information
evrenesat committed Jul 22, 2016
1 parent 9b95fbf commit e0a723f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions zengine/messaging/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def show_channel(current, waited=False):
# request:
{
'view':'_zops_show_channel',
'channel_key': key,
'key': key,
}
# response:
Expand All @@ -159,9 +159,9 @@ def show_channel(current, waited=False):
'code': 200
}
"""
ch = Channel(current).objects.get(current.input['channel_key'])
ch = Channel(current).objects.get(current.input['key'])
sbs = ch.get_subscription_for_user(current.user_id)
current.output = {'channel_key': current.input['channel_key'],
current.output = {'channel_key': current.input['key'],
'description': ch.description,
'name': sbs.name,
'actions': sbs.get_actions(),
Expand Down Expand Up @@ -323,7 +323,7 @@ def create_channel(current):
channel=channel,
can_manage=True,
can_leave=False)
current.input['channel_key'] = channel.key
current.input['key'] = channel.key
show_channel(current)
current.output.update({
'status': 'Created',
Expand Down Expand Up @@ -512,7 +512,7 @@ def create_direct_channel(current):
"""
channel, sub_name = Channel.get_or_create_direct_channel(current.user_id,
current.input['user_key'])
current.input['channel_key'] = channel.key
current.input['key'] = channel.key
show_channel(current)
current.output.update({
'status': 'Created',
Expand Down

0 comments on commit e0a723f

Please sign in to comment.