wip #4472 @0.5

diff --git a/.idea/deployment.xml b/.idea/deployment.xml
index 4d7d1a3a6d84ae5a7e8f0357c4bb458fde76993b..1b31e236beb283c2f7fe6783e89f4e2f3e0fd7b7 100644 (file)
--- a/.idea/deployment.xml
+++ b/.idea/deployment.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="PublishConfigData" remoteFilesAllowedToDisappearOnAutoupload="false">
+  <component name="PublishConfigData" autoUpload="Always" serverName="batman.cubedesigners.com" remoteFilesAllowedToDisappearOnAutoupload="false">
     <serverData>
       <paths name="apps.fluidbook.com">
         <serverdata>
@@ -9,6 +9,13 @@
           </mappings>
         </serverdata>
       </paths>
+      <paths name="batman.cubedesigners.com">
+        <serverdata>
+          <mappings>
+            <mapping deploy="/" local="$PROJECT_DIR$" web="/" />
+          </mappings>
+        </serverdata>
+      </paths>
       <paths name="ccv-montpellier.fr">
         <serverdata>
           <mappings>
@@ -339,5 +346,6 @@
         </serverdata>
       </paths>
     </serverData>
+    <option name="myAutoUpload" value="ALWAYS" />
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 0a762162357046f070e1a515471164bf38b9f318..b658e95a34610ea9e0f9538c2169bd1c5cf93c12 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="AhkProjectSettings">
+    <option name="defaultAhkSdk" value="AutoHotkey" />
+  </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_1_6">
     <output url="file://$PROJECT_DIR$/out" />
   </component>

diff --git a/lib/redmine_slack/patches/issue_patch.rb b/lib/redmine_slack/patches/issue_patch.rb
index 86dcbda36931f61e386b8af3163eeee38ec83d76..46215926dbc48512e4391a77e35168cb53da6031 100644 (file)
--- a/lib/redmine_slack/patches/issue_patch.rb
+++ b/lib/redmine_slack/patches/issue_patch.rb
@@ -67,13 +67,13 @@ module RedmineSlack
 
         def send_redmine_slack_update
           #return if current_journal.nil?
-          # return if RequestStore.store[:redmine_slack_silent].nil?
+          return if RequestStore.store[:redmine_slack_silent].nil?
 
           channels = Slack.channels_for_project project
 
-          #return unless channels.present? && Slack.setting_for_project(project, :post_updates)
-          #return if is_private? && !Slack.setting_for_project(project, :post_private_issues)
-          #return if current_journal.private_notes? && !Slack.setting_for_project(project, :post_private_notes)
+          return unless channels.present? && Slack.setting_for_project(project, :post_updates)
+          return if is_private? && !Slack.setting_for_project(project, :post_private_issues)
+          return if current_journal.private_notes? && !Slack.setting_for_project(project, :post_private_notes)
 
           set_language_if_valid Setting.default_language
 
@@ -140,12 +140,12 @@ module RedmineSlack
 
           attachment[:fields] = fields if fields.any?
 
-          # send_message = true
-          # if Slack.setting_for_project(project, :supress_empty_messages)
-          #   send_message = false unless (attachment.any? && attachment.key?(:text)) || !text_diff.empty?
-          # end
-          #
-          # return unless send_message
+          send_message = true
+          if Slack.setting_for_project(project, :supress_empty_messages)
+            send_message = false unless (attachment.any? && attachment.key?(:text)) || !text_diff.empty?
+          end
+
+          return unless send_message
 
           attachment[:color] = Slack.textfield_for_project(project, :color_update_notifications)