maverick/docbrown
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make xhr request's method dynamic for archiving. (#3335)

Browse source
This commit is contained in:
Mac Siri 2019-07-15 14:40:01 -04:00 • committed by GitHub
parent bbc83da539
commit e28aaecca4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/initializers/initializeEllipsisMenu.js
View file

@ -58,8 +58,11 @@ function handleFormSubmit(e) {
var values = getFormValues(form);
var data = JSON.stringify(values);
var formData = new FormData(form);
var method = formData.get('_method') || 'post';
var xhr = new XMLHttpRequest();
xhr.open('POST', form.action);
xhr.open(method.toUpperCase(), form.action);
xhr.setRequestHeader('Content-Type', 'application/json');
xhr.send(data);

11
app/controllers/articles_controller.rb
View file

@ -135,7 +135,9 @@ class ArticlesController < ApplicationController
def update
authorize @article
@user = @article.user || current_user
not_found if @article.user_id != @user.id && !@user.has_role?(:super_admin)
edited_at_date = if @article.user == current_user && @article.published
Time.current
else
@ -146,13 +148,16 @@ class ArticlesController < ApplicationController
respond_to do |format|
format.html do
# TODO: JSON should probably not be returned in the format.html section
if article_params_json[:archived] && @article.archived # just to get archived working
render json: @article.to_json(only: [:id], methods: [:current_state_path])
return
end
# NOTE: destination is used by /dashboard/organization when it re-assigns an article
# not a great solution but for now it will do
redirect_to(params[:destination] || @article.path)
if params[:destination]
redirect_to(params[:destination])
return
end
render json: { status: 200 }
end
format.json do