jacknudt
/
socialforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_hjq' into develop

This commit is contained in:
huang 2015-12-07 10:07:24 +08:00
parent 79a893d5c1 f67386e8a0
commit 9ef7cdf91f
1 changed files with 19 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
app/controllers/organizations_controller.rb
View File

@ -37,6 +37,19 @@ class OrganizationsController < ApplicationController
@organization = Organization.new @organization = Organization.new
render :layout => 'new_base' render :layout => 'new_base'
end end
def edit
@organization = Organization.find(params[:id])
end
def destroy
@organization = Organization.find(params[:id])
@organization.destroy
respond_to do |format|
format.html{ redirect_to admin_organization_path }
end
end
def create def create
@organization = Organization.new @organization = Organization.new
@organization.name = params[:organization][:name] @organization.name = params[:organization][:name]
@ -142,6 +155,12 @@ class OrganizationsController < ApplicationController
# end # end
end end
def cancel_homepage
@org = Organization.find(params[:id])
@org.home_id = nil
@org.save
end
def autocomplete_search def autocomplete_search
@project = Project.find(params[:project_id]) @project = Project.find(params[:project_id])
#@flag = params[:flag] || false #@flag = params[:flag] || false