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

Fix merge bug. Take back method. Refs #1

This commit is contained in:
Pavel Chipiga 2011-12-15 00:11:31 +02:00
parent f1465f51ca
commit a855366a75
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/platforms_controller.rb
View File

@ -72,16 +72,12 @@ class PlatformsController < ApplicationController
def update
@admin_id = params[:admin_id]
@admin_uname = params[:admin_uname]
#@platform.owner = @admin_id.blank? ? get_owner : User.find(@admin_id)
#if @platform.save!
if @platform.update_attributes(
:owner => @admin_id.blank? ? get_owner : User.find(@admin_id),
:description => params[:platform][:description],
:released => params[:platform][:released]
)
#@platform.make_admin_relation(@admin_id)
>>>>>>> master
flash[:notice] = I18n.t("flash.platform.saved")
redirect_to @platform
else

7
app/models/platform.rb
View File

@ -129,6 +129,13 @@ class Platform < ActiveRecord::Base
system("sudo rm -Rf #{mount_path}")
end
def update_owner_relation
if owner_id_was != owner_id
r = relations.where(:object_id => owner_id_was, :object_type => owner_type_was)[0]
r.update_attributes(:object_id => owner_id, :object_type => owner_type)
end
end
protected
def build_path(dir)