Update IPSA link to work and be MP specific.

mysociety · Sep 6, 2024 · c67b7a8 · c67b7a8
1 parent 54af37a
commit c67b7a8
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 9 deletions.
diff --git a/www/docs/mp/index.php b/www/docs/mp/index.php
@@ -335,8 +335,8 @@
 $data['image'] = $MEMBER->image();
 $data['member_summary'] = person_summary_description($MEMBER);
 $data['enter_leave'] = $MEMBER->getEnterLeaveStrings();
-$data['entry_date'] = $MEMBER->getEntryDate();
-$data['leave_date'] = $MEMBER->getLeftDate();
+$data['entry_date'] = $MEMBER->getEntryDate(HOUSE_TYPE_COMMONS);
+$data['leave_date'] = $MEMBER->getLeftDate(HOUSE_TYPE_COMMONS);
 $data['is_new_mp'] = $MEMBER->isNew();
 $data['other_parties'] = $MEMBER->getOtherPartiesString();
 $data['other_constituencies'] = $MEMBER->getOtherConstituenciesString();
@@ -358,16 +358,12 @@
 $data['has_expenses'] = $data['leave_date'] > '2004-01-01';
 
 $data['pre_2010_expenses'] = False;
-$data['post_2010_expenses'] = $data['leave_date'] > '2010-05-05';
+$data['post_2010_expenses'] = $data['leave_date'] > '2010-05-05' ? $MEMBER->extra_info['datadotparl_id'] : '';
 
 if ($data['entry_date'] < '2010-05-05') {
     $data['pre_2010_expenses'] = True;
     // Set the expenses URL if we know it
-    if (isset($MEMBER->extra_info['expenses_url'])) {
-        $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url'];
-    } else {
-        $data['expenses_url_2004'] = 'https://mpsallowances.parliament.uk/mpslordsandoffices/hocallowances/allowances%2Dby%2Dmp/';
-    }
+    $data['expenses_url_2004'] = $MEMBER->extra_info['expenses_url'] ?? 'https://mpsallowances.parliament.uk/mpslordsandoffices/hocallowances/allowances%2Dby%2Dmp/';
 }
 
 $data['constituency_previous_mps'] = constituency_previous_mps($MEMBER);

diff --git a/www/includes/easyparliament/templates/html/mp/profile.php b/www/includes/easyparliament/templates/html/mp/profile.php
@@ -106,7 +106,7 @@
                         <li><a href="<?= $expenses_url_2004 ?>">Expenses from 2004 to 2009</a></li>
                         <?php endif; ?>
                         <?php if ($post_2010_expenses): ?>
-                        <li><a href="https://www.theipsa.org.uk/mp-costs/interactive-map/">Expenses from 2010 onwards</a></li>
+                        <li><a href="https://www.theipsa.org.uk/mp-staffing-business-costs/your-mp/<?=slugify($full_name)?>/<?=$post_2010_expenses?>">Expenses from 2010 onwards</a></li>
                         <?php endif; ?>
                     </ul>
                     <?php endif; ?>