before switch to ubuntu commit since apple has issues
This commit is contained in:
@@ -30,8 +30,6 @@ App.ApplicationController = Ember.Controller.extend
|
||||
@transitionToRoute('list', data.id).then =>
|
||||
@set 'globals.list.state', 'closed'
|
||||
@set 'globals.list', null
|
||||
join_request_approved: (data)->
|
||||
@setCurrentList -> @transitionToRoute('active_list')
|
||||
order_being_processed: (data)->
|
||||
order = @store.all('order').findBy 'id', data.id
|
||||
order.set('state', 'active') if order
|
||||
@@ -63,16 +61,20 @@ App.ApplicationController = Ember.Controller.extend
|
||||
if requestor_id is Qstorage.getItem('user_id')
|
||||
@set 'globals.notice', t('join_request.requestor.join_request_rejected')
|
||||
@set 'globals.join_request_sent', false
|
||||
else
|
||||
@transitionToRoute 'active_list'
|
||||
|
||||
join_request_approved: ->
|
||||
return if @get('globals.list.id') # Not interested when there is an active list
|
||||
|
||||
join_request_approved: (data)->
|
||||
return @transitionToRoute 'active_list' if @get('globals.list.id') # Not interested when there is an active list
|
||||
# The rest of the code is for the new user
|
||||
@setCurrentList ->
|
||||
@transitionToRoute('active_list').then =>
|
||||
@set 'globals.notice', t('join_request.requestor.join_request_approved')
|
||||
@set 'globals.join_request_sent', false
|
||||
|
||||
list_changed_table: ->
|
||||
@setCurrentList()
|
||||
list_changed_table: (data)->
|
||||
@store.findRecord('table', data.to_table_id).then (table)=>@set('globals.list.table', table)
|
||||
orders_in_process_count: (data)->
|
||||
@set 'globals.list.supplier.orders_in_process_count', data.count
|
||||
orders_placed_count: (data)->
|
||||
|
||||
@@ -4,6 +4,7 @@ DS.Model.reopen
|
||||
eraseRecord: ->
|
||||
#@clearRelationships()
|
||||
@transitionTo('deleted.saved')
|
||||
@unloadRecord()
|
||||
DS.Model.reopenClass
|
||||
findCached: (id)->
|
||||
return null unless id
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
=link-to 'active_list' class="side-menu-active-list"
|
||||
span.active-list-icon
|
||||
span= t 'active_list.title'
|
||||
if globals.list.join_requests
|
||||
if globals.list.join_requests.length
|
||||
li
|
||||
=link-to 'join_requests'
|
||||
span= t 'models.plural.join_request'
|
||||
|
||||
Reference in New Issue
Block a user