add authorization

This commit is contained in:
manson 2014-08-01 12:25:19 +08:00
parent 802ff0b000
commit 582757864b
4 changed files with 15 additions and 13 deletions

View File

@ -4,6 +4,9 @@ class Admin::ResearchsController < OrbitMemberController
before_action :set_plugin
before_action :get_settings,:only => [:new, :edit, :setting]
before_action :need_access_right
before_action :allow_admin_only, :only => [:index, :setting]
def index
@researchs = Research.order_by(:year=>'desc').page(params[:page]).per(10)
end
@ -17,7 +20,7 @@ class Admin::ResearchsController < OrbitMemberController
@member = MemberProfile.find(research_params['member_profile_id']) rescue nil
@research = Research.new(research_params)
@research.save
redirect_to URI.encode('/admin/members/'+@member.to_param+'/Research')
redirect_to params['referer_url']
end
def edit
@ -30,7 +33,7 @@ class Admin::ResearchsController < OrbitMemberController
@research = Research.find(params[:id])
@research.update_attributes(research_params)
@research.save
redirect_to URI.encode('/admin/members/'+@member.to_param+'/Research')
redirect_to params['referer_url']
end
def destroy

View File

@ -194,6 +194,7 @@
<!-- Form Actions -->
<div class="form-actions">
<%= f.hidden_field :user_id, :value => params[:user_id] if !params[:user_id].blank? %>
<input type="hidden" name="referer_url" value="<%= request.referer %>">
<%= f.submit t('submit'), class: 'btn btn-primary' %>
<%= link_to t('cancel'), get_go_back, :class=>"btn" %>
</div>

View File

@ -13,9 +13,6 @@
</table>
<div class="bottomnav clearfix">
<div class="action pull-right">
<%= link_to content_tag(:i, nil, :class => 'icon-cog icon-white') + t('setting'), admin_writing_conference_setting_path, :class => 'btn btn-primary pull-right' %>
</div>
<div class="pagination pagination-centered">
<%= content_tag :div, paginate(@researchs), class: "pagination pagination-centered" %>
</div>

View File

@ -6,15 +6,14 @@
<% end %>
<%
is_autorized_user = (current_user==@member.user || current_user.is_admin?)
if is_autorized_user
if has_access?
@researchs = Research.where(member_profile_id: @member.id).desc(:year).page(params[:page]).per(10)
else
@researchs = Research.where(is_hidden: false, member_profile_id: @member.id).desc(:year).page(params[:page]).per(10)
end
%>
<% if is_autorized_user %>
<% if has_access? %>
<div class="list-active">
<div class="btn-group">
<%= link_to('Hide', '#', :class => "btn btn-mini list-active-btn disabled", "data-check-action" => "list-be-hide", :rel => toggle_hide_admin_researchs_path(member_profile_id: params[:id], disable: 'true') ) %>
@ -26,7 +25,7 @@
<table class="table table-condensed table-striped main-list">
<thead>
<tr>
<% if is_autorized_user %>
<% if has_access? %>
<th><input type="checkbox" /></th>
<% end -%>
<th class="span2"><%= t('personal_research.year') %></th>
@ -37,7 +36,7 @@
<tbody>
<% @researchs.each do |research| %>
<tr id="<%= dom_id research %>" class="<%= research.is_hidden ? "checkHide" : "" %>">
<% if is_autorized_user %>
<% if has_access? %>
<td>
<%= check_box_tag 'to_change[]', research.id.to_s, false, :class => "list-check" %>
</td>
@ -48,8 +47,10 @@
<%= link_to research.research_title, OrbitHelper.url_to_plugin_show(research.to_param,'personal_research'), target: "blank"%>
<div class="quick-edit">
<ul class="nav nav-pills hide">
<li><%= link_to t('edit'), '/admin/members/'+@member.to_param+'/researchs/'+research.id+'/edit' %></li>
<li><%= link_to t(:delete_), admin_research_path(id: research.id, member_profile_id: @member.id), method: :delete, remote: true, data: { confirm: t('sure?') } %></li>
<% if has_access? %>
<li><%= link_to t('edit'), '/admin/members/'+@member.to_param+'/researchs/'+research.id+'/edit' %></li>
<li><%= link_to t(:delete_), admin_research_path(id: research.id, member_profile_id: @member.id), method: :delete, remote: true, data: { confirm: t('sure?') } %></li>
<% end %>
</ul>
</div>
</td>
@ -60,7 +61,7 @@
<div class="bottomnav clearfix">
<% if is_autorized_user %>
<% if has_access? %>
<div class="action pull-right">
<%= link_to content_tag(:i, nil, :class => 'icon-edit') +' '+ t('setting'),'/admin/members/'+@member.to_param+'/researchs/frontend_setting', :class => 'btn btn-primary' %>
<%= link_to content_tag(:i, nil, :class => 'icon-plus') +' '+ t('new_'),