Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message

adding correct blocking logic for ffw
remotes/origin/enc_quick_fix_8.1
Vincent Petry 11 years ago
commit e01db549a0
  1. 8
      apps/files/js/filelist.js
  2. 11
      apps/files/tests/js/filelistSpec.js

@ -1123,6 +1123,14 @@
return false;
}
// Firewall Blocked request?
if (result.status === 403) {
// Go home
this.changeDirectory('/');
OC.Notification.show(t('files', 'This operation is forbidden'));
return false;
}
if (result.status === 404) {
// go back home
this.changeDirectory('/');

@ -1279,6 +1279,17 @@ describe('OCA.Files.FileList tests', function() {
fakeServer.respond();
expect(fileList.getCurrentDirectory()).toEqual('/');
});
it('switches to root dir when current directory is forbidden', function() {
fakeServer.respondWith(/\/index\.php\/apps\/files\/ajax\/list.php\?dir=%2funexist/, [
403, {
"Content-Type": "application/json"
},
''
]);
fileList.changeDirectory('/unexist');
fakeServer.respond();
expect(fileList.getCurrentDirectory()).toEqual('/');
});
it('shows mask before loading file list then hides it at the end', function() {
var showMaskStub = sinon.stub(fileList, 'showMask');
var hideMaskStub = sinon.stub(fileList, 'hideMask');

Loading…
Cancel
Save