Skip to content
This repository has been archived by the owner on Apr 23, 2021. It is now read-only.

Minor Consistency Fixes for Meetings/Events/Projects #104

Merged
merged 1 commit into from
Nov 25, 2019
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/calendar/models.rs
Original file line number Diff line number Diff line change
@@ -38,7 +38,7 @@ impl Attendable for Event {
self.id
}
fn name(&self) -> String {
self.title.clone()
format!("{} Event at: {}", self.title.clone(), self.start.clone())
}
fn time(&self) -> NaiveDateTime {
self.start
2 changes: 1 addition & 1 deletion templates/calendar/event.html
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ <h2>In {{ val }}</h2>
<h2>Attendees</h2>
<ul>
{% for user in users %}
<li><a href="/users/{{ user.id }}">{{ user.real_name }}</a>
<li><a href="/users/{{ user.id }}">{{ user.real_name }} ({{ user.handle }})</a>
{% endfor %}
</ul>
{% endif %}
4 changes: 1 addition & 3 deletions templates/group/meeting.html
Original file line number Diff line number Diff line change
@@ -20,9 +20,7 @@
<h2>Attendees</h2>
<ul>
{% for user in users %}
<li>
<a href="/users/{{ user.id }}">{{ user.real_name }} ({{ user.handle }})</a>
</li>
<li><a href="/users/{{ user.id }}">{{ user.real_name }} ({{ user.handle }})</a>
{% endfor %}
</ul>

2 changes: 1 addition & 1 deletion templates/project/project.html
Original file line number Diff line number Diff line change
@@ -62,7 +62,7 @@ <h3>Members</h3>
<ul>
{% for user in users %}
<li>
<a href="/users/{{ user.id }}">{{ user.real_name }}</a>
<a href="/users/{{ user.id }}">{{ user.real_name }} ({{ user.handle }})</a>
{% match logged_in %}
{% when Some with (u) %}
{% if (u.tier > 1 || u.id == project.owner_id) && user.id != project.owner_id %}