mitigate ransack pre-join chronology issue by pre-setting the arguments order in the filters

This commit is contained in:
2018-06-01 14:05:38 -03:00
parent 6fa9b2658d
commit d332bb617f
2 changed files with 11 additions and 6 deletions
+6 -3
View File
@@ -1,12 +1,15 @@
import Ember from 'ember'
import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array'
export default_filter = Ember.Object.create
export filters = Ember.Object.create
filter_calls: 0
workflow_action_definition_id_in: []
project_instance_group_workflow_group_id: ''
project_id: ''
project_instance_project_scenario_id: ''
workflow_action_definition_organization_id: ''
# untill ransack chronological pre joins issue has been fixed force order to first lookup the pre-joined relation since that magically works
workflow_action_definition_title_cont: ''
project_instance_client_identifier_cont: ''
#workflow_action_definition_offset_type_not_eq: 'attached'
target_date_not_null: 1 # only target date actions
state_in: []
@@ -18,7 +21,7 @@ export default Ember.Route.extend
queryParams: {q: refreshModel: true}
modelName: 'panda/project-instance-action'
setupController: (controller) ->
controller.set 'filters', default_filter
controller.set 'filters', filters
@_super arguments...
model: (params) ->
@@ -52,7 +55,7 @@ export default Ember.Route.extend
PagedRemoteArray.create
modelName: @modelName
store: @store
filters: default_filter
filters: filters
page: params.page || 1
perPage: params.perPage || 30
otherParams:
+5 -3
View File
@@ -3,13 +3,15 @@ import Ember from 'ember';
import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array';
export var default_filter = Ember.Object.create({
export var filters = Ember.Object.create({
filter_calls: 0,
workflow_action_definition_id_in: [],
project_instance_group_workflow_group_id: '',
project_id: '',
project_instance_project_scenario_id: '',
workflow_action_definition_organization_id: '',
workflow_action_definition_title_cont: '',
project_instance_client_identifier_cont: '',
target_date_not_null: 1,
state_in: [],
target_date_gteq: null,
@@ -25,7 +27,7 @@ export default Ember.Route.extend({
},
modelName: 'panda/project-instance-action',
setupController: function(controller) {
controller.set('filters', default_filter);
controller.set('filters', filters);
return this._super.apply(this, arguments);
},
model: function(params) {
@@ -35,7 +37,7 @@ export default Ember.Route.extend({
project_instance_actions: PagedRemoteArray.create({
modelName: this.modelName,
store: this.store,
filters: default_filter,
filters: filters,
page: params.page || 1,
perPage: params.perPage || 30,
otherParams: {