redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into devel-1.6.1

Browse Source
This commit is contained in:
Karel Picman 2018-01-09 14:29:24 +01:00
commit 5b85416d79
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/views/easy_page_modules/easy_dms/_dmsf_locked_documents_show.html.erb
View File

@ -20,4 +20,4 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%>
<%= render :partial => 'my/blocks/open_approvals' %>
<%= render :partial => 'my/blocks/locked_documents' %>

2
app/views/easy_page_modules/easy_dms/_dmsf_open_approvals_show.html.erb
View File

@ -20,4 +20,4 @@
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
%>
<%= render :partial => 'my/blocks/locked_documents' %>
<%= render :partial => 'my/blocks/open_approvals' %>

4
app/views/my/blocks/_locked_documents.html.erb
View File

@ -30,7 +30,9 @@
'JOIN dmsf_locks ON dmsf_files.id = dmsf_locks.entity_id').where(
['dmsf_locks.entity_type = ? AND dmsf_locks.user_id = ? AND (dmsf_locks.expires_at IS NULL OR dmsf_locks.expires_at > ?)',
0, @user.id, Time.now]).all if @user %>
<h3><%= l(:locked_documents)%> (<%= folders.count %>/<%= files.count %>)</h3>
<% unless defined?(EasyExtensions) %>
<h3><%= l(:locked_documents)%> (<%= folders.count %>/<%= files.count %>)</h3>
<% end %>
<% if folders.any? || files.any?%>
<%= form_tag({}) do %>
<table class="list">

4
app/views/my/blocks/_open_approvals.html.erb
View File

@ -35,7 +35,9 @@
<% end %>
<% end %>
<% end %>
<h3><%= l(:open_approvals)%> (<%= assignments.count %>)</h3>
<% unless defined?(EasyExtensions) %>
<h3><%= l(:open_approvals)%> (<%= assignments.count %>)</h3>
<% end %>
<% if assignments.any? %>
<%= form_tag({}) do %>
<table class="list">