erictyl
/
personal-honor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix for honor without name

This commit is contained in:
Harry Bomrah 2014-10-02 19:46:12 +08:00
parent 52b22f3f45
commit 7e23454c93
2 changed files with 18 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
app/controllers/admin/honors_controller.rb
View File

@ -1,6 +1,7 @@
class Admin::HonorsController < OrbitMemberController
layout "member_plugin"
before_action :set_honor, only: [:show, :edit , :update, :destroy]
before_action :set_plugin
before_action :get_settings,:only => [:new, :edit, :setting]
@ -24,20 +25,17 @@ class Admin::HonorsController < OrbitMemberController
end
def edit
@member = MemberProfile.find_by(:uid=>params['uid']) rescue nil
@honor = Honor.find(params[:id])
@member = @honor.member_profile rescue nil
end
def update
@member = MemberProfile.find(honor_params['member_profile_id']) rescue nil
@honor = Honor.find(params[:id])
@member = @honor.member_profile rescue nil
@honor.update_attributes(honor_params)
@honor.save
redirect_to params['referer_url']
end
def destroy
@honor = Honor.find(params[:id])
@honor.destroy
end
@ -82,6 +80,18 @@ class Admin::HonorsController < OrbitMemberController
private
def set_honor
path = request.path.split('/')
if path.last.include? '-'
uid = path[-1].split("-").last
uid = uid.split("?").first
else
uid = path[-2].split("-").last
uid = uid.split("?").first
end
@honor = Honor.find_by(:uid => uid) rescue Honor.find(params[:id])
end
def honor_params
params.require(:honor).permit! rescue nil
end

6
app/views/admin/honors/_honor.html.erb
View File

@ -5,12 +5,12 @@
<%= link_to honor.award_name, OrbitHelper.url_to_plugin_show(honor.to_param,'personal_honor'), target: "blank"%>
<div class="quick-edit">
<ul class="nav nav-pills hide">
<li><%= link_to t('edit'), '/admin/members/'+honor.member_profile.to_param+'/honors/'+honor.id+'/edit' %></li>
<li><%= link_to t(:delete_), admin_honor_path(id: honor.id, member_profile_id: honor.member_profile.id), method: :delete, remote: true, data: { confirm: t('sure?') } %></li>
<li><%= link_to t('edit'), edit_admin_honor_path(honor) %></li>
<li><%= link_to t(:delete_), admin_honor_path(id: honor.id), method: :delete, remote: true, data: { confirm: 'Are you sure?' } %></li>
</ul>
</div>
</td>
<td><%= honor.awarding_unit %></td>
<td><%= honor.member_profile.name %></td>
<td><%= honor.member_profile.name rescue "" %></td>
</tr>
<% end %>