start work
This commit is contained in:
parent
8edbf15235
commit
e0e970c6b9
@ -45,6 +45,19 @@ WHERE name like ?
|
|||||||
.ok()
|
.ok()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub async fn names_from_role(&self, db: &SqlitePool) -> Vec<String> {
|
||||||
|
let query = format!(
|
||||||
|
"SELECT u.name.
|
||||||
|
FROM user u
|
||||||
|
JOIN user_role ur ON u.id = ur.user_id
|
||||||
|
JOIN role r ON ur.role_id = r.id
|
||||||
|
WHERE r.id = {} AND deleted=0;",
|
||||||
|
self.id
|
||||||
|
);
|
||||||
|
|
||||||
|
sqlx::query_scalar(&query).fetch_all(db).await.unwrap()
|
||||||
|
}
|
||||||
|
|
||||||
pub async fn mails_from_role(&self, db: &SqlitePool) -> Vec<String> {
|
pub async fn mails_from_role(&self, db: &SqlitePool) -> Vec<String> {
|
||||||
let query = format!(
|
let query = format!(
|
||||||
"SELECT u.mail
|
"SELECT u.mail
|
||||||
|
@ -266,7 +266,7 @@ impl User {
|
|||||||
|
|
||||||
pub async fn roles(&self, db: &SqlitePool) -> Vec<String> {
|
pub async fn roles(&self, db: &SqlitePool) -> Vec<String> {
|
||||||
sqlx::query!(
|
sqlx::query!(
|
||||||
"SELECT r.name FROM role r JOIN user_role ur ON r.id = ur.role_id WHERE ur.user_id = ?;",
|
"SELECT r.name FROM role r JOIN user_role ur ON r.id = ur.role_id JOIN user u ON u.id = ur.user_id WHERE ur.user_id = ? AND u.deleted = 0;",
|
||||||
self.id
|
self.id
|
||||||
)
|
)
|
||||||
.fetch_all(db)
|
.fetch_all(db)
|
||||||
|
@ -1,8 +1,9 @@
|
|||||||
use rocket::{get, routes, Route, State};
|
use rocket::{form::Form, get, post, routes, FromForm, Route, State};
|
||||||
|
use rocket_dyn_templates::{context, Template};
|
||||||
use sqlx::SqlitePool;
|
use sqlx::SqlitePool;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
model::{log::Log, user::AdminUser},
|
model::{log::Log, role::Role, user::AdminUser},
|
||||||
tera::Config,
|
tera::Config,
|
||||||
};
|
};
|
||||||
|
|
||||||
@ -25,12 +26,36 @@ async fn show_rss(db: &State<SqlitePool>, _admin: AdminUser) -> String {
|
|||||||
Log::show(db).await
|
Log::show(db).await
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[get("/list")]
|
||||||
|
async fn show_list(_admin: AdminUser) -> Template {
|
||||||
|
Template::render("admin/list/index", context!())
|
||||||
|
}
|
||||||
|
|
||||||
|
#[derive(FromForm)]
|
||||||
|
struct ListForm {
|
||||||
|
list: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
#[post("/list", data = "<list_form>")]
|
||||||
|
async fn list(db: &State<SqlitePool>, _admin: AdminUser, list_form: Form<ListForm>) -> Template {
|
||||||
|
let role = Role::find_by_name(db, "Donau Linz").await.unwrap();
|
||||||
|
let acceptable_users = role.names_from_role(db).await;
|
||||||
|
|
||||||
|
//TODO: continue here
|
||||||
|
|
||||||
|
let context = context! {
|
||||||
|
result: "test"
|
||||||
|
};
|
||||||
|
|
||||||
|
Template::render("admin/list/result", &context)
|
||||||
|
}
|
||||||
|
|
||||||
pub fn routes() -> Vec<Route> {
|
pub fn routes() -> Vec<Route> {
|
||||||
let mut ret = Vec::new();
|
let mut ret = Vec::new();
|
||||||
ret.append(&mut user::routes());
|
ret.append(&mut user::routes());
|
||||||
ret.append(&mut boat::routes());
|
ret.append(&mut boat::routes());
|
||||||
ret.append(&mut mail::routes());
|
ret.append(&mut mail::routes());
|
||||||
ret.append(&mut planned_event::routes());
|
ret.append(&mut planned_event::routes());
|
||||||
ret.append(&mut routes![rss, show_rss]);
|
ret.append(&mut routes![rss, show_rss, show_list, list]);
|
||||||
ret
|
ret
|
||||||
}
|
}
|
||||||
|
12
templates/admin/list/index.html.tera
Normal file
12
templates/admin/list/index.html.tera
Normal file
@ -0,0 +1,12 @@
|
|||||||
|
{% import "includes/macros" as macros %}
|
||||||
|
{% extends "base" %}
|
||||||
|
{% block content %}
|
||||||
|
{% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
|
||||||
|
<div class="max-w-screen-lg w-full">
|
||||||
|
<h1 class="h1">List</h1>
|
||||||
|
<form action="/admin/list" method="post">
|
||||||
|
<textarea name="list" rows="4" cols="50"></textarea>
|
||||||
|
<input type="submit" />
|
||||||
|
</form>
|
||||||
|
</div>
|
||||||
|
{% endblock content %}
|
9
templates/admin/list/result.html.tera
Normal file
9
templates/admin/list/result.html.tera
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
{% import "includes/macros" as macros %}
|
||||||
|
{% extends "base" %}
|
||||||
|
{% block content %}
|
||||||
|
{% if flash %}{{ macros::alert(message=flash.1, type=flash.0, class="sm:col-span-2 lg:col-span-3") }}{% endif %}
|
||||||
|
<div class="max-w-screen-lg w-full">
|
||||||
|
<h1 class="h1">List - Result</h1>
|
||||||
|
{{result}}
|
||||||
|
</div>
|
||||||
|
{% endblock content %}
|
Loading…
Reference in New Issue
Block a user