load more bug / date join bug

flipboxfactory · Apr 17, 2018 · e3d78ef · e3d78ef
1 parent aa85d1b
commit e3d78ef
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,7 +1,12 @@
 Changelog
 =========
+## Unreleased
+### Changed
+- load more action when viewing more than associated organization users
+- fixed issue where Join Date was not getting updated correctly.
+
 ## 1.0.0-rc.2 - 2018-03-28
-### Fixed
+### Changed
 - dependency templates were not registered in admin views
 
 ## 1.0.0-rc.1 - 2018-03-26

diff --git a/src/cp/controllers/view/OrganizationsController.php b/src/cp/controllers/view/OrganizationsController.php
@@ -190,6 +190,9 @@ private function getUserIndexJs(OrganizationElement $element): array
             ],
             'viewParams' => [
                 'organization' => $element->getId()
+            ],
+            'viewSettings' => [
+                'loadMoreAction' => 'organizations/cp/user-indexes/get-more-elements'
             ]
         ];
     }

diff --git a/src/services/Element.php b/src/services/Element.php
@@ -170,9 +170,9 @@ protected function elementToRecord(OrganizationElement $organization): Organizat
         }
 
         // Populate the record attributes
-        $record->setAttributes(
-            ArrayHelper::toArray($organization)
-        );
+        $record->id = $organization->getId();
+        $record->state = $organization->state;
+        $record->dateJoined = $organization->dateJoined;
 
         return $record;
     }