fix: Domain admin can see domain in home
This commit is contained in:
parent
8a7e644960
commit
38700ee4cb
3 changed files with 15 additions and 9 deletions
|
|
@ -42,7 +42,7 @@ impl<D: DatabaseInterface> Database<D> {
|
|||
.list_all_domains()
|
||||
.await?
|
||||
.into_iter()
|
||||
.filter(|d| user.role.can_see_domain(&d.name))
|
||||
.filter(|d| user.can_see_domain(&d.name))
|
||||
.collect())
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -84,6 +84,12 @@ impl User {
|
|||
pub fn can_create_domain(&self) -> bool {
|
||||
self.role.can_perform(&Operation::CreateDomain)
|
||||
}
|
||||
|
||||
pub fn can_see_domain(&self, domain: &str) -> bool {
|
||||
let allowed = self.role.can_see_domain(domain);
|
||||
tracing::debug!("{} can see domain {}: {}", self.mail, domain, allowed);
|
||||
allowed
|
||||
}
|
||||
}
|
||||
|
||||
impl fmt::Display for User {
|
||||
|
|
|
|||
|
|
@ -14,15 +14,15 @@
|
|||
<button type="submit" class="button is-info">Create</button>
|
||||
</form>
|
||||
</div>
|
||||
<div>
|
||||
<h2>Active domains you can see</h2>
|
||||
<ul>
|
||||
{% for domain in domains %}
|
||||
<li><a href="/domain/{{ domain.name }}">{{ domain.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% endif %}
|
||||
<div>
|
||||
<h2>Active domains you can see</h2>
|
||||
<ul>
|
||||
{% for domain in domains %}
|
||||
<li><a href="/domain/{{ domain.name }}">{{ domain.name }}</a></li>
|
||||
{% endfor %}
|
||||
</ul>
|
||||
</div>
|
||||
{% if other_users %}
|
||||
<div>
|
||||
<h2>Other users you have permission to see on your own domain</h2>
|
||||
|
|
|
|||
Loading…
Reference in a new issue