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

Merge pull request #22452 from owncloud/fix_22441

Browse source 
Unlock sharee input field when sharing fails
This commit is contained in:
Thomas Müller 2016-02-17 10:59:03 +01:00
commit 92e5160003
2 changed files with 43 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
core/js/sharedialogview.js
View file

@ -281,6 +281,12 @@
.attr('disabled', false);
$loading.addClass('hidden')
.removeClass('inlineblock');
}, error: function(obj, msg) {
OC.Notification.showTemporary(msg);
$(e.target).attr('disabled', false)
.autocomplete('search', $(e.target).val());
$loading.addClass('hidden')
.removeClass('inlineblock');
}});
},

37
core/js/tests/specs/sharedialogviewSpec.js
View file

@ -990,6 +990,43 @@ describe('OC.Share.ShareDialogView', function() {
addShareStub.restore();
});
it('calls addShare after selection and fail to share', function() {
dialog.render();
var shareWith = $('.shareWithField')[0];
var $shareWith = $(shareWith);
var addShareStub = sinon.stub(shareModel, 'addShare');
var autocompleteOptions = autocompleteStub.getCall(0).args[0];
autocompleteOptions.select(new $.Event('select', {target: shareWith}), {
item: {
label: 'User Two',
value: {
shareType: OC.Share.SHARE_TYPE_USER,
shareWith: 'user2'
}
}
});
expect(addShareStub.calledOnce).toEqual(true);
expect(addShareStub.firstCall.args[0]).toEqual({
shareType: OC.Share.SHARE_TYPE_USER,
shareWith: 'user2'
});
//Input is locked
expect($shareWith.val()).toEqual('User Two');
expect($shareWith.attr('disabled')).toEqual('disabled');
//Callback is called
addShareStub.firstCall.args[1].error();
//Input is unlocked
expect($shareWith.val()).toEqual('User Two');
expect($shareWith.attr('disabled')).toEqual(undefined);
addShareStub.restore();
});
});
describe('reshare permissions', function() {
it('does not show sharing options when sharing not allowed', function() {