Skip to content

[stable10] Avatar fixes for access-control app #1847

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rullzer merged 2 commits into from
Oct 21, 2016
Merged

[stable10] Avatar fixes for access-control app #1847

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fd445cc
Check the mimetype before reading the content and catch exception
nickvergessen Aug 29, 2016
116d17b
The red box already makes clear it's an error
nickvergessen Aug 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
The red box already makes clear it's an error 
Signed-off-by: Joas Schilling <[email protected]>
  • Loading branch information
@nickvergessen
nickvergessen committed Oct 21, 2016
commit 116d17be86fd59a2178040d2fa328b20a6f24501
8 changes: 4 additions & 4 deletions settings/js/personal.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,8 +286,8 @@ $(document).ready(function () {
msg = data.jqXHR.responseJSON.data.message;
}
avatarResponseHandler({
data: {
message: t('settings', 'An error occurred: {message}', { message: msg })
data: {
message: msg
}
});
}
Expand All @@ -304,7 +304,7 @@ $(document).ready(function () {
url: OC.generateUrl('/avatar/'),
data: { path: path }
}).done(avatarResponseHandler)
.fail(function(jqXHR, status){
.fail(function(jqXHR) {
var msg = jqXHR.statusText + ' (' + jqXHR.status + ')';
if (!_.isUndefined(jqXHR.responseJSON) &&
!_.isUndefined(jqXHR.responseJSON.data) &&
Expand All @@ -314,7 +314,7 @@ $(document).ready(function () {
}
avatarResponseHandler({
data: {
message: t('settings', 'An error occurred: {message}', { message: msg })
message: msg
}
});
});
Expand Down