CRM-15045 - Improved links in Configuration Checklist.

----------------------------------------
* CRM-15045:
  https://issues.civicrm.org/jira/browse/CRM-15045

diff --git a/CRM/Admin/Page/ConfigTaskList.php b/CRM/Admin/Page/ConfigTaskList.php
index d1a196c9e3a2e52e1472a844cd4dca8eaa6380b1..9a1547a2abcc27301e66850e02170c88fc81379e 100644 (file)
--- a/CRM/Admin/Page/ConfigTaskList.php
+++ b/CRM/Admin/Page/ConfigTaskList.php
@@ -53,18 +53,6 @@ class CRM_Admin_Page_ConfigTaskList extends CRM_Core_Page {
     $destination = urlencode($destination);
     $this->assign('destination', $destination);
 
-    CRM_Core_OptionValue::getValues(array('name' => 'from_email_address'), $optionValue);
-    if (!empty($optionValue)) {
-      list($id) = array_keys($optionValue);
-      $this->assign('fromEmailId', $id);
-    }
-
-    $payPalProId = CRM_Core_DAO::getFieldValue( 'CRM_Financial_DAO_PaymentProcessorType',
-      'PayPal', 'id', 'name'
-    );
-    if ($payPalProId) {
-      $this->assign('payPalProId', $payPalProId);
-    }
     return parent::run();
   }
 }

diff --git a/templates/CRM/Admin/Page/ConfigTaskList.tpl b/templates/CRM/Admin/Page/ConfigTaskList.tpl
index 6c1a15be0b4b15d69aa7cec6114b6b77a87c43a7..062ca00f350dcfdc2897d3081f65b73d2c8ebbc3 100644 (file)
--- a/templates/CRM/Admin/Page/ConfigTaskList.tpl
+++ b/templates/CRM/Admin/Page/ConfigTaskList.tpl
@@ -25,16 +25,6 @@
 *}
 {capture assign="linkTitle"}{ts}Edit settings{/ts}{/capture}
 {capture assign="adminMenu"}{crmURL p="civicrm/admin" q="reset=1"}{/capture}
-{if $fromEmailId}
-    {assign var='fromAction' value="&action=update&id=`$fromEmailId`"}
-{else}
-    {assign var='fromAction' value="&action=add"}
-{/if}
-{if $payPalProId}
-    {assign var='defaultPPUrl' value="action=add&pp=`$payPalProId`&reset=1"}
-{else}
-    {assign var='defaultPPUrl' value="reset=1"}
-{/if}
 
 <div id="help" class="description">
     {ts 1=$adminMenu}Use this checklist to review and complete configuration tasks for your site. You will be redirected back to this checklist after saving each setting. Settings which you have not yet reviewed will be <span class="status-overdue">displayed in red</span>. After you have visited a page, the links will <span class="status-pending">display in green</span>  (although you may still need to revisit the page to complete or update the settings). You can access this page again from the <a href="%1">Administer CiviCRM</a> menu at any time.{/ts}
@@ -95,7 +85,7 @@
         <td>{ts}Settings for outbound email - either SMTP server, port and authentication or Sendmail path and argument.{/ts}</td>
     </tr>
     <tr class="even">
-        <td class="tasklist nowrap"><a href="{crmURL p="civicrm/admin/options/from_email_address" q="reset=1`$fromAction`&civicrmDestination=`$destination`"}" title="{$linkTitle}">{ts}From Email Addresses{/ts}</a></td>
+        <td class="tasklist nowrap"><a href="{crmURL p="civicrm/admin/options/from_email_address" q="reset=1&civicrmDestination=`$destination`"}" title="{$linkTitle}">{ts}From Email Addresses{/ts}</a></td>
         <td>{ts}Define general email address(es) that can be used as the FROM address when sending email to contacts from within CiviCRM (e.g. info@example.org){/ts}</td>
     </tr>
 
@@ -103,7 +93,7 @@
         <td colspan="2">{ts}Online Contributions / Online Membership Signup / Online Event Registration{/ts}</td>
     </tr>
     <tr class="even">
-        <td class="tasklist nowrap"><a href="{crmURL p="civicrm/admin/paymentProcessor" q="`$defaultPPUrl`&civicrmDestination=`$destination`"}" title="{$linkTitle}">{ts}Payment Processors{/ts}</a></td>
+        <td class="tasklist nowrap"><a href="{crmURL p="civicrm/admin/paymentProcessor" q="reset=1&civicrmDestination=`$destination`"}" title="{$linkTitle}">{ts}Payment Processors{/ts}</a></td>
         <td>{ts}Select and configure one or more payment processing services for online contributions, events and / or membership fees.{/ts}</td>
     </tr>
     {if $config->userSystem->is_drupal EQ '1'}