upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-09 00:32:29 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 12

Merge pull request #10285 from owncloud/sharing_set_correct_min_date

Browse source 
[sharing] set minDate always to today + one day
This commit is contained in:
Morris Jobke 2014-08-11 09:09:01 +02:00
commit e9cdd68412
2 changed files with 13 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
core/js/share.js
View file

@ -724,8 +724,11 @@ OC.Share={
*/
showExpirationDate:function(date, shareTime) {
var now = new Date();
// min date should always be the next day
var minDate = new Date();
minDate.setDate(minDate.getDate()+1);
var datePickerOptions = {
minDate: now,
minDate: minDate,
maxDate: null
};
if (_.isNumber(shareTime)) {
@ -757,6 +760,9 @@ OC.Share={
$(document).ready(function() {
if(typeof monthNames != 'undefined'){
// min date should always be the next day
var minDate = new Date();
minDate.setDate(minDate.getDate()+1);
$.datepicker.setDefaults({
monthNames: monthNames,
monthNamesShort: $.map(monthNames, function(v) { return v.slice(0,3)+'.'; }),
@ -764,7 +770,7 @@ $(document).ready(function() {
dayNamesMin: $.map(dayNames, function(v) { return v.slice(0,2); }),
dayNamesShort: $.map(dayNames, function(v) { return v.slice(0,3)+'.'; }),
firstDay: firstDay,
minDate : new Date()
minDate : minDate
});
}
$(document).on('click', 'a.share', function(event) {

8
core/js/tests/specs/shareSpec.js
View file

@ -259,6 +259,7 @@ describe('OC.Share tests', function() {
var shareData;
var shareItem;
var clock;
var expectedMinDate;
function showDropDown() {
OC.Share.showDropDown(
@ -274,6 +275,7 @@ describe('OC.Share tests', function() {
beforeEach(function() {
// pick a fake date
clock = sinon.useFakeTimers(new Date(2014, 0, 20, 14, 0, 0).getTime());
expectedMinDate = new Date(2014, 0, 21, 14, 0, 0);
shareItem = {
displayname_owner: 'root',
expiration: null,
@ -358,7 +360,7 @@ describe('OC.Share tests', function() {
showDropDown();
$('#dropdown [name=linkCheckbox]').click();
$('#dropdown [name=expirationCheckbox]').click();
expect($.datepicker._defaults.minDate).toEqual(new Date());
expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
expect($.datepicker._defaults.maxDate).toEqual(null);
});
it('limits the date range to X days after share time when enforced', function() {
@ -367,7 +369,7 @@ describe('OC.Share tests', function() {
oc_appconfig.core.defaultExpireDateEnforced = true;
showDropDown();
$('#dropdown [name=linkCheckbox]').click();
expect($.datepicker._defaults.minDate).toEqual(new Date());
expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
});
it('limits the date range to X days after share time when enforced, even when redisplayed the next days', function() {
@ -380,7 +382,7 @@ describe('OC.Share tests', function() {
oc_appconfig.core.defaultExpireDateEnabled = true;
oc_appconfig.core.defaultExpireDateEnforced = true;
showDropDown();
expect($.datepicker._defaults.minDate).toEqual(new Date());
expect($.datepicker._defaults.minDate).toEqual(expectedMinDate);
expect($.datepicker._defaults.maxDate).toEqual(new Date(2014, 0, 27, 0, 0, 0, 0));
});
});