Discourse/discourse
Discourse/discourse
2
0
Fork 0
mirror of https://github.com/discourse/discourse.git synced 2025-09-07 12:02:53 +08:00
Code Packages Activity Actions 5

fix the build - take 2

Browse source
This commit is contained in:
Régis Hanol 2015-09-11 15:47:48 +02:00
parent 29f25dbf6e
commit 18d7c1c75d
3 changed files with 12 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/assets/javascripts/discourse/routes/preferences.js.es6
View file

@ -49,10 +49,8 @@ export default RestrictedUserRoute.extend({
const user = this.modelFor('user'), const user = this.modelFor('user'),
controller = this.controllerFor('avatar-selector'), controller = this.controllerFor('avatar-selector'),
selectedUploadId = controller.get("selectedUploadId"), selectedUploadId = controller.get("selectedUploadId"),
selectedAvatarTemplate = controller.get("selectedAvatarTemplate"); selectedAvatarTemplate = controller.get("selectedAvatarTemplate"),
type = controller.get("selected");
let type = controller.get("selected");
if (type === "uploaded") { type = "custom" }
user.pickAvatar(selectedUploadId, type, selectedAvatarTemplate) user.pickAvatar(selectedUploadId, type, selectedAvatarTemplate)
.then(() => { .then(() => {

11
app/controllers/users_controller.rb
View file

@ -531,13 +531,16 @@ class UsersController < ApplicationController
user = fetch_user_from_params user = fetch_user_from_params
guardian.ensure_can_edit!(user) guardian.ensure_can_edit!(user)
type = params[:type]
upload_id = params[:upload_id] upload_id = params[:upload_id]
type = params[:type]
type = "custom" if type == "uploaded"
user.uploaded_avatar_id = upload_id user.uploaded_avatar_id = upload_id
user.user_avatar.send("#{type}_upload_id=", upload_id)
if type == "uploaded" || type == "custom"
user.user_avatar.custom_upload_id = upload_id
elsif type == "gravatar"
user.user_avatar.gravatar_upload_id = upload_id
end
user.save! user.save!
user.user_avatar.save! user.user_avatar.save!

13
spec/controllers/users_controller_spec.rb
View file

@ -1301,7 +1301,7 @@ describe UsersController do
describe '.pick_avatar' do describe '.pick_avatar' do
it 'raises an error when not logged in' do it 'raises an error when not logged in' do
expect { xhr :put, :pick_avatar, username: 'asdf', avatar_id: 1}.to raise_error(Discourse::NotLoggedIn) expect { xhr :put, :pick_avatar, username: 'asdf', avatar_id: 1, type: "custom"}.to raise_error(Discourse::NotLoggedIn)
end end
context 'while logged in' do context 'while logged in' do
@ -1310,12 +1310,12 @@ describe UsersController do
it 'raises an error when you don\'t have permission to toggle the avatar' do it 'raises an error when you don\'t have permission to toggle the avatar' do
another_user = Fabricate(:user) another_user = Fabricate(:user)
xhr :put, :pick_avatar, username: another_user.username, upload_id: 1 xhr :put, :pick_avatar, username: another_user.username, upload_id: 1, type: "custom"
expect(response).to be_forbidden expect(response).to be_forbidden
end end
it 'it successful' do it 'it successful' do
xhr :put, :pick_avatar, username: user.username, upload_id: 111 xhr :put, :pick_avatar, username: user.username, upload_id: 111, type: "custom"
expect(user.reload.uploaded_avatar_id).to eq(111) expect(user.reload.uploaded_avatar_id).to eq(111)
expect(user.user_avatar.reload.custom_upload_id).to eq(111) expect(user.user_avatar.reload.custom_upload_id).to eq(111)
expect(response).to be_success expect(response).to be_success
@ -1326,13 +1326,6 @@ describe UsersController do
expect(response).to be_success expect(response).to be_success
end end
it 'returns success' do
xhr :put, :pick_avatar, username: user.username, upload_id: 111
expect(user.reload.uploaded_avatar_id).to eq(111)
expect(response).to be_success
json = ::JSON.parse(response.body)
expect(json['success']).to eq("OK")
end
end end
end end