From b25ceeb2063002e9db442a59aa216df5dd29eb74 Mon Sep 17 00:00:00 2001 From: Karel Picman Date: Wed, 31 Aug 2016 12:47:43 +0200 Subject: [PATCH] @user might be null --- app/views/my/blocks/_locked_documents.html.erb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/my/blocks/_locked_documents.html.erb b/app/views/my/blocks/_locked_documents.html.erb index 30762435..cf4b1153 100644 --- a/app/views/my/blocks/_locked_documents.html.erb +++ b/app/views/my/blocks/_locked_documents.html.erb @@ -20,12 +20,14 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. %> +<% folders = [] %> +<% files = [] %> <% folders = DmsfFolder.joins( 'JOIN dmsf_locks ON dmsf_folders.id = dmsf_locks.entity_id').where( - 'dmsf_locks.entity_type' => 1, 'dmsf_locks.user_id' => @user.id).all %> + 'dmsf_locks.entity_type' => 1, 'dmsf_locks.user_id' => @user.id).all if @user %> <% files = DmsfFile.joins( 'JOIN dmsf_locks ON dmsf_files.id = dmsf_locks.entity_id').where( - 'dmsf_locks.entity_type' => 0, 'dmsf_locks.user_id' => @user.id).all %> + 'dmsf_locks.entity_type' => 0, 'dmsf_locks.user_id' => @user.id).all if @user %>

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

<% if folders.any? || files.any?%> <%= form_tag({}) do %>