Merge branch 'devel-2.4.5' into webdav_project_tree

app/controllers/dmsf_workflows_controller.rb

@@ -480,16 +480,20 @@ private
       if @dmsf_workflow.project # Project workflow
         @project = @dmsf_workflow.project
       else # Global workflow
-        revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
-        @project = revision.dmsf_file.project if revision && revision.dmsf_file
+        if params[:dmsf_file_revision_id].present?
+          revision = DmsfFileRevision.find_by(id: params[:dmsf_file_revision_id])
+          @project = revision.dmsf_file.project if revision && revision.dmsf_file
+        else
+          @project = Project.find params[:project_id] if params[:project_id].present?
+        end
       end
     else
-      if params[:dmsf_workflow]
+      if params[:dmsf_workflow].present?
         @project = Project.find params[:dmsf_workflow][:project_id]
-      elsif params[:project_id]
+      elsif params[:project_id].present?
         @project = Project.find params[:project_id]
       else
-        @project = Project.find params[:id]
+        @project = Project.find(params[:id]) if params[:id].present?
       end
     end
   rescue ActiveRecord::RecordNotFound

app/views/dmsf/show.html.erb

@@ -22,12 +22,6 @@
   # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
 %>
 
-<% if defined?(EasyExtensions) %>
-  <% content_for :header_tags do %>
-    <%= javascript_include_tag 'context_menu', 'application', defer: true %>
-  <% end %>
-<% end %>
-
 <% html_title l(:dmsf) %>
 <div class="contextual">
   <% unless @locked_for_user || @system_folder  %>

assets/javascripts/attachments_dmsf.js

@@ -280,9 +280,9 @@ function dmsfSetupFileDrop() {
     }
 }
 
-$(document).ready(function() {
-    EASY.schedule.late(function () {
-        dmsfSetupFileDrop();
-        $(document).on("erui_new_dom", dmsfSetupFileDrop);
-    });
+
+EASY.schedule.late(function () {
+    dmsfSetupFileDrop();
+    $(document).on("erui_new_dom", dmsfSetupFileDrop);
 });
+

test/functional/dmsf_workflow_controller_test.rb

@@ -36,6 +36,7 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
     @role_manager.add_permission! :file_manipulation
     @role_manager.add_permission! :manage_workflows
     @role_manager.add_permission! :file_approval
+    @role_manager.add_permission! :view_dmsf_files
     @wfs1 = DmsfWorkflowStep.find 1 # step 1
     @wfs2 = DmsfWorkflowStep.find 2 # step 2
     @wfs3 = DmsfWorkflowStep.find 3 # step 1
@@ -413,4 +414,31 @@ class DmsfWorkflowsControllerTest < RedmineDmsf::Test::TestCase
     assert_response :redirect
   end
 
+  def test_log_non_member
+    @request.session[:user_id] = @user_non_member.id
+    get :log, params: { id: @wf1.id, project_id: @project1.id, dmsf_file_id: @file1.id, format: 'js' }, xhr: true
+    assert_response :forbidden
+  end
+
+  def test_log_member_local_wf
+    @request.session[:user_id] = @user_member.id
+    get :log, params: { id: @wf1.id, project_id: @project1.id, dmsf_file_id: @file1.id, format: 'js' }, xhr: true
+    assert_response :success
+    assert_template :log
+  end
+
+  def test_log_member_global_wf
+    @request.session[:user_id] = @user_member.id
+    get :log, params: { id: @wf3.id, project_id: @project1.id, dmsf_file_id: @file1.id, format: 'js' }, xhr: true
+    assert_response :success
+    assert_template :log
+  end
+
+  def test_log_admin
+    @request.session[:user_id] = @user_admin.id
+    get :log, params: { id: @wf1.id, project_id: @project1.id, dmsf_file_id: @file1.id, format: 'js' }, xhr: true
+    assert_response :success
+    assert_template :log
+  end
+
 end