logos-co
/
open-law
mirror of https://github.com/logos-co/open-law.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into kostia/fix/changes_after_demo

This commit is contained in:
Kostiantyn Stoliarskyi 2023-05-15 12:24:06 +03:00
parent abdbf07d70 2556838a77
commit 28fb60a240
4 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/templates/book/interpretation_view.html
View File

@ -169,7 +169,7 @@
<div class="flex border-t-2 pt-3 mt-6 align-center justify-between md:w-full"> <div class="flex border-t-2 pt-3 mt-6 align-center justify-between md:w-full">
<div> <div>
<span class="hidden md:inline-block">Interpretation by</span> <span class="hidden md:inline-block">Interpretation by</span>
<a href="{{url_for('user.profile',user_id=interpretation.user.id)}}" class=" text-blue-500 {% if user.is_deleted line-through %}{% endif %}">{{interpretation.user.username}}</a> on {{interpretation.created_at.strftime('%B %d, %Y')}} <a href="{{url_for('user.profile',user_id=interpretation.user.id)}}" class=" text-blue-500 {% if user.is_deleted %}line-through{% endif %}">{{interpretation.user.username}}</a> on {{interpretation.created_at.strftime('%B %d, %Y')}}
</div> </div>
<div class="flex ml-auto justify-between w-24"> <div class="flex ml-auto justify-between w-24">
<span class="space-x-0.5 flex items-center"> <span class="space-x-0.5 flex items-center">

2
app/templates/home/index.html
View File

@ -79,7 +79,7 @@
<div class="flex mt-auto align-center justify-between md:w-full"> <div class="flex mt-auto align-center justify-between md:w-full">
<div> <div>
<span class="hidden md:inline-block">Interpretation by</span> <span class="hidden md:inline-block">Interpretation by</span>
<a href="{{url_for('user.profile',user_id=interpretation.user.id)}}" class=" text-blue-500">{{interpretation.user.username}}</a> on {{interpretation.created_at.strftime('%B %d, %Y')}} <a href="{{url_for('user.profile',user_id=interpretation.user.id)}}" class=" text-blue-500 {% if interpretation.user.is_deleted %}line-through{% endif %}">{{interpretation.user.username}}</a> on {{interpretation.created_at.strftime('%B %d, %Y')}}
</div> </div>
<div class="flex ml-auto justify-between w-24"> <div class="flex ml-auto justify-between w-24">
<span class="space-x-0.5 flex items-center"> <span class="space-x-0.5 flex items-center">

2
app/templates/user/profile.html
View File

@ -123,7 +123,7 @@
<div class="flex mt-auto align-center justify-between md:w-full"> <div class="flex mt-auto align-center justify-between md:w-full">
<div> <div>
<span class="hidden md:inline-block">Interpretation by</span> <span class="hidden md:inline-block">Interpretation by</span>
<a href="{{url_for('user.profile',user_id=interpretation.user.id)}}" class=" text-blue-500">{{interpretation.user.username}}</a> on {{interpretation.created_at.strftime('%B %d, %Y')}} <a href="{{url_for('user.profile',user_id=interpretation.user.id)}}" class=" text-blue-500 {% if interpretation.user.is_deleted %}line-through{% endif %}">{{interpretation.user.username}}</a> on {{interpretation.created_at.strftime('%B %d, %Y')}}
</div> </div>
<div class="flex ml-auto justify-between w-24"> <div class="flex ml-auto justify-between w-24">
<span class="space-x-0.5 flex items-center"> <span class="space-x-0.5 flex items-center">

2
app/views/user.py
View File

@ -60,7 +60,7 @@ def edit_profile():
@bp.route("/<int:user_id>/profile") @bp.route("/<int:user_id>/profile")
def profile(user_id: int): def profile(user_id: int):
user: m.User = m.User.query.get(user_id) user: m.User = db.session.get(m.User, user_id)
interpretations: m.Interpretation = m.Interpretation.query.filter_by( interpretations: m.Interpretation = m.Interpretation.query.filter_by(
user_id=user_id user_id=user_id
) )