Merge branch 'master' into 2.0

eltrino · Feb 13, 2017 · f85fb58 · f85fb58
2 parents 401e91d + 4f28d4d
commit f85fb58
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 11 deletions.
diff --git a/src/Diamante/AutomationBundle/Infrastructure/Changeset/FieldProcessor.php b/src/Diamante/AutomationBundle/Infrastructure/Changeset/FieldProcessor.php
@@ -26,4 +26,4 @@ interface FieldProcessor
      * @return mixed
      */
     public function processField($input);
-}
+}
diff --git a/...iamante/AutomationBundle/Infrastructure/Changeset/FieldProcessor/AttachmentsProcessor.php b/...iamante/AutomationBundle/Infrastructure/Changeset/FieldProcessor/AttachmentsProcessor.php
@@ -19,9 +19,9 @@
 use Diamante\DeskBundle\Entity\Attachment;
 
 /**
- * Class ChangesetBuilder
+ * Class AttachmentsProcessor
  *
- * @package Diamante\AutomationBundle\Infrastructure\Changeset
+ * @package Diamante\AutomationBundle\Infrastructure\Changeset\FieldProcessor
  */
 class AttachmentsProcessor implements FieldProcessor
 {
@@ -40,4 +40,4 @@ public function processField($input)
 
         return $output;
     }
-}
+}
diff --git a/src/Diamante/AutomationBundle/Infrastructure/Changeset/FieldProcessor/DefaultProcessor.php b/src/Diamante/AutomationBundle/Infrastructure/Changeset/FieldProcessor/DefaultProcessor.php
@@ -18,9 +18,8 @@
 use Diamante\AutomationBundle\Infrastructure\Changeset\FieldProcessor;
 
 /**
- * Class ChangesetBuilder
- *
- * @package Diamante\AutomationBundle\Infrastructure\Changeset
+ * Class DefaultProcessor
+ * @package Diamante\AutomationBundle\Infrastructure\Changeset\FieldProcessor
  */
 class DefaultProcessor implements FieldProcessor
 {
@@ -33,4 +32,4 @@ public function processField($input)
     {
         return $input;
     }
-}
+}
diff --git a/src/Diamante/AutomationBundle/Infrastructure/Changeset/FieldProcessorProvider.php b/src/Diamante/AutomationBundle/Infrastructure/Changeset/FieldProcessorProvider.php
@@ -18,7 +18,7 @@
 use Diamante\AutomationBundle\Infrastructure\Changeset\FieldProcessor\DefaultProcessor;
 
 /**
- * Interface FieldProcessor
+ * Class FieldProcessorProvider
  * @package Diamante\AutomationBundle\Infrastructure\Changeset
  */
 class FieldProcessorProvider
@@ -49,4 +49,4 @@ public function provideProcessor($fieldName)
 
         return new DefaultProcessor();
     }
-}
+}
diff --git a/src/Diamante/AutomationBundle/Resources/config/services.xml b/src/Diamante/AutomationBundle/Resources/config/services.xml
@@ -33,6 +33,7 @@
         <parameter key="diamante_automation.command_factory.class">Diamante\AutomationBundle\Form\CommandFactory</parameter>
         <parameter key="diamante_automation.frontend.options.resolver.class">Diamante\AutomationBundle\Configuration\FrontendOptionsResolver</parameter>
         <parameter key="diamante_automation.changeset.builder.class">Diamante\AutomationBundle\Infrastructure\Changeset\ChangesetBuilder</parameter>
+        <parameter key="diamante_automation.changeset.field_processor_provider.class">Diamante\AutomationBundle\Infrastructure\Changeset\FieldProcessorProvider</parameter>
         <parameter key="diamante_automation.action.execution_context.class">Diamante\AutomationBundle\Rule\Action\ExecutionContext</parameter>
         <parameter key="diamante_automation.action.comment_notifier.class">Diamante\DeskBundle\Automation\Action\Email\CommentNotifier</parameter>
         <parameter key="diamante_automation.action.ticket_notifier.class">Diamante\DeskBundle\Automation\Action\Email\TicketNotifier</parameter>
@@ -143,6 +144,8 @@
             <argument type="service" id="service_container"/>
         </service>
 
+        <service id="diamante_automation.changeset.field_processor_provider" class="%diamante_automation.changeset.field_processor_provider.class%"/>
+
         <service id="diamante_automation.engine" class="%diamante_automation.engine.class%">
             <argument type="service" id="diamante_automation.config.provider"/>
             <argument type="service" id="diamante_automation.action.provider"/>

diff --git a/src/Diamante/DeskBundle/Resources/views/Automation/Notification/notification.html.twig b/src/Diamante/DeskBundle/Resources/views/Automation/Notification/notification.html.twig
@@ -64,7 +64,6 @@
 
                                     {% if new is not null %}
                                         {% if key in html_options %}
-                                            <p style="color: #A09F9F; font-size: 14px; font-weight: 200; line-height: 18px; margin: 0; padding: 5px 15px 0 0; white-space: nowrap; vertical-align: top;">{{ key|capitalize }}:</p>
                                             {% if old is not null %}
                                                 <del>{{ old|striptags }}</del><br/>{{ new|striptags }}
                                             {% else %}
-Original file line number
+Diff line change
@@ Expand Up / @@ -26,4 +26,4 @@ interface FieldProcessor @@
          * @return mixed
          */
         public function processField($input);
-    }
+    }