diff --git a/app/controllers/panel/personal_honor/back_end/honors_controller.rb b/app/controllers/panel/personal_honor/back_end/honors_controller.rb index 0257082..36004f0 100644 --- a/app/controllers/panel/personal_honor/back_end/honors_controller.rb +++ b/app/controllers/panel/personal_honor/back_end/honors_controller.rb @@ -176,7 +176,13 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController respond_to do |format| if @honor.update_attributes(params[:honor]) - format.html { redirect_to(panel_personal_honor_back_end_honors_url) } + + if params[:honor][:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:honor][:user_id],:show_plugin_profile=>"Honor")) } + else + format.html { redirect_to(panel_personal_honor_back_end_honors_url) } + end + # format.js { render 'toggle_enable' } format.xml { head :ok } else @@ -195,7 +201,13 @@ class Panel::PersonalHonor::BackEnd::HonorsController < OrbitBackendController @honor.destroy respond_to do |format| - format.html { redirect_to(panel_personal_honor_back_end_honors_url) } + + if params[:user_id] + format.html { redirect_to(admin_users_new_interface_url(:id=>params[:user_id],:show_plugin_profile=>"Honor")) } + else + format.html { redirect_to(panel_personal_honor_back_end_honors_url) } + end + # format.xml { head :ok } format.js end diff --git a/app/views/panel/personal_honor/front_end/honors/show.html.erb b/app/views/panel/personal_honor/front_end/honors/show.html.erb index 059a354..5f69bc8 100644 --- a/app/views/panel/personal_honor/front_end/honors/show.html.erb +++ b/app/views/panel/personal_honor/front_end/honors/show.html.erb @@ -1,5 +1,6 @@ <% # encoding: utf-8 %> +
@@ -30,3 +31,4 @@
<%= t("module_name.personal_honor") %>
<%= t("personal_honor.award_winner")%><%= User.from_id(@honor.create_user_id).name rescue '' %>
+
\ No newline at end of file diff --git a/app/views/panel/personal_honor/plugin/_profile.html.erb b/app/views/panel/personal_honor/plugin/_profile.html.erb index 55fdda1..67d5d0b 100644 --- a/app/views/panel/personal_honor/plugin/_profile.html.erb +++ b/app/views/panel/personal_honor/plugin/_profile.html.erb @@ -41,7 +41,7 @@ <% end -%> - +
<% if is_admin? %> @@ -55,7 +55,7 @@ <% @honors.each do |honor| %> - "> + "> <% if is_admin? %>
<%= check_box_tag 'to_change[]', honor.id.to_s, false, :class => "list-check" %> @@ -63,7 +63,15 @@ <% end -%> <%= honor.year %> - <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> + <%= link_to honor.award_name, panel_personal_honor_front_end_honor_path(honor) %> +
+ +