Merge branch 'master' of github.com:AyuntamientoMadrid/participacion

This commit is contained in:
Jose Manuel
2015-08-26 21:40:44 +01:00
91 changed files with 1170 additions and 360 deletions

View File

@@ -1,11 +1,11 @@
class Admin::OfficialsController < Admin::BaseController
def index
@officials = User.officials.page(params[:page])
@officials = User.officials.page(params[:page]).for_render
end
def search
@users = User.with_email(params[:email]).page(params[:page])
@users = User.with_email(params[:email]).page(params[:page]).for_render
end
def edit
@@ -29,4 +29,4 @@ class Admin::OfficialsController < Admin::BaseController
params.require(:user).permit(:official_position, :official_level)
end
end
end