Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fixes issue #2274 - Datepicker in bulk action not usable in bulk action if ticket list is longer the one page.

Browse source
This commit is contained in:
Mantas Masalskis 2019-11-20 15:53:24 +01:00 committed by Martin Edenhofer
parent 265d60a65f
commit 149a086aab
3 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/assets/javascripts/app/controllers/_ui_element/basedate.coffee
View file

@ -37,6 +37,8 @@ class App.UiElement.basedate
rtl: App.i18n.dir() is 'rtl' rtl: App.i18n.dir() is 'rtl'
container: item container: item
language: 'custom' language: 'custom'
orientation: attribute.orientation
disableScroll: attribute.disableScroll
) )
@setNewTimeInitial(item, attribute) @setNewTimeInitial(item, attribute)

4
app/assets/javascripts/app/controllers/ticket_overview.coffee
View file

@ -1357,6 +1357,10 @@ class BulkForm extends App.Controller
localAttribute.null = true localAttribute.null = true
@configure_attributes_ticket.push localAttribute @configure_attributes_ticket.push localAttribute
time_attribute = _.findWhere(@configure_attributes_ticket, {'name': 'pending_time'})
time_attribute.orientation = 'top'
time_attribute.disableScroll = true
@holder = @options.holder @holder = @options.holder
@visible = false @visible = false

15
app/assets/javascripts/app/lib/bootstrap/bootstrap-datepicker.js vendored
View file

@ -28,6 +28,7 @@
- added rerender method to show correct today if task is longer open the 24 hours - added rerender method to show correct today if task is longer open the 24 hours
- scroll into view - scroll into view
- fix vertical auto position - fix vertical auto position
- disableScroll flag to
*/ */
(function(factory){ (function(factory){
@ -767,13 +768,15 @@
}); });
} }
// adjust scroll of scrollParent if(!this.o.disableScroll) {
var scrollParent = this.picker.scrollParent(); // adjust scroll of scrollParent
var bottomEdge = offset.top + height + this.picker.outerHeight(); var scrollParent = this.picker.scrollParent();
var scrollBottomEdge = scrollParent.scrollTop() + scrollParent.height(); var bottomEdge = offset.top + height + this.picker.outerHeight();
var scrollBottomEdge = scrollParent.scrollTop() + scrollParent.height();
if(bottomEdge > scrollBottomEdge){ if(bottomEdge > scrollBottomEdge){
scrollParent.scrollTop(scrollParent.scrollTop() + (bottomEdge - scrollBottomEdge) + 10); scrollParent.scrollTop(scrollParent.scrollTop() + (bottomEdge - scrollBottomEdge) + 10);
}
} }
return this; return this;