UserDetail: add missing information (#1031)

fixes #1010
Icinga · Jul 22, 2024 · cdbaea0 · cdbaea0
1 parent c7dae01
commit cdbaea0
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/application/controllers/UserController.php b/application/controllers/UserController.php
@@ -24,7 +24,7 @@ public function init()
 
         $name = $this->params->getRequired('name');
 
-        $query = User::on($this->getDb());
+        $query = User::on($this->getDb())->with('timeperiod');
         $query->filter(Filter::equal('user.name', $name));
 
         $this->applyRestrictions($query);

diff --git a/library/Icingadb/Model/User.php b/library/Icingadb/Model/User.php
@@ -131,7 +131,7 @@ public function createBehaviors(Behaviors $behaviors)
     public function createRelations(Relations $relations)
     {
         $relations->belongsTo('environment', Environment::class);
-        $relations->belongsTo('timeperiod', Timeperiod::class);
+        $relations->belongsTo('timeperiod', Timeperiod::class)->setJoinType('LEFT');
         $relations->belongsTo('zone', Zone::class);
 
         $relations->belongsToMany('customvar', Customvar::class)

diff --git a/library/Icingadb/Widget/Detail/UserDetail.php b/library/Icingadb/Widget/Detail/UserDetail.php
@@ -65,6 +65,11 @@ protected function createUserDetail(): array
         return [
             new HtmlElement('h2', null, Text::create(t('Details'))),
             new HorizontalKeyValue(t('Name'), $this->user->name),
+            new HorizontalKeyValue(
+                t('Timeperiod'),
+                $this->user->timeperiod->display_name ?: new EmptyState(t('None', 'timeperiod'))
+            ),
+            new HorizontalKeyValue(t('Notifications Enabled'), $this->user->notifications_enabled ? t('Yes') : t('No')),
             new HorizontalKeyValue(t('E-Mail'), $this->user->email ?: new EmptyState(t('None', 'address'))),
             new HorizontalKeyValue(t('Pager'), $this->user->pager ?: new EmptyState(t('None', 'phone-number'))),
             new HorizontalKeyValue(t('Host States'), $hostStates ?: t('All')),