diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/models/ExternalUser.php | 5 | ||||
| -rw-r--r-- | lib/models/OERHost.php | 6 | ||||
| -rw-r--r-- | lib/models/OERMaterial.php | 6 |
3 files changed, 12 insertions, 5 deletions
diff --git a/lib/models/ExternalUser.php b/lib/models/ExternalUser.php index d4bfd72..53a079a 100644 --- a/lib/models/ExternalUser.php +++ b/lib/models/ExternalUser.php @@ -24,6 +24,11 @@ class ExternalUser extends SimpleORMap protected static function configure($config = []) { $config['db_table'] = 'external_users'; + $config['belongs_to']['host'] = [ + 'class_name' => OERHost::class, + 'foreign_key' => 'host_id' + ]; + $config['serialized_fields']['data'] = 'JSONArrayObject'; parent::configure($config); } } diff --git a/lib/models/OERHost.php b/lib/models/OERHost.php index bf8f483..19f2bb2 100644 --- a/lib/models/OERHost.php +++ b/lib/models/OERHost.php @@ -267,10 +267,10 @@ class OERHost extends OERIdentity if ($materialdata['external_contact']) { $user = $materialdata['oeruser']; $users[] = [ - 'user_id' => $user['foreign_user_id'], + 'user_id' => $user['foreign_id'], 'name' => $user['name'], - 'avatar' => $user['avatar'], - 'description' => $user['description'], + 'avatar' => $user['avatar_url'], + 'description' => $user['data']['description'], 'host_url' => $user->host['url'], 'link' => URLHelper::getURL('dispatch.php/oer/market/profile/' . $user->getId()), 'hostname' => $this['name'] diff --git a/lib/models/OERMaterial.php b/lib/models/OERMaterial.php index c84d7b5..911aaa2 100644 --- a/lib/models/OERMaterial.php +++ b/lib/models/OERMaterial.php @@ -566,7 +566,9 @@ class OERMaterial extends SimpleORMap $user['contact_type'] = "oercampus"; $user['name'] = $review_data['user']['name']; $user['avatar_url'] = $review_data['user']['avatar'] ?: null; - $user['data']['description'] = $review_data['user']['description'] ?: null; + $user['data'] = [ + 'description' => $review_data['user']['description'] ?: '' + ]; $user->store(); $review['user_id'] = $user->getId(); @@ -609,7 +611,7 @@ class OERMaterial extends SimpleORMap } $user['name'] = $userdata['name']; $user['avatar_url'] = $userdata['avatar'] ?: null; - $userdata = $user['data'] ? $user['data']->toArrayCopy() : []; + $userdata = $user['data'] ? $user['data']->getArrayCopy() : []; $userdata['description'] = $userdata['description'] ?: null; $user['data'] = $userdata; $user->store(); |