From 41b47b8a7e84d491d0f8f07294cb1f27b83cb13e Mon Sep 17 00:00:00 2001
From: Coleman Watts <coleman@civicrm.org>
Date: Thu, 2 Jan 2014 13:36:31 -0800
Subject: [PATCH] CRM-13863 - Fix relationship form to work in popup

---
 CRM/Contact/Form/Relationship.php             |  7 +++--
 CRM/Contact/Page/View/Relationship.php        | 13 ++------
 CRM/Contact/Page/View/Summary.php             |  3 +-
 templates/CRM/Contact/Form/Relationship.tpl   | 30 ++++++++-----------
 .../CRM/Contact/Page/View/Relationship.tpl    | 13 ++++----
 5 files changed, 27 insertions(+), 39 deletions(-)

diff --git a/CRM/Contact/Form/Relationship.php b/CRM/Contact/Form/Relationship.php
index 9d59760020..8eea3342eb 100644
--- a/CRM/Contact/Form/Relationship.php
+++ b/CRM/Contact/Form/Relationship.php
@@ -282,7 +282,7 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
     $relTypeID = explode('_', $this->_rtypeId, 3);
 
     if ($this->_action & CRM_Core_Action::DELETE) {
-
+      $this->assign('id', $this->_relationshipId);
       $this->addButtons(array(
           array(
             'type' => 'next',
@@ -690,8 +690,9 @@ class CRM_Contact_Form_Relationship extends CRM_Core_Form {
         CRM_Contact_BAO_Contact_Utils::setCurrentEmployer($currentEmpParams);
       }
     }
-
-    if ($quickSave) {
+    // Don't redirect in ajaxForm context
+    // FIXME: Perhaps changing the button type would avoid needing the redirect at allq
+    if ($quickSave && empty($_REQUEST['snippet'])) {
       $session = CRM_Core_Session::singleton();
       CRM_Utils_System::redirect($session->popUserContext());
     }
diff --git a/CRM/Contact/Page/View/Relationship.php b/CRM/Contact/Page/View/Relationship.php
index b3ab7bd1ad..153bdf14f1 100644
--- a/CRM/Contact/Page/View/Relationship.php
+++ b/CRM/Contact/Page/View/Relationship.php
@@ -314,10 +314,6 @@ class CRM_Contact_Page_View_Relationship extends CRM_Core_Page {
    */
   static function &links() {
     if (!(self::$_links)) {
-      $deleteExtra  = ts('Are you sure you want to delete this relationship?');
-      $disableExtra = ts('Are you sure you want to disable this relationship?');
-      $enableExtra  = ts('Are you sure you want to re-enable this relationship?');
-
       self::$_links = array(
         CRM_Core_Action::VIEW => array(
           'name' => ts('View'),
@@ -333,23 +329,18 @@ class CRM_Contact_Page_View_Relationship extends CRM_Core_Page {
         ),
         CRM_Core_Action::ENABLE => array(
           'name' => ts('Enable'),
-          'url' => 'civicrm/contact/view/rel',
-          'qs' => 'action=enable&reset=1&cid=%%cid%%&id=%%id%%&rtype=%%rtype%%&selectedChild=rel',
-          'extra' => 'onclick = "return confirm(\'' . $enableExtra . '\');"',
+          'ref' => 'crm-enable-disable',
           'title' => ts('Enable Relationship'),
         ),
         CRM_Core_Action::DISABLE => array(
           'name' => ts('Disable'),
-          'url' => 'civicrm/contact/view/rel',
-          'qs' => 'action=disable&reset=1&cid=%%cid%%&id=%%id%%&rtype=%%rtype%%&selectedChild=rel',
-          'extra' => 'onclick = "return confirm(\'' . $disableExtra . '\');"',
+          'ref' => 'crm-enable-disable',
           'title' => ts('Disable Relationship'),
         ),
         CRM_Core_Action::DELETE => array(
           'name' => ts('Delete'),
           'url' => 'civicrm/contact/view/rel',
           'qs' => 'action=delete&reset=1&cid=%%cid%%&id=%%id%%&rtype=%%rtype%%',
-          'extra' => 'onclick = "if (confirm(\'' . $deleteExtra . '\') ) this.href+=\'&amp;confirmed=1\'; else return false;"',
           'title' => ts('Delete Relationship'),
         ),
         // FIXME: Not sure what to put as the key.
diff --git a/CRM/Contact/Page/View/Summary.php b/CRM/Contact/Page/View/Summary.php
index ad287fdec1..b8197b6f90 100644
--- a/CRM/Contact/Page/View/Summary.php
+++ b/CRM/Contact/Page/View/Summary.php
@@ -211,8 +211,7 @@ class CRM_Contact_Page_View_Summary extends CRM_Contact_Page_View {
     }
 
     if (CRM_Utils_Array::value('gender_id', $defaults)) {
-      $gender = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'gender_id', array('localize' => TRUE));
-      $defaults['gender_display'] = $gender[CRM_Utils_Array::value('gender_id', $defaults)];
+      $defaults['gender_display'] = CRM_Core_PseudoConstant::getLabel('CRM_Contact_DAO_Contact', 'gender_id', $defaults['gender_id']);
     }
 
     $communicationStyle = CRM_Core_PseudoConstant::get('CRM_Contact_DAO_Contact', 'communication_style_id');
diff --git a/templates/CRM/Contact/Form/Relationship.tpl b/templates/CRM/Contact/Form/Relationship.tpl
index b712db17ad..05fb113600 100644
--- a/templates/CRM/Contact/Form/Relationship.tpl
+++ b/templates/CRM/Contact/Form/Relationship.tpl
@@ -72,7 +72,7 @@
         {/foreach}
         </table>
         {include file="CRM/Custom/Page/CustomDataView.tpl"}
-        <div class="crm-submit-buttons"><a class="button" name='form-submit cancel' href="{crmURL p='civicrm/contact/view' q='action=browse&selectedChild=rel'}">{ts}Done{/ts}</a></div>
+        <div class="crm-submit-buttons"><a class="button form-submit cancel" href="{crmURL p='civicrm/contact/view' q='action=browse&selectedChild=rel'}">{ts}Done{/ts}</a></div>
         </div>
   {/if}
 
@@ -80,6 +80,17 @@
     {* Retrieve the ID for the Employee / Employer relationship type *}
     {crmAPI var="employmentRelationship" entity="RelationshipType" action="getvalue" version="3" name_a_b="Employee of" return="id"}
     <h3>{if $action eq 1}{ts}New Relationship{/ts}{else}{ts}Edit Relationship{/ts}{/if}</h3>
+    {literal}
+      <script type="text/javascript">
+        function setPermissionStatus( relTypeDirection ) {
+          var direction = relTypeDirection.split( '_' );
+          cj('#permision_a_b-' + direction[1] + '_' + direction[2] ).show( );
+          cj('#permision_a_b-' + direction[2] + '_' + direction[1] ).hide( );
+          cj('#permision_b_a-' + direction[1] + '_' + direction[2] ).show( );
+          cj('#permision_b_a-' + direction[2] + '_' + direction[1] ).hide( );
+        }
+      </script>
+    {/literal}
     <div class="crm-block crm-form-block crm-relationship-form-block">
             {if $action eq 1}
                 <div class="description">
@@ -355,17 +366,6 @@
                         <td>{$form.is_active.html}</td>
                     </tr>
                 </table>
-                {literal}
-                    <script type="text/javascript">
-                        function setPermissionStatus( relTypeDirection ) {
-                            var direction = relTypeDirection.split( '_' );
-                            cj('#permision_a_b-' + direction[1] + '_' + direction[2] ).show( );
-                            cj('#permision_a_b-' + direction[2] + '_' + direction[1] ).hide( );
-                            cj('#permision_b_a-' + direction[1] + '_' + direction[2] ).show( );
-                            cj('#permision_b_a-' + direction[2] + '_' + direction[1] ).hide( );
-                        }
-                    </script>
-                {/literal}
             </div>{* end of save element div *}
         <div id="customData"></div>
         <div class="spacer"></div>
@@ -501,11 +501,7 @@ function submitAjaxData() {
 <script type="text/javascript">
 
 {/literal} {if $searchRows} {literal}
-cj(".contact_select .form-checkbox").each( function( ) {
-    if (this) {
-        cj(this).prop('checked',true);
-    }
-});
+cj(".contact_select .form-checkbox").prop('checked',true);
 {/literal} {/if} {literal}
 
 {/literal} {if $action EQ 1}{literal}
diff --git a/templates/CRM/Contact/Page/View/Relationship.tpl b/templates/CRM/Contact/Page/View/Relationship.tpl
index 3950b45b17..5a7ab66ed3 100644
--- a/templates/CRM/Contact/Page/View/Relationship.tpl
+++ b/templates/CRM/Contact/Page/View/Relationship.tpl
@@ -70,7 +70,7 @@
                 {assign var = "rtype" value = "b_a" }
             {/if*}
 
-            <tr id="rel_{$rel.id}" class="{cycle values="odd-row,even-row"} row-relationship {if $rel.is_permission_a_b eq 1 or $rel.is_permission_b_a eq 1}row-highlight{/if}">
+            <tr id="relationship-{$rel.id}" class="crm-entity {cycle values="odd-row,even-row"} row-relationship {if $rel.is_permission_a_b eq 1 or $rel.is_permission_b_a eq 1}row-highlight{/if}">
 
             {if $relationshipTabContext}
               <td class="bold">
@@ -115,14 +115,15 @@
 {/if}
 {* end of code to show current relationships *}
 
-{if NOT ($currentRelationships or $inactiveRelationships) }
-
+{if $currentRelationships or $inactiveRelationships}
+  {include file="CRM/common/enableDisableApi.tpl"}
+{else}
   {if $action NEQ 1} {* show 'no relationships' message - unless already in 'add' mode. *}
        <div class="messages status no-popup">
             <div class="icon inform-icon"></div>
-           {capture assign=crmURL}{crmURL p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1"}{/capture}
+           {capture assign=link}accesskey="N" class="action-item action-item-first" href="{crmURL p='civicrm/contact/view/rel' q="cid=`$contactId`&action=add&reset=1"}"{/capture}
            {if $permission EQ 'edit'}
-                    {ts 1=$crmURL}There are no Relationships entered for this contact. You can <a accesskey="N" href='%1'>add one</a>.{/ts}
+                    {ts 1=$link}There are no Relationships entered for this contact. You can <a %1>add one</a>.{/ts}
                 {elseif ! $relationshipTabContext}
                     {ts}There are no related contacts / organizations on record for you.{/ts}
                 {else}
@@ -165,7 +166,7 @@
           {else}
             {assign var = "rtype" value = "a_b" }
           {/if}
-          <tr id="rel_{$rel.id}" class="{cycle values="odd-row,even-row"}">
+          <tr id="relationship-{$rel.id}" class="crm-entity {cycle values="odd-row,even-row"}">
             <td class="bold">
               {$rel.relation}
               {if $rel.description}<p class='description'>{$rel.description}</p>{/if}
-- 
2.25.1