From 9569b367a64f48c610ebb81e71483634d25370fe Mon Sep 17 00:00:00 2001 From: pavel Date: Thu, 3 Jan 2019 02:20:49 +0100 Subject: [PATCH] find_by, any?, presence --- app/controllers/dmsf_controller.rb | 8 ++++---- app/controllers/dmsf_files_controller.rb | 2 +- app/controllers/dmsf_state_controller.rb | 2 +- app/controllers/dmsf_workflows_controller.rb | 2 +- app/helpers/dmsf_workflows_helper.rb | 2 +- app/models/dmsf_file.rb | 4 ++-- app/models/dmsf_folder.rb | 4 ++-- app/models/dmsf_mailer.rb | 2 +- app/views/dmsf/_dmsf_rows.erb | 2 +- test/unit/dmsf_workflow_step_test.rb | 10 +++++----- 10 files changed, 19 insertions(+), 19 deletions(-) diff --git a/app/controllers/dmsf_controller.rb b/app/controllers/dmsf_controller.rb index 73182275..e95e4e87 100644 --- a/app/controllers/dmsf_controller.rb +++ b/app/controllers/dmsf_controller.rb @@ -402,8 +402,8 @@ class DmsfController < ApplicationController :folders => selected_folders, :files => selected_files, :subject => "#{@project.name} #{l(:label_dmsf_file_plural).downcase}", - :from => Setting.plugin_redmine_dmsf['dmsf_documents_email_from'].blank? ? - "#{User.current.name} <#{User.current.mail}>" : Setting.plugin_redmine_dmsf['dmsf_documents_email_from'], + :from => Setting.plugin_redmine_dmsf['dmsf_documents_email_from'].presence || + "#{User.current.name} <#{User.current.mail}>", :reply_to => Setting.plugin_redmine_dmsf['dmsf_documents_email_reply_to'] } render :action => 'email_entries' @@ -434,7 +434,7 @@ class DmsfController < ApplicationController end def zip_entries(zip, selected_folders, selected_files) - member = Member.where(user_id: User.current.id, project_id: @project.id).first + member = Member.find_by(user_id: User.current.id, project_id: @project.id) selected_folders.each do |selected_folder_id| folder = DmsfFolder.visible.find_by(id: selected_folder_id) if folder @@ -684,7 +684,7 @@ class DmsfController < ApplicationController @subfolders = DmsfHelper.visible_folders(@subfolders, @project) end - @ajax_upload_size = Setting.plugin_redmine_dmsf['dmsf_max_ajax_upload_filesize'].present? ? Setting.plugin_redmine_dmsf['dmsf_max_ajax_upload_filesize'] : 100 + @ajax_upload_size = Setting.plugin_redmine_dmsf['dmsf_max_ajax_upload_filesize'].presence || 100 # Trash @trash_visible = @folder_manipulation_allowed && @file_manipulation_allowed && diff --git a/app/controllers/dmsf_files_controller.rb b/app/controllers/dmsf_files_controller.rb index b4785365..689eb0ba 100644 --- a/app/controllers/dmsf_files_controller.rb +++ b/app/controllers/dmsf_files_controller.rb @@ -57,7 +57,7 @@ class DmsfFilesController < ApplicationController access.dmsf_file_revision = @revision access.action = DmsfFileRevisionAccess::DownloadAction access.save! - member = Member.where(user_id: User.current.id, project_id: @file.project.id).first + member = Member.find_by(user_id: User.current.id, project_id: @file.project.id) if member && !member.dmsf_title_format.nil? && !member.dmsf_title_format.empty? title_format = member.dmsf_title_format else diff --git a/app/controllers/dmsf_state_controller.rb b/app/controllers/dmsf_state_controller.rb index e3551e56..d3f7107b 100644 --- a/app/controllers/dmsf_state_controller.rb +++ b/app/controllers/dmsf_state_controller.rb @@ -27,7 +27,7 @@ class DmsfStateController < ApplicationController before_action :authorize def user_pref_save - member = @project.members.where(user_id: User.current.id).first + member = @project.members.find_by(user_id: User.current.id) if member member.dmsf_mail_notification = params[:email_notify] member.dmsf_title_format = params[:title_format] diff --git a/app/controllers/dmsf_workflows_controller.rb b/app/controllers/dmsf_workflows_controller.rb index 57001ed3..ad37ab06 100644 --- a/app/controllers/dmsf_workflows_controller.rb +++ b/app/controllers/dmsf_workflows_controller.rb @@ -339,7 +339,7 @@ class DmsfWorkflowsController < ApplicationController end operator = (params[:commit] == l(:dmsf_and)) ? DmsfWorkflowStep::OPERATOR_AND : DmsfWorkflowStep::OPERATOR_OR user_ids = User.where(id: params[:user_ids]).ids - if user_ids.count > 0 + if user_ids.any? user_ids.each do |user_id| ws = DmsfWorkflowStep.new ws.dmsf_workflow_id = @dmsf_workflow.id diff --git a/app/helpers/dmsf_workflows_helper.rb b/app/helpers/dmsf_workflows_helper.rb index 01509f6c..62ba5fbc 100644 --- a/app/helpers/dmsf_workflows_helper.rb +++ b/app/helpers/dmsf_workflows_helper.rb @@ -51,7 +51,7 @@ module DmsfWorkflowsHelper options = Array.new options << [l(:dmsf_new_step), 0] steps.each do |step| - options << [step.name.present? ? step.name : step.step.to_s, step.step] + options << [step.name.presence || step.step.to_s, step.step] end options_for_select(options, 0) end diff --git a/app/models/dmsf_file.rb b/app/models/dmsf_file.rb index e286bec1..eb0cbee0 100644 --- a/app/models/dmsf_file.rb +++ b/app/models/dmsf_file.rb @@ -391,7 +391,7 @@ class DmsfFile < ActiveRecord::Base next if dmsf_attrs.length == 0 || id_attribute == 0 next unless results.select{|f| f.id.to_s == id_attribute}.empty? - dmsf_file = DmsfFile.visible.where(limit_options).where(id: id_attribute).first + dmsf_file = DmsfFile.visible.where(limit_options).find_by(id: id_attribute) if dmsf_file && DmsfFolder.permissions?(dmsf_file.dmsf_folder) if user.allowed_to?(:view_dmsf_files, dmsf_file.project) && @@ -417,7 +417,7 @@ class DmsfFile < ActiveRecord::Base end def display_name - member = Member.where(user_id: User.current.id, project_id: project_id).first + member = Member.find_by(user_id: User.current.id, project_id: project_id) if member && !member.dmsf_title_format.nil? && !member.dmsf_title_format.empty? title_format = member.dmsf_title_format else diff --git a/app/models/dmsf_folder.rb b/app/models/dmsf_folder.rb index fe4d5a0c..8d217888 100644 --- a/app/models/dmsf_folder.rb +++ b/app/models/dmsf_folder.rb @@ -130,9 +130,9 @@ class DmsfFolder < ActiveRecord::Base def self.find_by_title(project, folder, title) if folder - visible.where(project_id: project.id, dmsf_folder_id: nil, title: title).first + visible.find_by(project_id: project.id, dmsf_folder_id: nil, title: title) else - visible.where(project_id: project.id, dmsf_folder_id: folder.id, title: title).first + visible.find_by(project_id: project.id, dmsf_folder_id: folder.id, title: title) end end diff --git a/app/models/dmsf_mailer.rb b/app/models/dmsf_mailer.rb index cfec0697..33adc322 100644 --- a/app/models/dmsf_mailer.rb +++ b/app/models/dmsf_mailer.rb @@ -52,7 +52,7 @@ class DmsfMailer < Mailer end def files_deleted(user, project, files) - if user && files.count > 0 + if user && files.any? redmine_headers 'Project' => project.identifier if project @files = files @project = project diff --git a/app/views/dmsf/_dmsf_rows.erb b/app/views/dmsf/_dmsf_rows.erb index 45540ab1..bdfd2420 100644 --- a/app/views/dmsf/_dmsf_rows.erb +++ b/app/views/dmsf/_dmsf_rows.erb @@ -23,7 +23,7 @@ <% parent = @folder ? @folder : @project %> <% DmsfHelper.all_children_sorted(parent, @pos, @idnt).each do |obj, position| %> <% classes = "dmsf_tree idnt-#{@idnt} hascontextmenu" %> - <% if obj.is_a?(DmsfFolder) && ((obj.dmsf_folders.visible.count > 0) || (obj.dmsf_files.visible.count > 0) || (obj.dmsf_links.visible.count > 0)) %> + <% if obj.is_a?(DmsfFolder) && ((obj.dmsf_folders.visible.any?) || (obj.dmsf_files.visible.any?) || (obj.dmsf_links.visible.any?)) %> <% classes += ' idnt dmsf_collapsed dmsf-not-loaded' %> <% id = "id='#{obj.id}span'".html_safe %> <% onclick = "onclick=\"dmsfToggle('#{obj.id}','#{obj.id}span','#{escape_javascript(expand_folder_dmsf_path)}')\"" %> diff --git a/test/unit/dmsf_workflow_step_test.rb b/test/unit/dmsf_workflow_step_test.rb index 77b2b55a..cd0b5e36 100644 --- a/test/unit/dmsf_workflow_step_test.rb +++ b/test/unit/dmsf_workflow_step_test.rb @@ -72,25 +72,25 @@ class DmsfWorkflowStepTest < RedmineDmsf::Test::UnitTest def test_validate_workflow_id_presence @wfs1.dmsf_workflow_id = nil assert !@wfs1.save - assert@wfs1.errors.count > 0 + assert @wfs1.errors.any? end def test_validate_step_presence @wfs1.step = nil assert !@wfs1.save - assert @wfs1.errors.count > 0 + assert @wfs1.errors.any? end def test_validate_user_id_presence @wfs1.user_id = nil assert !@wfs1.save - assert@wfs1.errors.count > 0 + assert @wfs1.errors.any? end def test_validate_operator_presence @wfs1.operator = nil assert !@wfs1.save - assert @wfs1.errors.count > 0 + assert @wfs1.errors.any? end def test_validate_user_id_uniqueness @@ -98,7 +98,7 @@ class DmsfWorkflowStepTest < RedmineDmsf::Test::UnitTest @wfs2.dmsf_workflow_id = @wfs1.dmsf_workflow_id @wfs2.step = @wfs1.step assert !@wfs2.save - assert @wfs2.errors.count > 0 + assert @wfs2.errors.any? end def test_validate_name_length