bterkuile/ember-panda
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Preserve action list completed and inquery columns on active sorting to allow state mix with column through order of activation

Browse Source
This commit is contained in:
Benjamin ter Kuile
2018-06-28 13:02:38 -05:00
parent 93ece3ee50
commit 19c4f93184
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addon/controllers/action-list.coffee
+4 -2
View File
@@ -7,11 +7,13 @@ export default Ember.Controller.extend
scope_project: null
scope_scenario: null
scope_organization: null
show_completed_at: Ember.computed 'filters.state_in.[]', 'filters.completed_at_gteq', 'filters.completed_at_lteq', ->
show_completed_at: Ember.computed 'filters.state_in.[]', 'filters.completed_at_gteq', 'filters.completed_at_lteq', 'filters.s', ->
return true if @get('filters.completed_at_lteq') or @get('filters.completed_at_gteq')
return true if /^completed_at/.test @get('filters.s')
JSON.stringify(@get('filters.state_in')) is '["completed"]'
show_inquiry_at: Ember.computed 'filters.state_in.[]', 'filters.inquiry_at_gteq', 'filters.inquiry_at_lteq', ->
show_inquiry_at: Ember.computed 'filters.state_in.[]', 'filters.inquiry_at_gteq', 'filters.inquiry_at_lteq', 'filters.s', ->
return true if @get('filters.inquiry_at_lteq') or @get('filters.inquiry_at_gteq')
return true if /^inquiry_at/.test @get('filters.s')
JSON.stringify(@get('filters.state_in')) is '["inquiry"]'
filter_query: Ember.computed 'filters.filter_calls', ->
@get('filters')?.toProperties() || {}
addon/controllers/action-list.js
+8 -2
View File
@@ -9,16 +9,22 @@ export default Ember.Controller.extend({
scope_project: null,
scope_scenario: null,
scope_organization: null,
show_completed_at: Ember.computed('filters.state_in.[]', 'filters.completed_at_gteq', 'filters.completed_at_lteq', function() {
show_completed_at: Ember.computed('filters.state_in.[]', 'filters.completed_at_gteq', 'filters.completed_at_lteq', 'filters.s', function() {
if (this.get('filters.completed_at_lteq') || this.get('filters.completed_at_gteq')) {
return true;
}
if (/^completed_at/.test(this.get('filters.s'))) {
return true;
}
return JSON.stringify(this.get('filters.state_in')) === '["completed"]';
}),
show_inquiry_at: Ember.computed('filters.state_in.[]', 'filters.inquiry_at_gteq', 'filters.inquiry_at_lteq', function() {
show_inquiry_at: Ember.computed('filters.state_in.[]', 'filters.inquiry_at_gteq', 'filters.inquiry_at_lteq', 'filters.s', function() {
if (this.get('filters.inquiry_at_lteq') || this.get('filters.inquiry_at_gteq')) {
return true;
}
if (/^inquiry_at/.test(this.get('filters.s'))) {
return true;
}
return JSON.stringify(this.get('filters.state_in')) === '["inquiry"]';
}),
filter_query: Ember.computed('filters.filter_calls', function() {