CRM-14407 - Fix case custom field popup

diff --git a/CRM/Case/Form/CustomData.php b/CRM/Case/Form/CustomData.php
index 26695a44762087a0005f206883cde47fe712a420..f0dce0724bae72158f341198d1b3fa7f974a8ced 100644 (file)
--- a/CRM/Case/Form/CustomData.php
+++ b/CRM/Case/Form/CustomData.php
@@ -91,8 +91,10 @@ class CRM_Case_Form_CustomData extends CRM_Core_Form {
     );
     // simplified formatted groupTree
     $groupTree = CRM_Core_BAO_CustomGroup::formatGroupTree($groupTree, 1, $this);
+    // Array contains only one item
     foreach ($groupTree as $groupValues) {
       $this->_customTitle = $groupValues['title'];
+      CRM_Utils_System::setTitle(ts('Edit %1', array(1 => $groupValues['title'])));
     }
 
     $this->_defaults = array();

diff --git a/templates/CRM/Case/Form/CustomData.tpl b/templates/CRM/Case/Form/CustomData.tpl
index 0d2eb1a0522a42e71dc44c1db63d14bc37f63157..1eda4fd84bf1635e2fe8a3f0a490afc55d3b0c2c 100644 (file)
--- a/templates/CRM/Case/Form/CustomData.tpl
+++ b/templates/CRM/Case/Form/CustomData.tpl
@@ -23,8 +23,5 @@
  | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
  +--------------------------------------------------------------------+
 *}
-
-<form action="{crmURL p='civicrm/case/cd/edit' q="cgcount=1&action=update&reset=1&entityID=`$entityID`&groupID=`$groupID`&cid=`$contactID`&subType=`$subType`"}" method="post" id="id_case_custom_dialog" >
-    {include file="CRM/Custom/Form/CustomData.tpl"}
-    <div class="html-adjust">{$form.buttons.html}</div>
-</form>
+{include file="CRM/Custom/Form/CustomData.tpl" skipTitle=1}
+<div class="crm-submit-buttons">{include file="CRM/common/formButtons.tpl" location="bottom"}</div>

diff --git a/templates/CRM/Case/Page/CustomDataView.tpl b/templates/CRM/Case/Page/CustomDataView.tpl
index 8811ad8bfd92cf1b557fa0f18378befb0c2b44c9..da6ef019d152bf0049cee3be7fefdf68454cbf95 100644 (file)
--- a/templates/CRM/Case/Page/CustomDataView.tpl
+++ b/templates/CRM/Case/Page/CustomDataView.tpl
@@ -69,14 +69,13 @@
         </table>
       {/foreach}
       <div>
-        <a href="#" class="button" style="margin-left: 6px;"
-           onclick="updateCaseCustom({$caseID}, {$customGroupId}, {$contactID}, {$caseTypeID}); return false;">
+        <a href="{crmURL p="civicrm/case/cd/edit" q="cgcount=1&action=update&reset=1&type=Case&entityID=$caseID&groupID=$customGroupId&cid=$contactID&subType=$caseTypeID"}" class="button">
           <span><div class="icon edit-icon"></div>{ts}Edit{/ts}</span>
         </a>
       </div>
       <br/>
+      <div class="clear"></div>
     </div>
-    <div class="clear"></div>
   </div>
 
   {/foreach}
@@ -119,40 +118,6 @@
     CRM.status({success: '{/literal}{ts escape="js"}Record Deleted{/ts}{literal}'}, request);
   }
   {/literal}
-</script>
-  {else}
-<script type="text/javascript">
-  {literal}
-  function updateCaseCustom( entityID, groupID, contactID, subType ) {
-    var dataURL = {/literal}"{crmURL p="civicrm/case/cd/edit" q="snippet=5&cgcount=1&action=update&reset=1" h=0}"{literal};
-    dataURL = dataURL + '&type=Case&entityID=' + entityID + '&groupID=' + groupID + '&cid=' + contactID + ( subType ? '&subType=' + subType  : '');
-
-    cj.ajax({
-      url: dataURL,
-      success: function(content) {
-        cj('#case_custom_edit').show( ).html(content).dialog({
-          title: "{/literal}{ts escape='js'}Update Case Information{/ts}{literal}",
-          modal: true,
-          width: 680,
-          overlay: {
-            opacity: 0.5,
-            background: "black"
-          },
-          open: function() {
-            var dialog = this;
-            cj('#_qf_CustomData_cancel').click(function() {
-              cj(dialog).dialog('close');
-              return false;
-            });
-          },
-          close: function(event, ui) {
-            cj(this).dialog('destroy');
-          }
-        });
-      }
-    });
-  }
-  {/literal}
 </script>
 {/if}