alex
/
orbit4-5
forked from saurabh/orbit4-5
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

member update modified and h2 tag in orbit bar

This commit is contained in:
Harry Bomrah 2014-10-22 14:51:14 +08:00
parent 384cc4d6f4
commit 0cff91594c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/admin/members_controller.rb
View File

@ -496,11 +496,14 @@ class Admin::MembersController < OrbitMemberController
@user = @member.user @user = @member.user
@user.update(user_params) @user.update(user_params)
else else
@user = User.new(user_params) if user_params["user_name"] != ""
@user.member_profile = @member @user = User.new(user_params) rescue nil
@user.member_profile = @member
@user.save
end
end end
if @member.update_attributes(member_profile_params) and @user.save if @member.update_attributes(member_profile_params)
if params[:edit_type]!="edit_privilege" and (params[:member_profile].nil? or params[:member_profile][:role_status_ids].nil?) if params[:edit_type]!="edit_privilege" and (params[:member_profile].nil? or params[:member_profile][:role_status_ids].nil?)
@member.update_attributes(role_status_ids: []) @member.update_attributes(role_status_ids: [])
end end

4
app/views/orbit_bar/index.html.erb
View File

@ -36,9 +36,9 @@
<label for="open-orbit-nav"> <label for="open-orbit-nav">
<i class="icons-list-2"></i> <i class="icons-list-2"></i>
</label> </label>
<h1 class="orbit-bar-title"> <h2 class="orbit-bar-title">
<a href="/">Orbit</a> <a href="/">Orbit</a>
</h1> </h2>
<ul class="orbit-bar-menu"> <ul class="orbit-bar-menu">
<li> <li>
<span class="orbit-bar-logo"> <span class="orbit-bar-logo">