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

Fix role status issue

This commit is contained in:
Saurabh Bhatia 2014-07-11 12:17:43 +08:00
parent 9a4ef31352
commit e94ee50674
3 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/assets/javascripts/lib/member/role-forms.js
View File

@ -223,6 +223,7 @@ $(function() {
}); });
$('#user-forms').delegate('.togglebox, .delete, .trigger, .remove-input', clickEvent, function(event) { $('#user-forms').delegate('.togglebox, .delete, .trigger, .remove-input', clickEvent, function(event) {
if($(this).hasClass('togglebox')) { if($(this).hasClass('togglebox')) {
var role_staus = [];
if($(this).hasClass('disable')) { if($(this).hasClass('disable')) {
$(this).find('.toggle-check') $(this).find('.toggle-check')
.attr('value', 'false') .attr('value', 'false')
@ -236,7 +237,10 @@ $(function() {
.closest('.attributes') .closest('.attributes')
.addClass('disabled') .addClass('disabled')
.children('.attributes-body') .children('.attributes-body')
.fadeOut(300); .fadeOut(300)
.find('.check')
.attr("checked",false)
.attr("value",role_staus);
} }
$(this).toggleClass('disable'); $(this).toggleClass('disable');
}; };

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

@ -144,6 +144,9 @@ class Admin::MembersController < OrbitMemberController
@user.save @user.save
@user.update_attributes(member_profile_id: @member.id) @user.update_attributes(member_profile_id: @member.id)
end end
if params[:member_profile][:role_status_ids].nil?
@member.update_attributes(role_status_ids: [])
end
if !params[:member_profile_field_values].nil? if !params[:member_profile_field_values].nil?
params[:member_profile_field_values].each_with_index do |m,i| params[:member_profile_field_values].each_with_index do |m,i|
field_value = m.last[:id].present? field_value = m.last[:id].present?

4
app/views/admin/members/_role.html.erb
View File

@ -1,7 +1,7 @@
<% role_disable = @member.roles.include?(role) ? false : true %> <% role_disable = @member.roles.include?(role) ? false : true %>
<div class="attributes <%= role_disable ? 'disabled' : '' %>"> <div class="attributes <%= role_disable ? 'disabled' : '' %>">
<div class="attributes-header clearfix"> <div class="attributes-header clearfix">
<%= hidden_field_tag("member_profile[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,"data-deploy"=>"right",:class=>"toggle-check",:value=>role_disable)%> <%= hidden_field_tag("member_profile[disable_role][id][#{role.id}]",role_disable,:for=>@form_index,"data-deploy"=>"right",:class=>"toggle-check",:value=>role_disable) %>
<h4><%= role.title %><%= t(:role_info)%></h4> <h4><%= role.title %><%= t(:role_info)%></h4>
</div> </div>
@ -14,7 +14,7 @@
<div class="controls"> <div class="controls">
<% role.role_statuses.where(disable: false).each_with_index do |rrs, i| %> <% role.role_statuses.where(disable: false).each_with_index do |rrs, i| %>
<label class="checkbox inline"> <label class="checkbox inline">
<%= check_box_tag 'member_profile[role_status_ids][]', rrs.id, @member.role_statuses.include?(rrs) ? true: false %> <%= rrs.title %> <%= check_box_tag 'member_profile[role_status_ids][]', rrs.id, @member.role_statuses.include?(rrs) ? true: false, class: "check" %> <%= rrs.title %>
</label> </label>
<% end %> <% end %>