Software
/
rosa-build
mirror of https://github.com/OpenMandrivaSoftware/rosa-build.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

#472: Update Platforms::PlatformsController

This commit is contained in:
Vokhmin Alexey V 2015-05-21 00:35:00 +03:00
parent d50ad4a157
commit 688feaeab5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
app/controllers/platforms/platforms_controller.rb
View File

@ -33,7 +33,7 @@ class Platforms::PlatformsController < Platforms::BaseController
end end
def create def create
authorize @platform = Platform.new(params[:platform]) authorize @platform = Platform.new(platform_params)
@admin_id = params[:admin_id] @admin_id = params[:admin_id]
@admin_uname = params[:admin_uname] @admin_uname = params[:admin_uname]
# FIXME: do not allow manipulate owner model, only platforms onwer_id and onwer_type # FIXME: do not allow manipulate owner model, only platforms onwer_id and onwer_type
@ -53,13 +53,12 @@ class Platforms::PlatformsController < Platforms::BaseController
@admin_id = params[:admin_id] @admin_id = params[:admin_id]
@admin_uname = params[:admin_uname] @admin_uname = params[:admin_uname]
platform_params = params[:platform] || {} pp = platform_params
platform_params = platform_params.slice(:description, :platform_arch_settings_attributes, :released, :automatic_metadata_regeneration, :default_branch) pp[:owner] = User.find(@admin_id) if @admin_id.present?
platform_params[:owner] = User.find(@admin_id) if @admin_id.present?
respond_to do |format| respond_to do |format|
format.html do format.html do
if @platform.update_attributes(platform_params) if @platform.update_attributes(pp)
flash[:notice] = I18n.t("flash.platform.saved") flash[:notice] = I18n.t("flash.platform.saved")
redirect_to @platform redirect_to @platform
else else
@ -68,7 +67,7 @@ class Platforms::PlatformsController < Platforms::BaseController
end end
end end
format.json do format.json do
if @platform.update_attributes(platform_params) if @platform.update_attributes(pp)
render json: { notice: I18n.t("flash.platform.saved") }.to_json render json: { notice: I18n.t("flash.platform.saved") }.to_json
else else
render json: { error: I18n.t("flash.platform.save_error") }.to_json, status: 422 render json: { error: I18n.t("flash.platform.save_error") }.to_json, status: 422
@ -108,7 +107,7 @@ class Platforms::PlatformsController < Platforms::BaseController
def make_clone def make_clone
authorize @platform authorize @platform
@cloned = @platform.full_clone params[:platform].merge(owner: current_user) @cloned = @platform.full_clone platform_params.merge(owner: current_user)
if @cloned.persisted? if @cloned.persisted?
flash[:notice] = I18n.t("flash.platform.clone_success") flash[:notice] = I18n.t("flash.platform.clone_success")
redirect_to @cloned redirect_to @cloned
@ -165,6 +164,10 @@ class Platforms::PlatformsController < Platforms::BaseController
private private
def platform_params
subject_params(Platform)
end
# Private: before_action hook which loads Platform. # Private: before_action hook which loads Platform.
def load_platform def load_platform
authorize @platform = Platform.find_cached(params[:id]), :show? if params[:id] authorize @platform = Platform.find_cached(params[:id]), :show? if params[:id]