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

Fix member frontend role status

This commit is contained in:
manson 2014-07-25 10:50:50 +08:00
parent d6085ad13e
commit 96dd726981
2 changed files with 13 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
app/controllers/members_controller.rb
View File

@ -5,21 +5,14 @@ class MembersController < ApplicationController
if page_roles.include?("all")
roles = Role.all.collect do |role|
{
"title" => role.title,
"id" => role.id
}
{ "title" => role.title, "id" => role.id }
end
else
page_role_status.each do |status_id|
page_roles << RoleStatus.find(status_id).role.id.to_s
end
roles = Role.find(page_roles.uniq).collect do |role|
{
"title" => role.title,
"id" => role.id,
"status" => RoleStatus.where(:role_id=>role, :_id.in=>page_role_status)
}
{ "title" => role.title, "id" => role.id, "status" => RoleStatus.where(:role_id=>role, :_id.in=>page_role_status) }
end
end
@ -29,35 +22,26 @@ class MembersController < ApplicationController
if !role['status'].blank?
role['status'].each do |status|
member_profiles = get_members_by_status(status, role['id'])
status_list << {
"status-title" => status.title,
"members" => member_profiles
}
status_list << { "status-title" => status.title, "members" => member_profiles }
end
else
# Members with status
RoleStatus.order_by(:title=>"desc").where(:role_id=>role['id']).each do |status|
role_status = RoleStatus.order_by(:title=>"desc").where(:role_id=>role['id'])
role_status_ids = role_status.collect{|status| status.id.to_s}
role_status.each do |status|
member_profiles = get_members_by_status(status, role['id'])
status_list << {
"status-title" => status.title,
"members" => member_profiles
}
status_list << { "status-title" => status.title, "members" => member_profiles }
end
# Members without status
member_profiles = []
MemberProfile.where(:role_ids.in=>[role['id']], :role_status_ids.in=>[nil,[]]).collect do |profile|
MemberProfile.not_in(:role_status_ids.in=>role_status_ids).where(:role_ids.in=>[role['id']]).collect do |profile|
member_profiles << get_member_data(profile, role['id'])
end
status_list << {
"status-title" => "",
"members" => member_profiles
}
status_list << { "status-title" => "", "members" => member_profiles }
end
role_list << {
"role-title" => role['title'],
"status-list" => status_list
}
role_list << { "role-title" => role['title'], "status-list" => status_list }
end
{
"roles" => role_list,
"extras" => {

3
app/views/admin/members/_user_basic_passwd.html.erb
View File

@ -23,7 +23,8 @@
<label for="password" class="control-label"><%= t("users.new_password")%></label>
</label>
<div class="controls add-input">
<%= f.password_field :password, :class=>"input-medium", :id=>"password" %>
<input name="foilautofill" style="display: none;" type="password" />
<%= f.password_field :password, :class=>"input-medium", :id=>"password", :autocomplete=>"off" %>
<span class="help-block"><%= t("users.new_password_note")%></span>
</div>
</div>