developers/orbit-basic
2
0 Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add user_info

Browse Source
This commit is contained in:
chris authored and ihower committed 2011-04-13 18:22:50 +08:00
1 parent 73b75ec0b6
commit 2ccc2c9b39
21 files changed
+123 -206
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

app/controllers/admin/translations_controller.rb
+2 -2
View File
@@ -69,8 +69,8 @@ class Admin::TranslationsController < ApplicationController
result << var if var.document_class.eql?('language')
result
end
@user_attribute_model_i18n_variables = @i18n_variables.inject([]) do |result, var|
result << var if var.document_class.eql?('UserAttributeModel')
@user_role_model_i18n_variables = @i18n_variables.inject([]) do |result, var|
result << var if var.document_class.eql?('UserRoleModel')
result
end
end
app/controllers/admin/user_attribute_models_controller.rb
+15 -15
View File
@@ -1,46 +1,46 @@
class Admin::UserAttributeModelsController < ApplicationController
class Admin::UserRoleModelsController < ApplicationController
layout "admin"
before_filter :authenticate_user!
before_filter :is_admin?
def index
@user_attribute_models = UserAttributeModel.all.entries
@user_role_models = UserRoleModel.all.entries
end
def show
@user_attribute_model = UserAttributeModel.find(params[:id])
@user_role_model = UserRoleModel.find(params[:id])
end
def new
@user_attribute_model = UserAttributeModel.new
session[:last_page] = get_go_back || admin_user_attribute_models_url
@user_role_model = UserRoleModel.new
session[:last_page] = get_go_back || admin_user_role_models_url
end
def edit
@user_attribute_model = UserAttributeModel.find(params[:id])
@i18n_variable = @user_attribute_model.i18n_variable
session[:last_page] = get_go_back || admin_user_attribute_models_url
@user_role_model = UserRoleModel.find(params[:id])
@i18n_variable = @user_role_model.i18n_variable
session[:last_page] = get_go_back || admin_user_role_models_url
end
def create
@user_attribute_model = UserAttributeModel.new(params[:user_attribute_model])
@user_attribute_model.save
@user_role_model = UserRoleModel.new(params[:user_role_model])
@user_role_model.save
redirect_to :action => :index
end
def update
@user_attribute_model = UserAttributeModel.find(params[:id])
@user_attribute_model.update_attributes(params[:user_attribute_model])
@user_role_model = UserRoleModel.find(params[:id])
@user_role_model.update_attributes(params[:user_role_model])
redirect_to :action => :index
end
def destroy
@user_attribute_model = UserAttributeModel.find(params[:id])
@user_attribute_model.destroy
@user_role_model = UserRoleModel.find(params[:id])
@user_role_model.destroy
@user_attribute_model.destroy_i18n_variables
@user_role_model.destroy_i18n_variables
redirect_to :action => :index
end
app/controllers/panel/users_controller.rb
+3 -3
View File
@@ -13,7 +13,7 @@ class Panel::UsersController < ApplicationController
def new
@user = User.new
@user_attribute_models = UserAttributeModel.all.entries
@user_role_models = UserRoleModel.all.entries
session[:last_page] = get_go_back || panel_users_url
end
@@ -28,7 +28,7 @@ class Panel::UsersController < ApplicationController
def edit
@user = User.find(params[:id])
@user_attribute_models = UserAttributeModel.all.entries
@user_role_models = UserRoleModel.all.entries
session[:last_page] = get_go_back || panel_users_url
end
@@ -42,7 +42,7 @@ class Panel::UsersController < ApplicationController
if @user.update_attributes(params[:user])
redirect_to :action => :index
else
@user_attribute_models = UserAttributeModel.all.entries
@user_role_models = UserRoleModel.all.entries
render :action => :edit
end
end