Foodsoft/foodsoft
1
1
Fork 0
Code Issues 36 Pull requests 5 Projects 1 Releases Wiki Activity

my_profile and admin/ordergroups.

Browse source
This commit is contained in:
benni 2011-06-10 01:36:04 +02:00
parent a787b3cf24
commit c173cf4a6a
14 changed files with 92 additions and 225 deletions
Download patch file Download diff file Expand all files Collapse all files

63
app/controllers/admin/ordergroups_controller.rb
View file

@ -1,68 +1,29 @@
class Admin::OrdergroupsController < Admin::BaseController
inherit_resources
def index
@ordergroups = Ordergroup.order(:name.asc)
# if somebody uses the search field:
unless params[:query].blank?
@ordergroups = @ordergroups.where(:name.matches => "%#{params[:query]}%")
end
# sort by nick, thats default
if (params[:per_page] && params[:per_page].to_i > 0 && params[:per_page].to_i <= 100)
@per_page = params[:per_page].to_i
else
@per_page = 20
end
# if the search field is used
conditions = "name LIKE '%#{params[:query]}%'" unless params[:query].nil?
@total = Ordergroup.without_deleted.count(:conditions => conditions )
@ordergroups = Ordergroup.without_deleted.paginate(:conditions => conditions, :page => params[:page],
:per_page => @per_page, :order => 'name')
@ordergroups = @ordergroups.paginate(:page => params[:page], :per_page => @per_page)
respond_to do |format|
format.html # index.html.erb
format.js { render :partial => "ordergroups" }
format.html # index.html.haml
format.js { render :layout => false } # index.js.erb
end
end
def show
@ordergroup = Ordergroup.find(params[:id])
end
def new
@ordergroup = Ordergroup.new
end
def edit
@ordergroup = Ordergroup.find(params[:id])
end
def create
@ordergroup = Ordergroup.new(params[:ordergroup])
@ordergroup.account_updated = Time.now
if @ordergroup.save
flash[:notice] = 'Ordergroup was successfully created.'
redirect_to([:admin, @ordergroup])
else
render :action => "new"
end
end
def update
@ordergroup = Ordergroup.find(params[:id])
if @ordergroup.update_attributes(params[:ordergroup])
flash[:notice] = 'Ordergroup was successfully updated.'
redirect_to([:admin, @ordergroup])
else
render :action => "edit"
end
end
def destroy
@ordergroup = Ordergroup.find(params[:id])
@ordergroup.destroy
redirect_to(admin_ordergroups_url)
end
def memberships
@group = Ordergroup.find(params[:id])
end

45
app/controllers/admin/users_controller.rb
View file

@ -23,49 +23,4 @@ class Admin::UsersController < Admin::BaseController
format.js { render :layout => false } # index.js.erb
end
end
# def show
# @user = User.find(params[:id])
# end
#
# def new
# @user = User.new
# end
#
# def create
# @user = User.new(params[:user])
# if @user.save
# flash[:notice] = 'Benutzerin wurde erfolgreich angelegt.'
# redirect_to admin_users_path
# else
# render :action => 'new'
# end
# end
#
# def edit
# @user = User.find(params[:id])
# end
#
# def update
# @user = User.find(params[:id])
# if @user.update_attributes(params[:user])
# flash[:notice] = 'Änderungen wurden gespeichert.'
# redirect_to [:admin, @user]
# else
# render :action => 'edit'
# end
# end
#
# def destroy
# user = User.find(params[:id])
# if user.nick == @current_user.nick
# # deny destroying logged-in-user
# flash[:error] = 'Du darfst Dich nicht selbst löschen.'
# else
# user.destroy
# flash[:notice] = 'Benutzer_in wurde gelöscht.'
# end
# redirect_to admin_users_path
# end
end