This commit is contained in:
parent
356a48caa8
commit
349020182a
|
@ -15,7 +15,7 @@
|
||||||
# along with this program; if not, write to the Free Software
|
# along with this program; if not, write to the Free Software
|
||||||
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
|
||||||
class UsersController < ApplicationController
|
class UsersController < ApplicationController
|
||||||
layout 'base_users'
|
layout :setting_layout
|
||||||
#Added by young
|
#Added by young
|
||||||
menu_item :activity
|
menu_item :activity
|
||||||
menu_item :user_information, :only => :info
|
menu_item :user_information, :only => :info
|
||||||
|
@ -694,5 +694,9 @@ class UsersController < ApplicationController
|
||||||
end
|
end
|
||||||
rescue ActiveRecord::RecordNotFound
|
rescue ActiveRecord::RecordNotFound
|
||||||
render_404
|
render_404
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def setting_layout(default_base='base_users')
|
||||||
|
User.current.admin? ? 'base_admin' : default_base
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue