wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #19339 from owncloud/share-expirationisstring

Browse source 
Expiration date was always a string
This commit is contained in:
Thomas Müller 2015-09-24 13:45:17 +02:00
commit 99cf17247e
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/js/shareitemmodel.js
View file

@ -69,7 +69,7 @@
*/ */
var SHARE_RESPONSE_INT_PROPS = [ var SHARE_RESPONSE_INT_PROPS = [
'id', 'file_parent', 'mail_send', 'file_source', 'item_source', 'permissions', 'id', 'file_parent', 'mail_send', 'file_source', 'item_source', 'permissions',
'storage', 'share_type', 'parent', 'stime', 'expiration' 'storage', 'share_type', 'parent', 'stime'
]; ];
/** /**

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

@ -169,7 +169,7 @@ describe('OC.Share.ShareItemModel', function() {
/* jshint camelcase: false */ /* jshint camelcase: false */
shares: [{ shares: [{
displayname_owner: 'root', displayname_owner: 'root',
expiration: 1111, expiration: '2015-10-12 00:00:00',
file_source: 123, file_source: 123,
file_target: '/folder', file_target: '/folder',
id: 20, id: 20,
@ -187,7 +187,7 @@ describe('OC.Share.ShareItemModel', function() {
uid_owner: 'root' uid_owner: 'root'
}, { }, {
displayname_owner: 'root', displayname_owner: 'root',
expiration: 2222, expiration: '2015-10-15 00:00:00',
file_source: 456, file_source: 456,
file_target: '/file_in_folder.txt', file_target: '/file_in_folder.txt',
id: 21, id: 21,
@ -263,7 +263,7 @@ describe('OC.Share.ShareItemModel', function() {
reshare: {}, reshare: {},
shares: [{ shares: [{
displayname_owner: 'root', displayname_owner: 'root',
expiration: '1403900000', expiration: '2015-10-12 00:00:00',
file_source: '123', file_source: '123',
file_target: '/folder', file_target: '/folder',
id: '20', id: '20',
@ -301,7 +301,7 @@ describe('OC.Share.ShareItemModel', function() {
expect(share.share_type).toEqual(OC.Share.SHARE_TYPE_USER); expect(share.share_type).toEqual(OC.Share.SHARE_TYPE_USER);
expect(share.share_with).toEqual('user1'); expect(share.share_with).toEqual('user1');
expect(share.stime).toEqual(1403884258); expect(share.stime).toEqual(1403884258);
expect(share.expiration).toEqual(1403900000); expect(share.expiration).toEqual('2015-10-12 00:00:00');
}); });
}); });