Action list click info instead of hover not allowing copy paste on more persistent popup

This commit is contained in:
2018-06-22 16:54:53 -03:00
parent 3b546e90b1
commit 93ece3ee50
3 changed files with 32 additions and 7 deletions
+9 -2
View File
@@ -2,7 +2,7 @@ import Ember from 'ember'
import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array' import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array'
export filters = Ember.Object.create export filters = Ember.Object.create
filter_calls: 0 filter_calls: 0
workflow_action_definition_id_in: [] workflow_action_definition_identifier_in: []
project_instance_group_workflow_group_id: '' project_instance_group_workflow_group_id: ''
project_id: '' project_id: ''
project_instance_project_scenario_id: '' project_instance_project_scenario_id: ''
@@ -18,7 +18,12 @@ export filters = Ember.Object.create
s: 'target_date asc' s: 'target_date asc'
export default Ember.Route.extend export default Ember.Route.extend
queryParams: {q: refreshModel: true} queryParams:
state: {refreshModel: true}
project: {refreshModel: true}
action: {refreshModel: true}
page: {refreshModel: true}
perPage: {refreshModel: true}
modelName: 'panda/project-instance-action' modelName: 'panda/project-instance-action'
setupController: (controller) -> setupController: (controller) ->
controller.set 'filters', filters controller.set 'filters', filters
@@ -48,6 +53,8 @@ export default Ember.Route.extend
# 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~organization' # 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~organization'
# 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_offsets' # 'pointing_project_instance_action_connections.project_instance_action.workflow_action_definition.~workflow_action_offsets'
#] #]
filters.state_in = [params.state] if params.state
filters.workflow_action_definition_identifier_in = [params.action] if params.action
Ember.RSVP.hash Ember.RSVP.hash
projects: @store.findAll('panda/project') projects: @store.findAll('panda/project')
organizations: @store.findAll('panda/organization') organizations: @store.findAll('panda/organization')
+20 -2
View File
@@ -5,7 +5,7 @@ import PagedRemoteArray from 'ember-cli-dunlop/utils/paged-remote-array';
export var filters = Ember.Object.create({ export var filters = Ember.Object.create({
filter_calls: 0, filter_calls: 0,
workflow_action_definition_id_in: [], workflow_action_definition_identifier_in: [],
project_instance_group_workflow_group_id: '', project_instance_group_workflow_group_id: '',
project_id: '', project_id: '',
project_instance_project_scenario_id: '', project_instance_project_scenario_id: '',
@@ -21,7 +21,19 @@ export var filters = Ember.Object.create({
export default Ember.Route.extend({ export default Ember.Route.extend({
queryParams: { queryParams: {
q: { state: {
refreshModel: true
},
project: {
refreshModel: true
},
action: {
refreshModel: true
},
page: {
refreshModel: true
},
perPage: {
refreshModel: true refreshModel: true
} }
}, },
@@ -31,6 +43,12 @@ export default Ember.Route.extend({
return this._super.apply(this, arguments); return this._super.apply(this, arguments);
}, },
model: function(params) { model: function(params) {
if (params.state) {
filters.state_in = [params.state];
}
if (params.action) {
filters.workflow_action_definition_identifier_in = [params.action];
}
return Ember.RSVP.hash({ return Ember.RSVP.hash({
projects: this.store.findAll('panda/project'), projects: this.store.findAll('panda/project'),
organizations: this.store.findAll('panda/organization'), organizations: this.store.findAll('panda/organization'),
+3 -3
View File
@@ -46,7 +46,7 @@ table.ui.attached.stiped.sortable.table
th th
if (and scope_project scope_project.isLoaded) if (and scope_project scope_project.isLoaded)
= filter.dropdown-select key='project_instance_group_workflow_group_id' options=scope_project.sorted_workflow_groups labelPath='name' = filter.dropdown-select key='project_instance_group_workflow_group_id' options=scope_project.sorted_workflow_groups labelPath='name'
= filter.dropdown-select-multiple key='workflow_action_definition_id_in' options=scope_project.sorted_workflow_action_definitions labelPath='title' = filter.dropdown-select-multiple key='workflow_action_definition_identifier_in' options=scope_project.sorted_workflow_action_definitions labelPath='title' valuePath='identifier'
else else
th th
= filter.input key='workflow_action_definition_title_cont' = filter.input key='workflow_action_definition_title_cont'
@@ -90,12 +90,12 @@ table.ui.attached.stiped.sortable.table
td= state-badge project_instance_action.state action=(action 'edit_project_instance_action' project_instance_action) td= state-badge project_instance_action.state action=(action 'edit_project_instance_action' project_instance_action)
td td
if (gt project_instance_action.notes.length 14) if (gt project_instance_action.notes.length 14)
= ui-markdown-popup tagName='i' class='sticky note outline icon' markdown=project_instance_action.notes = ui-markdown-popup tagName='i' class='sticky note outline icon' markdown=project_instance_action.notes on='click'
else if project_instance_action.notes else if project_instance_action.notes
= project_instance_action.notes = project_instance_action.notes
if project_instance_action.workflow_action_definition.extra_info if project_instance_action.workflow_action_definition.extra_info
' '
= ui-markdown-popup tagName='i' class='info circle icon' markdown=project_instance_action.workflow_action_definition.extra_info = ui-markdown-popup tagName='i' class='info circle icon' markdown=project_instance_action.workflow_action_definition.extra_info on='click'
td= format-date project_instance_action.target_date format=globals.date_formatting td= format-date project_instance_action.target_date format=globals.date_formatting
if show_completed_at if show_completed_at
td= format-date project_instance_action.completed_at format=globals.time_formatting td= format-date project_instance_action.completed_at format=globals.time_formatting