Merge pull request #226 from laboro/fix/call_issues

ignat-s · ignat-s · commit 6abfc221999d · 2013-12-04T06:26:18.000-08:00
CRM-634: Call window has error when Assign option is set as None
diff --git a/src/OroCRM/Bundle/AccountBundle/Resources/config/services.yml b/src/OroCRM/Bundle/AccountBundle/Resources/config/services.yml
@@ -88,7 +88,7 @@ services:
         tags:
             - { name: kernel.event_listener, event: oro_datagrid.datgrid.build.after.account-contacts-view-grid, method: onBuildAfter }
 
-    orocrm_account.event_listener.account_contacts_updagte_listener:
+    orocrm_account.event_listener.account_contacts_update_listener:
         class: %oro_datagrid.event_listener.base_orm_relation.class%
         arguments:
            - 'account'
diff --git a/src/OroCRM/Bundle/CallBundle/Controller/CallController.php b/src/OroCRM/Bundle/CallBundle/Controller/CallController.php
@@ -81,23 +81,22 @@ public function callsAction(Request $request)
     }
 
     /**
-     * @param int $contactId
+     * @param int|null $contactId
      * @return Call
+     * @throws \Symfony\Component\HttpKernel\Exception\NotFoundHttpException
      */
     protected function initEntity($contactId = null)
     {
         $entity = new Call();
-        $user = $this->container->get('security.context')->getToken()->getUser();
-        $entity->setOwner($user);
 
         $callStatus = $this->getDoctrine()
-                           ->getRepository('OroCRMCallBundle:CallStatus')
-                           ->findOneByStatus('completed');
+            ->getRepository('OroCRMCallBundle:CallStatus')
+            ->findOneByStatus('completed');
         $entity->setCallStatus($callStatus);
 
         $callDirection = $this->getDoctrine()
-                           ->getRepository('OroCRMCallBundle:CallDirection')
-                           ->findOneByDirection('outgoing');
+            ->getRepository('OroCRMCallBundle:CallDirection')
+            ->findOneByDirection('outgoing');
         $entity->setDirection($callDirection);
         
         if ($contactId) {
diff --git a/src/OroCRM/Bundle/CallBundle/Resources/config/navigation.yml b/src/OroCRM/Bundle/CallBundle/Resources/config/navigation.yml
@@ -25,5 +25,5 @@ oro_menu_config:
 
 oro_titles:
     orocrm_call_index: Calls
-    orocrm_call_update: %%subject%% - Edit Call
-    orocrm_call_create: Create Call
+    orocrm_call_update: %%subject%% - Edit
+    orocrm_call_create: Log Call
diff --git a/src/OroCRM/Bundle/CallBundle/Resources/translations/messages.en.yml b/src/OroCRM/Bundle/CallBundle/Resources/translations/messages.en.yml
@@ -3,16 +3,6 @@ orocrm.call.controller.call.deleted.message: 'Call deleted successfully'
 orocrm.call.phone.required.message: 'Phone number is required field'
 
 orocrm.call.form.call.other: 'Other...'
-orocrm.call.form.call.owner: 'Owner'
-orocrm.call.form.call.subject: 'Subject'
-orocrm.call.form.call.notes: 'Notes'
-orocrm.call.form.call.dateTime: 'Call Date & Time'
-orocrm.call.form.call.relatedTo: 'Related To'
-orocrm.call.form.call.relatedContact: 'Related Contact'
-orocrm.call.form.call.phoneNumber: 'Phone Number'
-orocrm.call.form.call.contactPhoneNumber: 'Phone Number'
-orocrm.call.form.call.direction: 'Direction'
-orocrm.call.form.call.duration: 'Duration'
 
 orocrm.call.datagrid.contact_name: 'Contact name'
 orocrm.call.datagrid.account_name: 'Account name'
@@ -30,4 +20,4 @@ orocrm.call.datagrid.date_time: 'Call date'
 'Log call': 'Log call'
 'Call logged successfully': 'Call logged successfully'
 'Call deleted successfully': 'Call deleted successfully'
-'Phone number is required field': 'Phone number is required field'
+'Phone number is required field': 'Phone number is required field'
diff --git a/src/OroCRM/Bundle/CallBundle/Resources/views/Call/index.html.twig b/src/OroCRM/Bundle/CallBundle/Resources/views/Call/index.html.twig
@@ -8,8 +8,8 @@
         <div class="btn-group">
             {{ UI.addButton({
                 'path' : path('orocrm_call_create'),
-                'title' : 'Create call'|trans,
-                'label' : 'Create call'|trans
+                'title' : 'Log call'|trans,
+                'label' : 'Log call'|trans
             }) }}
         </div>
     {% endif %}
diff --git a/src/OroCRM/Bundle/CallBundle/Resources/views/Call/update.html.twig b/src/OroCRM/Bundle/CallBundle/Resources/views/Call/update.html.twig
@@ -17,42 +17,44 @@
     {% set id = 'call-log' %}
 
     {% if form.vars.value.id %}
-        {% set title = 'Update call log'|trans %}
+        {% set title = 'Edit call'|trans %}
     {% else %}
-        {% set title = 'Add call log'|trans %}
+        {% set title = 'Log call'|trans %}
     {% endif %}
 
+    {% set formFields = [] %}
+    {% if form.owner is defined %}
+        {% set formFields = formFields|merge([form_row(form.owner)]) %}
+    {% endif %}
+    {% set formFields = formFields|merge([
+        form_row(form.subject, {'label': 'Subject'|trans}),
+        form_row(form.notes, {'label': 'Notes'|trans}),
+        form_row(form.callDateTime, {'label': 'Call Date & Time'|trans}),
+        form_row(form.relatedAccount, {'label': 'Related To'|trans}),
+        form_row(form.relatedContact, {'label': 'Related Contact'|trans}),
+        form_row(form.contactPhoneNumber, {'label': 'Phone Number'|trans}),
+        form_widget(form.phoneNumber),
+        form_row(form.direction, {'label': 'Direction'|trans}),
+        form_row(form.duration, {'label': 'Duration'|trans}),
+        form_row(form.callStatus),
+        form_rest(form)
+    ]) %}
+
     {% set dataBlocks = [{
-            'title': title,
-            'class': 'active',
-            'subblocks': [
-                {
-                    'title': title,
-                    'data': [
-                        form_row(form.owner, {'label': 'orocrm.call.form.call.owner'|trans}),
-                        form_row(form.subject, {'label': 'orocrm.call.form.call.subject'|trans}),
-                        form_row(form.notes, {'label': 'orocrm.call.form.call.notes'|trans}),
-                        form_row(form.callDateTime, {'label': 'orocrm.call.form.call.dateTime'|trans}),
-                        form_row(form.relatedAccount, {'label': 'orocrm.call.form.call.relatedTo'|trans}),
-                        form_row(form.relatedContact, {'label': 'orocrm.call.form.call.relatedContact'|trans}),
-                        form_row(form.contactPhoneNumber, {'label': 'orocrm.call.form.call.phoneNumber'|trans}),
-                        form_widget(form.phoneNumber),
-                        form_row(form.direction, {'label': 'orocrm.call.form.call.direction'|trans}),
-                        form_row(form.duration, {'label': 'orocrm.call.form.call.duration'|trans}),
-                        form_row(form.callStatus),
-                        form_rest(form)
-                    ]
-                }
-            ]
-        }]
-    %}
+        'title': title,
+        'class': 'active',
+        'subblocks': [
+            {
+                'title': title,
+                'data': formFields
+            }
+        ]
+    }] %}
 
-    {% set data =
-        {
-            'formErrors': form_errors(form)? form_errors(form) : null,
-            'dataBlocks': dataBlocks,
-        }
-    %}
+    {% set data = {
+        'formErrors': form_errors(form)? form_errors(form) : null,
+        'dataBlocks': dataBlocks,
+    } %}
 
     <script type="text/javascript">
         require(['jquery', 'orocrm/contactphone/view'],
@@ -89,7 +91,7 @@
             'entity':      form.vars.value,
             'indexPath':   path('orocrm_call_index'),
             'indexLabel': 'Calls'|trans,
-            'entityTitle': 'New Call'|trans
+            'entityTitle': 'Log call'|trans
         }
         %}
     {% endif %}
diff --git a/src/OroCRM/Bundle/CallBundle/Resources/views/Call/widget/update.html.twig b/src/OroCRM/Bundle/CallBundle/Resources/views/Call/widget/update.html.twig
@@ -23,23 +23,19 @@
             <form id="{{ form.vars.name }}" action="{{ path('orocrm_call_create', {'no_redirect': true }) }}" method="post">
                 <fieldset class="form form-horizontal">
                     <div class="span6">
-
-                        {{ form_row(form.owner, {'label': 'orocrm.call.form.call.owner'|trans}) }}
-                        {{ form_row(form.subject, {'label': 'orocrm.call.form.call.subject'|trans}) }}
-                        {{ form_row(form.notes, {'label': 'orocrm.call.form.call.notes'|trans}) }}
-                        {{ form_row(form.callDateTime, {'label': 'orocrm.call.form.call.dateTime'|trans}) }}
-
+                        {% if form.owner is defined %}{{ form_row(form.owner) }}{% endif %}
+                        {{ form_row(form.subject, {'label': 'Subject'|trans}) }}
+                        {{ form_row(form.notes, {'label': 'Notes'|trans}) }}
+                        {{ form_row(form.callDateTime, {'label': 'Call Date & Time'|trans}) }}
                     </div>
                     <div class="span6">
-
-                        {{ form_row(form.relatedAccount, {'label': 'orocrm.call.form.call.relatedTo'|trans}) }}
-                        {{ form_row(form.relatedContact, {'label': 'orocrm.call.form.call.relatedContact'|trans}) }}
-                        {{ form_row(form.contactPhoneNumber, {'label': 'orocrm.call.form.call.phoneNumber'|trans}) }}
+                        {{ form_row(form.relatedAccount, {'label': 'Related To'|trans}) }}
+                        {{ form_row(form.relatedContact, {'label': 'Related Contact'|trans}) }}
+                        {{ form_row(form.contactPhoneNumber, {'label': 'Phone Number'|trans}) }}
                         {{ form_widget(form.phoneNumber) }}
-                        {{ form_row(form.direction, {'label': 'orocrm.call.form.call.direction'|trans}) }}
-                        {{ form_row(form.duration, {'label': 'orocrm.call.form.call.duration'|trans}) }}
+                        {{ form_row(form.direction, {'label': 'Direction'|trans}) }}
+                        {{ form_row(form.duration, {'label': 'Duration'|trans}) }}
                         {{ form_row(form.callStatus) }}
-
                     </div>
                     {{ form_rest(form) }}
                     <div class="widget-actions form-actions">
diff --git a/src/OroCRM/Bundle/SalesBundle/Resources/views/Lead/update.html.twig b/src/OroCRM/Bundle/SalesBundle/Resources/views/Lead/update.html.twig
@@ -85,32 +85,37 @@
 {% block content_data %}
     {% set id = 'lead-profile' %}
 
+    {% set formFields = [] %}
+    {% if form.owner is defined %}
+        {% set formFields = formFields|merge([form_row(form.owner)]) %}
+    {% endif %}
+    {% set formFields = formFields|merge([
+        form_row(form.name, {'label': 'Lead Name'}),
+        form_row(form.namePrefix, {'label': 'Name prefix'}),
+        form_row(form.firstName, {'label': 'First name'}),
+        form_row(form.middleName, {'label': 'Middle name'}),
+        form_row(form.lastName, {'label': 'Last name'}),
+        form_row(form.nameSuffix, {'label': 'Name suffix'}),
+        form_row(form.contact, {'label': 'Contact'}),
+        form_row(form.jobTitle, {'label': 'Job Title'}),
+
+        form_row(form.phoneNumber, {'label': 'Phone Number'}),
+        form_row(form.email, {'label': 'Email'}),
+
+        form_row(form.account, {'label': 'Account'}),
+        form_row(form.companyName, {'label': 'Company Name'}),
+        form_row(form.website, {'label': 'Website'}),
+        form_row(form.numberOfEmployees, {'label': 'Number Of Employees'}),
+        form_row(form.industry, {'label': 'Industry'})
+    ]) %}
+
     {% set dataBlocks = [{
             'title': 'General',
             'class': 'active',
             'subblocks': [
                 {
                     'title': 'Lead Information',
-                    'data': [
-                        form_row(form.owner, {'label': 'Owner'}),
-                        form_row(form.name, {'label': 'Lead Name'}),
-                        form_row(form.namePrefix, {'label': 'Name prefix'}),
-                        form_row(form.firstName, {'label': 'First name'}),
-                        form_row(form.middleName, {'label': 'Middle name'}),
-                        form_row(form.lastName, {'label': 'Last name'}),
-                        form_row(form.nameSuffix, {'label': 'Name suffix'}),
-                        form_row(form.contact, {'label': 'Contact'}),
-                        form_row(form.jobTitle, {'label': 'Job Title'}),
-
-                        form_row(form.phoneNumber, {'label': 'Phone Number'}),
-                        form_row(form.email, {'label': 'Email'}),
-
-                        form_row(form.account, {'label': 'Account'}),
-                        form_row(form.companyName, {'label': 'Company Name'}),
-                        form_row(form.website, {'label': 'Website'}),
-                        form_row(form.numberOfEmployees, {'label': 'Number Of Employees'}),
-                        form_row(form.industry, {'label': 'Industry'}),
-                    ]
+                    'data': formFields
                 },
                 {
                     'title': 'Address',
diff --git a/src/OroCRM/Bundle/SalesBundle/Resources/views/Opportunity/update.html.twig b/src/OroCRM/Bundle/SalesBundle/Resources/views/Opportunity/update.html.twig
@@ -65,25 +65,30 @@
 {% block content_data %}
     {% set id = 'opportunity-profile' %}
 
+    {% set formFields = [] %}
+    {% if form.owner is defined %}
+        {% set formFields = formFields|merge([form_row(form.owner)]) %}
+    {% endif %}
+    {% set formFields = formFields|merge([
+        form_row(form.name, {'label': 'Opportunity name'|trans}),
+        form_row(form.contact, {'label': 'Contact'|trans}),
+        form_row(form.account, {'label': 'Account'|trans}),
+        form_row(form.probability, {'label': 'Probability'|trans}),
+        form_row(form.budgetAmount, {'label': 'Budget amount'|trans}),
+        form_row(form.customerNeed, {'label': 'Customer need'|trans}),
+        form_row(form.proposedSolution, {'label': 'Proposed solution'|trans}),
+        form_row(form.closeReason, {'label': 'Close reason'|trans}),
+        form_row(form.closeRevenue, {'label': 'Close revenue'|trans}),
+        form_row(form.closeDate, {'label': 'Close date'|trans})
+    ]) %}
+
     {% set dataBlocks = [{
         'title': 'General',
         'class': 'active',
         'subblocks': [
             {
                 'title': 'Opportunity Information',
-                'data': [
-                    form_row(form.owner),
-                    form_row(form.name, {'label': 'Opportunity name'|trans}),
-                    form_row(form.contact, {'label': 'Contact'|trans}),
-                    form_row(form.account, {'label': 'Account'|trans}),
-                    form_row(form.probability, {'label': 'Probability'|trans}),
-                    form_row(form.budgetAmount, {'label': 'Budget amount'|trans}),
-                    form_row(form.customerNeed, {'label': 'Customer need'|trans}),
-                    form_row(form.proposedSolution, {'label': 'Proposed solution'|trans}),
-                    form_row(form.closeReason, {'label': 'Close reason'|trans}),
-                    form_row(form.closeRevenue, {'label': 'Close revenue'|trans}),
-                    form_row(form.closeDate, {'label': 'Close date'|trans})
-                ]
+                'data': formFields
             }
         ]
     }] %}
