fix for desktop
This commit is contained in:
parent
e5815dccd7
commit
b195e043e6
|
@ -27,7 +27,7 @@ class Admin::WritingConferencesController < OrbitMemberController
|
|||
@writing_conference = WritingConference.new(conference_params)
|
||||
@writing_conference.save
|
||||
if params[:desktop] == "true"
|
||||
render json: get_paper_list.to_json
|
||||
render json: {"data" => get_paper_list}.to_json
|
||||
else
|
||||
redirect_to params['referer_url']
|
||||
end
|
||||
|
@ -45,7 +45,7 @@ class Admin::WritingConferencesController < OrbitMemberController
|
|||
@writing_conference.update_attributes(conference_params)
|
||||
@writing_conference.save
|
||||
if params[:desktop] == "true"
|
||||
render json: get_paper_list.to_json
|
||||
render json: {"data" => get_paper_list}.to_json
|
||||
else
|
||||
redirect_to params['referer_url']
|
||||
end
|
||||
|
@ -53,6 +53,12 @@ class Admin::WritingConferencesController < OrbitMemberController
|
|||
|
||||
def destroy
|
||||
@writing_conference.destroy
|
||||
respond_to do |format|
|
||||
format.html { redirect_to(admin_writing_conferences_url) }
|
||||
# format.xml { head :ok }
|
||||
format.js
|
||||
format.json {render json: {"success" => true}}
|
||||
end
|
||||
end
|
||||
|
||||
def toggle_hide
|
||||
|
|
Loading…
Reference in New Issue