Merge branch 4.5 into master

[civicrm-core.git] / CRM / Core / xml / Menu / Contact.xml

diff --git a/CRM/Core/xml/Menu/Contact.xml b/CRM/Core/xml/Menu/Contact.xml
index 17141ffd855f49cf57107a35e1a26f0bf1f199b5..679f953b431f46788e4924005cdb2ea92134cf0e 100644 (file)
--- a/CRM/Core/xml/Menu/Contact.xml
+++ b/CRM/Core/xml/Menu/Contact.xml
@@ -47,7 +47,7 @@
      <title>Get Image File</title>
      <page_callback>CRM_Contact_Page_ImageFile</page_callback>
      <access_arguments>*always allow*</access_arguments>
-  </item>  
+  </item>
   <item>
      <path>civicrm/contact/search/basic</path>
      <title>Find Contacts</title>
@@ -78,11 +78,6 @@
      <page_type>1</page_type>
      <weight>16</weight>
   </item>
-  <item>
-     <path>civicrm/contact/search/simple</path>
-     <title>Simple Search</title>
-     <page_callback>CRM_Contact_Form_Search_Simple</page_callback>
-  </item>
   <item>
      <path>civicrm/contact/add</path>
      <title>New Contact</title>
@@ -255,16 +250,6 @@
      <title>CiviCRM Blog</title>
      <page_callback>CRM_Dashlet_Page_Blog</page_callback>
   </item>
-  <item>
-    <path>civicrm/ajax/state</path>
-    <page_callback>CRM_Core_Page_AJAX_Location::state</page_callback>
-    <access_arguments>access CiviCRM</access_arguments>
-  </item>
-  <item>
-    <path>civicrm/ajax/country</path>
-    <page_callback>CRM_Core_Page_AJAX_Location::country</page_callback>
-    <access_arguments>access CiviCRM</access_arguments>
-  </item>
   <item>
     <path>civicrm/ajax/search</path>
     <page_callback>CRM_Contact_Page_AJAX::search</page_callback>
@@ -281,11 +266,6 @@
      <page_callback>CRM_Contact_Page_AJAX::groupTree</page_callback>
      <access_arguments>access CiviCRM</access_arguments>
 </item>
-<item>
-     <path>civicrm/ajax/contact</path>
-     <page_callback>CRM_Contact_Page_AJAX::contact</page_callback>
-     <access_arguments>access CiviCRM</access_arguments>
-</item>
 <item>
      <path>civicrm/ajax/custom</path>
      <page_callback>CRM_Contact_Page_AJAX::customField</page_callback>
@@ -318,11 +298,6 @@
      <page_callback>CRM_Contact_Page_AJAX::getContactPhone</page_callback>
      <access_callback>1</access_callback>
 </item>
-<item>
-     <path>civicrm/ajax/auto</path>
-     <page_callback>CRM_Contact_Page_AJAX::autocomplete</page_callback>
-     <access_callback>1</access_callback>
-</item>
 <item>
      <path>civicrm/ajax/subtype</path>
      <page_callback>CRM_Contact_Page_AJAX::buildSubTypes</page_callback>
@@ -339,11 +314,6 @@
      <page_callback>CRM_Contact_Page_AJAX::getSignature</page_callback>
      <access_arguments>access CiviCRM</access_arguments>
 </item>
-<item>
-     <path>civicrm/ajax/relationshipcontacts</path>
-     <page_callback>CRM_Contact_Page_AJAX::relationshipContacts</page_callback>
-     <access_arguments>access CiviCRM</access_arguments>
-</item>
 <item>
      <path>civicrm/ajax/pdfFormat</path>
      <page_callback>CRM_Contact_Page_AJAX::pdfFormat</page_callback>
@@ -408,11 +378,6 @@
      <page_callback>CRM_Contact_Page_AJAX::buildDedupeRules</page_callback>
      <access_arguments>access CiviCRM</access_arguments>
 </item>
-<item>
-     <path>civicrm/ajax/relationshipContactTypeList</path>
-     <page_callback>CRM_Contact_Page_AJAX::relationshipContactTypeList</page_callback>
-     <access_arguments>access CiviCRM</access_arguments>
-</item>
 <item>
     <path>civicrm/contact/view/useradd</path>
     <path_arguments>cid=%%cid%%</path_arguments>
@@ -430,4 +395,9 @@
   <title>Activities</title>
   <page_callback>CRM_Contact_Form_Task_SMS</page_callback>
 </item>
+  <item>
+    <path>civicrm/ajax/contactrelationships</path>
+    <page_callback>CRM_Contact_Page_AJAX::getContactRelationships</page_callback>
+    <access_arguments>access CiviCRM;view my contact</access_arguments>
+  </item>
 </menu>