scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-03 19:24:48 +08:00
Code Issues Projects Releases Packages Wiki Activity

adds permission check to archived project actions dropdown [fixes SCI-2194]

Browse source
This commit is contained in:
zmagod 2018-03-16 17:30:49 +01:00
parent 95425dc64b
commit 3131ed0948
2 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
app/views/projects/archive/_project.html.erb
View file

@ -1,20 +1,28 @@
<div class="panel panel-default panel-project panel-archive"> <div class="panel panel-default panel-project panel-archive">
<div class="panel-heading"> <div class="panel-heading">
<% if can_restore_project?(project) %>
<div class="dropdown pull-right"> <div class="dropdown pull-right">
<button class="btn btn-link dropdown-toggle" type="button" id="dropdownMenu1" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true"> <button class="btn btn-link dropdown-toggle"
<span class="caret"></span> type="button"
</button> id="dropdownMenu1"
<% project_form = nil %> data-toggle="dropdown"
<%= form_for project, method: :patch, format: :html do |f| %> aria-haspopup="true"
<% project_form = f %> aria-expanded="true">
<%= f.hidden_field :archived, value: false %> <span class="caret"></span>
<% end %> </button>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1"> <% project_form = nil %>
<li class="dropdown-header"><%= t('projects.index.options_header') %></li> <%= form_for project, method: :patch, format: :html do |f| %>
<li><a href="#" class="form-submit-link" data-submit-form="<%= project_form.options[:html][:id] %>"><%= t 'projects.index.restore_option' %></a></li> <% project_form = f %>
</ul> <%= f.hidden_field :archived, value: false %>
</div> <% end %>
<ul class="dropdown-menu dropdown-menu-right" aria-labelledby="dropdownMenu1">
<li class="dropdown-header"><%= t('projects.index.options_header') %></li>
<li><a href="#"
class="form-submit-link"
data-submit-form="<%= project_form.options[:html][:id] %>"><%= t 'projects.index.restore_option' %></a></li>
</ul>
</div>
<% end %>
<h3 class="panel-title"> <h3 class="panel-title">
<% if project.hidden? then %> <% if project.hidden? then %>

2
app/views/projects/archive/_team_projects.html.erb
View file

@ -3,7 +3,7 @@
<div class="row"> <div class="row">
<% projects.each_index do |i| project = projects[i] %> <% projects.each_index do |i| project = projects[i] %>
<div class="col-lg-3 col-md-4 col-sm-6 col-xs-12"> <div class="col-lg-3 col-md-4 col-sm-6 col-xs-12">
<%= render partial: "projects/archive/project", locals: {project: project} %> <%= render partial: "projects/archive/project", locals: { project: project } %>
</div> </div>
<% if (i+1) % 4 == 0 %> <% if (i+1) % 4 == 0 %>
<div class="clearfix visible-lg-block"></div> <div class="clearfix visible-lg-block"></div>