From 19f7c9cd0544b55ba1c82d0835a7e3f1e70353b2 Mon Sep 17 00:00:00 2001
From: Alexander Meindl <a.meindl@alphanodes.com>
Date: Thu, 25 May 2017 14:23:45 +0200
Subject: [PATCH] Some code cleanups

---
 app/views/messenger_settings/_show.html.erb   | 148 +++++++++---------
 .../settings/_messenger_settings.html.erb     |   2 +-
 lib/redmine_messenger.rb                      |   5 +-
 3 files changed, 77 insertions(+), 78 deletions(-)

diff --git a/app/views/messenger_settings/_show.html.erb b/app/views/messenger_settings/_show.html.erb
index ea8f110..ce529ff 100644
--- a/app/views/messenger_settings/_show.html.erb
+++ b/app/views/messenger_settings/_show.html.erb
@@ -1,74 +1,74 @@
-
-<div class="box tabular messenger_settings">
-  <%
-    @messenger_setting = MessengerSetting.find_or_create(@project.id)
-%>
-
-<%= labelled_form_for :setting, @messenger_setting,
-                      url: { controller: 'messenger_settings',
-                             action: 'save', id: @project, tab: 'messenger',
-                             partial: 'messenger_settings/save',
-                             setting_id: @messenger_setting.id } do |f| %>
-    <%= error_messages_for 'messenger_setting' %>
-    <div class="box">
-
-      <div class="info"><%= t(:messenger_settings_project_intro) %></div><br />
-
-      <p><%= f.text_field :messenger_url, size: 60, label: l(:label_settings_messenger_url) %><em class="info"><%= l(:label_messenger_project_text_field_info) %> (<%= l(:label_messenger_default_not_visible) %>)</em></p>
-
-      <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_icon, size: 60 } %>
-      <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_channel, size: 30 } %>
-      <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_username, size: 30 } %>
-
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :messenger_verify_ssl } %>
-
-      <br />
-      <h3><%= l(:label_issue_plural) %></h3>
-
-      <div class="info"><%= t(:messenger_issue_intro) %></div><br />
-
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :auto_mentions } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :display_watchers } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_updates } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :new_include_description } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :updated_include_description } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_issues } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_notes } %>
-
-      <br />
-      <h3><%= l(:label_wiki) %></h3>
-
-      <div class="info"><%= t(:messenger_wiki_intro) %></div><br />
-
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki_updates } %>
-
-      <% if RedmineMessenger::REDMINE_DB_SUPPORT %>
-      <br />
-      <h3><%= l(:label_db_entry_plural) %></h3>
-      <div class="info"><%= t(:messenger_db_intro) %></div><br />
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db_updates } %>
-      <% end %>
-
-      <% if RedmineMessenger::REDMINE_CONTACTS_SUPPORT %>
-      <br />
-      <h3><%= l(:label_contact_plural) %></h3>
-      <div class="info"><%= t(:messenger_contacts_intro) %></div><br />
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact_updates } %>
-      <% end %>
-
-      <% if RedmineMessenger::REDMINE_PASSWORDS_SUPPORT %>
-      <br />
-      <h3><%= l(:label_settings_post_password) %></h3>
-      <div class="info"><%= t(:messenger_passwords_intro) %></div><br />
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password } %>
-      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password_updates } %>
-      <% end %>
-
-    </div>
-    <%= submit_tag l(:button_save) %>
-<% end %>
-
-</div>
+
+<div class="box tabular messenger_settings">
+  <%
+    @messenger_setting = MessengerSetting.find_or_create(@project.id)
+%>
+
+<%= labelled_form_for :setting, @messenger_setting,
+                      url: { controller: 'messenger_settings',
+                             action: 'save', id: @project, tab: 'messenger',
+                             partial: 'messenger_settings/save',
+                             setting_id: @messenger_setting.id } do |f| %>
+    <%= error_messages_for 'messenger_setting' %>
+    <div class="box">
+
+      <div class="info"><%= t(:messenger_settings_project_intro) %></div><br />
+
+      <p><%= f.text_field :messenger_url, size: 60, label: l(:label_settings_messenger_url) %><em class="info"><%= l(:label_messenger_project_text_field_info) %> (<%= l(:label_messenger_default_not_visible) %>)</em></p>
+
+      <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_icon, size: 60 } %>
+      <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_channel, size: 30 } %>
+      <%= render partial: 'messenger_settings/messenger_text', locals: { f: f, mf: :messenger_username, size: 30 } %>
+
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :messenger_verify_ssl } %>
+
+      <br />
+      <h3><%= l(:label_issue_plural) %></h3>
+
+      <div class="info"><%= t(:messenger_issue_intro) %></div><br />
+
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :auto_mentions } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :display_watchers } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_updates } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :new_include_description } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :updated_include_description } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_issues } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_private_notes } %>
+
+      <br />
+      <h3><%= l(:label_wiki) %></h3>
+
+      <div class="info"><%= t(:messenger_wiki_intro) %></div><br />
+
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_wiki_updates } %>
+
+      <% if RedmineMessenger::REDMINE_DB_SUPPORT && User.current.allowed_to?(:view_db_entries, @project) %>
+      <br />
+      <h3><%= l(:label_db_entry_plural) %></h3>
+      <div class="info"><%= t(:messenger_db_intro) %></div><br />
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_db_updates } %>
+      <% end %>
+
+      <% if RedmineMessenger::REDMINE_CONTACTS_SUPPORT && User.current.allowed_to?(:view_contacts, @project) %>
+      <br />
+      <h3><%= l(:label_contact_plural) %></h3>
+      <div class="info"><%= t(:messenger_contacts_intro) %></div><br />
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_contact_updates } %>
+      <% end %>
+
+      <% if Redmine::Plugin.installed?('redmine_passwords') && User.current.allowed_to?(:view_passwords, @project) %>
+      <br />
+      <h3><%= l(:label_settings_post_password) %></h3>
+      <div class="info"><%= t(:messenger_passwords_intro) %></div><br />
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password } %>
+      <%= render partial: 'messenger_settings/messenger_select', locals: { f: f, mf: :post_password_updates } %>
+      <% end %>
+
+    </div>
+    <%= submit_tag l(:button_save) %>
+<% end %>
+
+</div>
diff --git a/app/views/settings/_messenger_settings.html.erb b/app/views/settings/_messenger_settings.html.erb
index 60aadca..793be6e 100644
--- a/app/views/settings/_messenger_settings.html.erb
+++ b/app/views/settings/_messenger_settings.html.erb
@@ -109,7 +109,7 @@
 </p>
 <% end %>
 
-<% if RedmineMessenger::REDMINE_PASSWORDS_SUPPORT %>
+<% if Redmine::Plugin.installed?('redmine_passwords') %>
 <br />
 <h3><%= l(:label_password_plural) %></h3>
 
diff --git a/lib/redmine_messenger.rb b/lib/redmine_messenger.rb
index 7e6f739..1290c1e 100644
--- a/lib/redmine_messenger.rb
+++ b/lib/redmine_messenger.rb
@@ -1,8 +1,6 @@
 # Redmine Messenger plugin for Redmine
 
 Rails.configuration.to_prepare do
-  require_dependency 'projects_helper'
-
   # Patches
   require_dependency 'redmine_messenger/patches/issue_patch'
   require_dependency 'redmine_messenger/patches/wiki_page_patch'
@@ -10,7 +8,7 @@ Rails.configuration.to_prepare do
 
   require 'redmine_messenger/patches/contact_patch' if RedmineMessenger::REDMINE_CONTACTS_SUPPORT
   require 'redmine_messenger/patches/db_entry_patch' if RedmineMessenger::REDMINE_DB_SUPPORT
-  require 'redmine_messenger/patches/password_patch' if RedmineMessenger::REDMINE_PASSWORDS_SUPPORT
+  require 'redmine_messenger/patches/password_patch' if Redmine::Plugin.installed?('redmine_passwords')
 
   # Global helpers
   require_dependency 'redmine_messenger/helpers'
@@ -22,6 +20,7 @@ end
 module RedmineMessenger
   REDMINE_CONTACTS_SUPPORT = Redmine::Plugin.installed?('redmine_contacts') ? true : false
   REDMINE_DB_SUPPORT = Redmine::Plugin.installed?('redmine_db') ? true : false
+  # this does not work at the moment, because redmine loads passwords after messener plugin
   REDMINE_PASSWORDS_SUPPORT = Redmine::Plugin.installed?('redmine_passwords') ? true : false
 
   def self.settings