Set weight on Note Form

civicrm · Aug 21, 2023 · 2bbe811 · 2bbe811
1 parent 8f706bd
commit 2bbe811
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 16 deletions.
diff --git a/CRM/Contact/Page/View/Note.php b/CRM/Contact/Page/View/Note.php
@@ -50,10 +50,10 @@ public function view() {
   /**
    * called when action is browse.
    */
-  public function browse() {
+  public function browse(): void {
     $note = new CRM_Core_DAO_Note();
     $note->entity_table = 'civicrm_contact';
-    $note->entity_id = $this->_contactId;
+    $note->entity_id = $this->getContactID();
 
     $note->orderBy('modified_date desc');
 
@@ -80,7 +80,7 @@ public function browse() {
           $action,
           [
             'id' => $note->id,
-            'cid' => $this->_contactId,
+            'cid' => $this->getContactID(),
           ],
           ts('more'),
           FALSE,
@@ -123,7 +123,7 @@ public function browse() {
     );
     $this->assign('commentAction', $commentAction);
 
-    $this->ajaxResponse['tabCount'] = CRM_Contact_BAO_Contact::getCountComponent('note', $this->_contactId);
+    $this->ajaxResponse['tabCount'] = CRM_Contact_BAO_Contact::getCountComponent('note', $this->getContactID());
   }
 
   /**
@@ -135,8 +135,9 @@ public function edit() {
 
     // set the userContext stack
     $session = CRM_Core_Session::singleton();
+    $contactID = $this->getContactID();
     $url = CRM_Utils_System::url('civicrm/contact/view',
-      'action=browse&selectedChild=note&cid=' . $this->_contactId
+      'action=browse&selectedChild=note&cid=' . $contactID
     );
     $session->pushUserContext($url);
 
@@ -250,6 +251,7 @@ public static function links() {
         'url' => 'civicrm/contact/view/note',
         'qs' => 'action=add&reset=1&cid=%%cid%%&parentId=%%id%%&selectedChild=note',
         'title' => ts('Add Comment'),
+        'weight' => -5,
       ],
       CRM_Core_Action::DELETE => [
         'name' => ts('Delete'),
@@ -266,7 +268,7 @@ public static function links() {
    *
    * @return array[]
    */
-  public static function commentLinks() {
+  public static function commentLinks(): array {
     return [
       CRM_Core_Action::VIEW => [
         'name' => ts('View'),
@@ -292,4 +294,18 @@ public static function commentLinks() {
     ];
   }
 
+  /**
+   * Get the relevant contact ID.
+   *
+   * @api supported to be accessed from outside of core.
+   *
+   * @return int
+   *
+   * @noinspection PhpUnhandledExceptionInspection
+   * @noinspection PhpDocMissingThrowsInspection
+   */
+  public function getContactID(): int {
+    return (int) CRM_Utils_Request::retrieve('cid', 'Positive', $this, TRUE);
+  }
+
 }
diff --git a/tests/phpunit/CRM/Contact/Page/View/NoteTest.php b/tests/phpunit/CRM/Contact/Page/View/NoteTest.php
@@ -18,28 +18,28 @@
  */
 class CRM_Contact_Page_View_NoteTest extends CiviUnitTestCase {
 
-  public function testNoContactIdNote() {
-    $contactId = $this->individualCreate();
+  public function testNoContactIDNote(): void {
+    $contactID = $this->individualCreate();
     foreach ([1, 2, 3, 4, 5] as $noteID) {
       $note = new CRM_Core_DAO_Note();
-      $note->entity_id = $contactId;
+      $note->entity_id = $contactID;
       $note->subject = 'Test Note ' . $noteID;
       $note->note = 'Test Note from Tests';
       $note->entity_table = 'civicrm_contact';
-      if ($noteID == 5) {
-        $note->contact_id = $contactId;
+      if ($noteID === 5) {
+        $note->contact_id = $contactID;
       }
       $note->save();
     }
+    $_REQUEST['cid'] = $contactID;
     $page = new CRM_Contact_Page_View_Note();
-    $page->_contactId = $contactId;
     $page->_permission = CRM_Core_Permission::EDIT;
     $page->browse();
-    $this->assertEquals(count($page->values), 5);
+    $this->assertCount(5, $page->values);
     foreach ($page->values as $note) {
-      $this->assertEquals($note['entity_id'], $contactId);
-      if ($note['id'] == 5) {
-        $this->assertEquals($note['createdBy'], 'Mr. Anthony Anderson II');
+      $this->assertEquals($note['entity_id'], $contactID);
+      if ((int) $note['id'] === 5) {
+        $this->assertEquals('Mr. Anthony Anderson II', $note['createdBy']);
       }
     }
   }