From b0abeb510a8bd8459041c03f6fef2ce4d0e7d519 Mon Sep 17 00:00:00 2001
From: Poonam <poonam@poonam.(none)>
Date: Wed, 16 Apr 2014 19:32:16 +0530
Subject: [PATCH] --HR-321 changes related to status change and UI

---
 CRM/Case/Form/Activity/ChangeCaseStatus.php |  4 ++--
 templates/CRM/Case/Form/Activity.tpl        | 14 ++++++++------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/CRM/Case/Form/Activity/ChangeCaseStatus.php b/CRM/Case/Form/Activity/ChangeCaseStatus.php
index 09f31ebac6..bea25807a5 100644
--- a/CRM/Case/Form/Activity/ChangeCaseStatus.php
+++ b/CRM/Case/Form/Activity/ChangeCaseStatus.php
@@ -66,7 +66,7 @@ class CRM_Case_Form_Activity_ChangeCaseStatus {
     $form->removeElement('priority_id');
 
     $form->_caseStatus = CRM_Case_PseudoConstant::caseStatus();
-    $form->_defaultCaseStatus = CRM_Core_DAO::getFieldValue('CRM_Case_DAO_Case', $form->_caseId, 'status_id');
+    $form->_oldCaseStatus = $form->_defaultCaseStatus = CRM_Core_DAO::getFieldValue('CRM_Case_DAO_Case', $form->_caseId, 'status_id');
 
     if (!array_key_exists($form->_defaultCaseStatus, $form->_caseStatus)) {
       $form->_caseStatus[$form->_defaultCaseStatus] = CRM_Core_OptionGroup::getLabel('case_status',
@@ -158,7 +158,7 @@ class CRM_Case_Form_Activity_ChangeCaseStatus {
 
     if ($activity->subject == 'null') {
       $activity->subject = ts('Case status changed from %1 to %2', array(
-          1 => CRM_Utils_Array::value($form->_defaults['case_status_id'], $form->_caseStatus),
+          1 => CRM_Utils_Array::value($form->_oldCaseStatus, $form->_caseStatus),
           2 => CRM_Utils_Array::value($params['case_status_id'], $form->_caseStatus)
         )
       );
diff --git a/templates/CRM/Case/Form/Activity.tpl b/templates/CRM/Case/Form/Activity.tpl
index e5b602d825..0ed466c1ff 100644
--- a/templates/CRM/Case/Form/Activity.tpl
+++ b/templates/CRM/Case/Form/Activity.tpl
@@ -256,12 +256,14 @@
     {if $activityTypeFile NEQ 'ChangeCaseStatus'
     && $activityTypeFile NEQ 'ChangeCaseType'
     && $activityTypeFile NEQ 'ChangeCaseStartDate'}
-    <tr class="crm-case-activity-form-block-status_id">
-      <td class="label">{$form.status_id.label}</td><td class="view-value">{$form.status_id.html}</td>
-    </tr>
-    <tr class="crm-case-activity-form-block-priority_id">
-      <td class="label">{$form.priority_id.label}</td><td class="view-value">{$form.priority_id.html}</td>
-    </tr>
+    <table class="form-layout-compressed">
+      <tr class="crm-case-activity-form-block-status_id">
+        <td class="label">{$form.status_id.label}</td><td class="view-value">{$form.status_id.html}</td>
+      </tr>
+      <tr class="crm-case-activity-form-block-priority_id">
+        <td class="label">{$form.priority_id.label}</td><td class="view-value">{$form.priority_id.html}</td>
+      </tr>
+    </table>
     {/if}
     {if $form.tag.html}
     <tr class="crm-case-activity-form-block-tag">
-- 
2.25.1