After merge fix
Forgor a &&
This commit is contained in:
@@ -666,8 +666,11 @@ pub fn all_tickets_component() -> Html {
|
|||||||
} else {
|
} else {
|
||||||
html! {
|
html! {
|
||||||
<div>
|
<div>
|
||||||
|
<div class="page-header">
|
||||||
|
<h1>{ "All Tickets" }</h1>
|
||||||
|
</div>
|
||||||
<ul class="ticket-list">
|
<ul class="ticket-list">
|
||||||
{ for tickets.iter().filter(|t| t.status != "Archived" (if user.is_admin { true } else if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| {
|
{ for tickets.iter().filter(|t| t.status != "Archived" && (if user.is_admin { true } else if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| {
|
||||||
let status_class = match t.status.as_str() {
|
let status_class = match t.status.as_str() {
|
||||||
"ToDo" => "To-Do",
|
"ToDo" => "To-Do",
|
||||||
"InProgress" => "InProgress",
|
"InProgress" => "InProgress",
|
||||||
@@ -802,9 +805,14 @@ pub fn archived_tickets_component() -> Html {
|
|||||||
html! { <p>{ format!("Error: {}", e) }</p> }
|
html! { <p>{ format!("Error: {}", e) }</p> }
|
||||||
} else {
|
} else {
|
||||||
html! {
|
html! {
|
||||||
<ul>
|
<div>
|
||||||
|
<div class="page-header">
|
||||||
|
<h1>{ "Archivierte Tickets" }</h1>
|
||||||
|
</div>
|
||||||
|
<ul class="ticket-list">
|
||||||
{ for tickets.iter().filter(|t| t.status == "Archived" && (user.is_admin || if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| html! {
|
{ for tickets.iter().filter(|t| t.status == "Archived" && (user.is_admin || if let Some(uid) = user.id { t.user_id == uid } else { false })).map(|t| html! {
|
||||||
<div>
|
<div>
|
||||||
|
|
||||||
<li key={t.id.to_string()}>
|
<li key={t.id.to_string()}>
|
||||||
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
|
<Link<crate::Route> to={crate::Route::TicketById{id: t.id}}><h3>{ format!("{} - #{}", t.betreff, t.id) }</h3></Link<crate::Route>>
|
||||||
<p>{ &t.description }</p>
|
<p>{ &t.description }</p>
|
||||||
@@ -820,6 +828,7 @@ pub fn archived_tickets_component() -> Html {
|
|||||||
</div>
|
</div>
|
||||||
})}
|
})}
|
||||||
</ul>
|
</ul>
|
||||||
|
</div>
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user