diff --git a/app/views/easy_page_modules/easy_dms/_dmsf_locked_documents_show.html.erb b/app/views/easy_page_modules/easy_dms/_dmsf_locked_documents_show.html.erb index bb7680fb..dcea86f2 100644 --- a/app/views/easy_page_modules/easy_dms/_dmsf_locked_documents_show.html.erb +++ b/app/views/easy_page_modules/easy_dms/_dmsf_locked_documents_show.html.erb @@ -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' %> \ No newline at end of file diff --git a/app/views/easy_page_modules/easy_dms/_dmsf_open_approvals_show.html.erb b/app/views/easy_page_modules/easy_dms/_dmsf_open_approvals_show.html.erb index 2bb38f20..bb7680fb 100644 --- a/app/views/easy_page_modules/easy_dms/_dmsf_open_approvals_show.html.erb +++ b/app/views/easy_page_modules/easy_dms/_dmsf_open_approvals_show.html.erb @@ -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' %> diff --git a/app/views/my/blocks/_locked_documents.html.erb b/app/views/my/blocks/_locked_documents.html.erb index ec136a30..cff655df 100644 --- a/app/views/my/blocks/_locked_documents.html.erb +++ b/app/views/my/blocks/_locked_documents.html.erb @@ -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 %> -

<%= l(:locked_documents)%> (<%= folders.count %>/<%= files.count %>)

+<% unless defined?(EasyExtensions) %> +

<%= l(:locked_documents)%> (<%= folders.count %>/<%= files.count %>)

+<% end %> <% if folders.any? || files.any?%> <%= form_tag({}) do %> diff --git a/app/views/my/blocks/_open_approvals.html.erb b/app/views/my/blocks/_open_approvals.html.erb index 5c6f04b4..b1efff71 100644 --- a/app/views/my/blocks/_open_approvals.html.erb +++ b/app/views/my/blocks/_open_approvals.html.erb @@ -34,7 +34,9 @@ <% end %> <% end %> <% end %> -

<%= l(:open_approvals)%> (<%= assignments.count %>)

+<% unless defined?(EasyExtensions) %> +

<%= l(:open_approvals)%> (<%= assignments.count %>)

+<% end %> <% if assignments.any? %> <%= form_tag({}) do %>