diff --git a/app/controllers/admin/members_controller.rb b/app/controllers/admin/members_controller.rb
index 472316b..05b6c97 100644
--- a/app/controllers/admin/members_controller.rb
+++ b/app/controllers/admin/members_controller.rb
@@ -10,7 +10,9 @@ class Admin::MembersController < OrbitMemberController
def index
@roles = Role.excludes(disabled: true)
page_num = params[:page] || 1
-
+ param_temp = request.fullpath.split("?")
+ @edit_params = (param_temp.count > 1 ? "?" + param_temp.last : "") rescue ""
+
@filter = params[:filter]
@mq = params[:mq]
@new_filter = params[:new_filter]
@@ -449,6 +451,8 @@ class Admin::MembersController < OrbitMemberController
end
def edit
+ param_temp = request.fullpath.split("?")
+ @edit_params = (param_temp.count > 1 ? "?" + param_temp.last : "") rescue ""
if has_access?
@form_index = 0
get_info_and_roles
@@ -491,6 +495,8 @@ class Admin::MembersController < OrbitMemberController
end
def update
+ param_temp = request.fullpath.split("?")
+ @edit_params = (param_temp.count > 1 ? "?" + param_temp.last : "") rescue ""
respond_to do |format|
if @member.user.present?
@user = @member.user
@@ -529,7 +535,7 @@ class Admin::MembersController < OrbitMemberController
end
- format.html { redirect_to admin_members_path, notice: 'Successfully Updated the User' }
+ format.html { redirect_to admin_members_path() + @edit_params, notice: 'Successfully Updated the User' }
format.json { head :no_content }
else
format.html { render action: 'edit' }
@@ -585,6 +591,7 @@ class Admin::MembersController < OrbitMemberController
end
def edit_privilege
+ @edit_params = "?" + request.fullpath.split("?").last rescue ""
if current_user.is_admin?
@user = @member.user
@workgroup = Workgroup.find_by(key: 'admin')
diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb
index 4f0115d..55e4862 100644
--- a/app/controllers/members_controller.rb
+++ b/app/controllers/members_controller.rb
@@ -28,9 +28,8 @@ class MembersController < ApplicationController
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).to_a }
+ { "title" => role.title, "id" => role.id, "status" => RoleStatus.where(:role_id=>role, :_id.in=>page_role_status).asc(:key).to_a }
end
end
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index b1dd7f6..eab9114 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -351,12 +351,12 @@ module ApplicationHelper
((controller.controller_name.eql?(controller_name) || request.fullpath.eql?(controller_name)) && controller.action_name.eql?(action_name)) ? 'active' : nil
end
- def link_back(custom_class=nil)
+ def link_back(custom_class=nil, params="")
case custom_class
when nil
- link_to t('back'), get_go_back, :class => 'nav'
+ link_to t('back'), get_go_back + params, :class => 'nav'
else
- link_to t('back'), get_go_back, :class => custom_class
+ link_to t('back'), get_go_back + params, :class => custom_class
end
end
diff --git a/app/views/admin/members/_member_for_listing.html.erb b/app/views/admin/members/_member_for_listing.html.erb
index 9c1d21c..7220abc 100644
--- a/app/views/admin/members/_member_for_listing.html.erb
+++ b/app/views/admin/members/_member_for_listing.html.erb
@@ -21,11 +21,11 @@
<%= link_to (member_for_listing.name != (member_for_listing.email) ? member_for_listing.name : member_for_listing.id),admin_member_path(member_for_listing) %>
- <%= content_tag(:li, link_to(t(:edit),edit_admin_member_path(member_for_listing))) if current_user.is_admin? %>
+ <%= content_tag(:li, link_to(t(:edit),edit_admin_member_path(member_for_listing) + @edit_params)) if current_user.is_admin? %>
<% if member_for_listing.user.present? %>
- <%= content_tag(:li, link_to(t("users.setting_privilege"),admin_member_edit_privilege_path(member_for_listing))) if current_user.is_admin? and current_user.id != (member_for_listing.user.id if member_for_listing.user.present? ) %>
+ <%= content_tag(:li, link_to(t("users.setting_privilege"),admin_member_edit_privilege_path(member_for_listing) + @edit_params)) if current_user.is_admin? and current_user.id != (member_for_listing.user.id if member_for_listing.user.present? ) %>
<% end %>
- <%= content_tag(:li, link_to(t(:delete_),admin_member_path(member_for_listing.id, at: params[:at]), data: { confirm: t('sure?') }, method: :delete, class: "text-error", remote: true)) if current_user.is_admin? %>
+ <%= content_tag(:li, link_to(t(:delete_),admin_member_path(member_for_listing.id) + @edit_params, data: { confirm: t('sure?') }, method: :delete, class: "text-error", remote: true)) if current_user.is_admin? %>
diff --git a/app/views/admin/members/_member_for_summary.html.erb b/app/views/admin/members/_member_for_summary.html.erb
index cd04ff4..3e3049a 100644
--- a/app/views/admin/members/_member_for_summary.html.erb
+++ b/app/views/admin/members/_member_for_summary.html.erb
@@ -13,9 +13,9 @@
%>
- <%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_member_path(member_for_summary),:class=>"edit" ) if current_user.is_admin?%>
- <%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_member_edit_privilege_path(member_for_summary),:class=>"key" ) if current_user.is_admin? and (current_user.id != member_for_summary.user.id if member_for_summary.user.present?) %>
- <%= link_to(content_tag(:i, nil, :class => 'icon-trash'),admin_member_path(member_for_summary.id, at: params[:at]), data: { confirm: t('sure?') }, method: :delete, class: "trash", remote: true) if current_user.is_admin? %>
+ <%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_member_path(member_for_summary) + @edit_params,:class=>"edit" ) if current_user.is_admin?%>
+ <%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_member_edit_privilege_path(member_for_summary) + @edit_params,:class=>"key" ) if current_user.is_admin? and (current_user.id != member_for_summary.user.id if member_for_summary.user.present?) %>
+ <%= link_to(content_tag(:i, nil, :class => 'icon-trash'),admin_member_path(member_for_summary.id) + @edit_params, data: { confirm: t('sure?') }, method: :delete, class: "trash", remote: true) if current_user.is_admin? %>
<%= image_tag(member_for_summary.avatar) %>
diff --git a/app/views/admin/members/_member_for_thumbnail.html.erb b/app/views/admin/members/_member_for_thumbnail.html.erb
index 56a4cdc..1c424a4 100644
--- a/app/views/admin/members/_member_for_thumbnail.html.erb
+++ b/app/views/admin/members/_member_for_thumbnail.html.erb
@@ -13,9 +13,9 @@
- <%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_member_path(member_for_thumbnail),:class=>"edit" ) if current_user.is_admin?%>
- <%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_member_edit_privilege_path(member_for_thumbnail),:class=>"key" ) if current_user.is_admin? and (current_user.id != member_for_thumbnail.user.id if member_for_thumbnail.user.present?) %>
- <%= link_to(content_tag(:i, nil, :class => 'icon-trash'),admin_member_path(member_for_thumbnail.id, at: params[:at]), data: { confirm: t('sure?') }, method: :delete, class: "trash", remote: true) if current_user.is_admin? %>
+ <%= link_to(content_tag(:i, nil, :class => 'icon-edit'),edit_admin_member_path(member_for_thumbnail) + @edit_params,:class=>"edit" ) if current_user.is_admin?%>
+ <%= link_to(content_tag(:i, nil, :class => 'icon-key'),admin_member_edit_privilege_path(member_for_thumbnail) + @edit_params,:class=>"key" ) if current_user.is_admin? and (current_user.id != member_for_thumbnail.user.id if member_for_thumbnail.user.present?) %>
+ <%= link_to(content_tag(:i, nil, :class => 'icon-trash'),admin_member_path(member_for_thumbnail.id) + @edit_params, data: { confirm: t('sure?') }, method: :delete, class: "trash", remote: true) if current_user.is_admin? %>
<%= image_tag(member_for_thumbnail.avatar) %>
diff --git a/app/views/admin/members/edit.html.erb b/app/views/admin/members/edit.html.erb
index 5dc3ec9..36074e3 100644
--- a/app/views/admin/members/edit.html.erb
+++ b/app/views/admin/members/edit.html.erb
@@ -16,8 +16,7 @@
<%= javascript_include_tag "lib/member/role-forms.js" %>
<% end -%>
-
-<%= form_for @member, :url => admin_member_path(@member), :html => { :multipart => true , :class=>"form-horizontal main-forms", :id=>"user-forms"} do |f| %>
+<%= form_for @member, :url => admin_member_path(@member) + @edit_params , :html => { :multipart => true , :class=>"form-horizontal main-forms", :id=>"user-forms"} do |f| %>
<%= f.error_messages %>
diff --git a/app/views/admin/members/edit_privilege.html.erb b/app/views/admin/members/edit_privilege.html.erb
index cd5a102..d5b47a9 100644
--- a/app/views/admin/members/edit_privilege.html.erb
+++ b/app/views/admin/members/edit_privilege.html.erb
@@ -12,7 +12,7 @@
<% end -%>
-<%= form_for @member, url: admin_member_path(@member), html: { multipart: true , class: "form-horizontal main-forms", id: "user-forms"} do |f| %>
+<%= form_for @member, url: admin_member_path(@member) + @edit_params, html: { multipart: true , class: "form-horizontal main-forms", id: "user-forms"} do |f| %>