notif changes
This commit is contained in:
@@ -119,7 +119,8 @@ def create_conversation():
|
||||
|
||||
flash('Conversation created successfully!', 'success')
|
||||
return redirect(url_for('conversations.conversations'))
|
||||
return render_template('conversations/create_conversation.html', form=form)
|
||||
unread_count = get_unread_count(current_user.id)
|
||||
return render_template('conversations/create_conversation.html', form=form, unread_notifications=unread_count)
|
||||
|
||||
@conversations_bp.route('/<int:conversation_id>')
|
||||
@login_required
|
||||
@@ -150,10 +151,12 @@ def conversation(conversation_id):
|
||||
# Get all users for member selection (only needed for admin)
|
||||
all_users = User.query.all() if current_user.is_admin else None
|
||||
|
||||
unread_count = get_unread_count(current_user.id)
|
||||
return render_template('conversations/conversation.html',
|
||||
conversation=conversation,
|
||||
messages=messages,
|
||||
all_users=all_users)
|
||||
all_users=all_users,
|
||||
unread_notifications=unread_count)
|
||||
|
||||
@conversations_bp.route('/<int:conversation_id>/members')
|
||||
@login_required
|
||||
@@ -169,9 +172,11 @@ def conversation_members(conversation_id):
|
||||
return redirect(url_for('conversations.conversation', conversation_id=conversation_id))
|
||||
|
||||
available_users = User.query.filter(~User.id.in_([m.id for m in conversation.members])).all()
|
||||
unread_count = get_unread_count(current_user.id)
|
||||
return render_template('conversations/conversation_members.html',
|
||||
conversation=conversation,
|
||||
available_users=available_users)
|
||||
available_users=available_users,
|
||||
unread_notifications=unread_count)
|
||||
|
||||
@conversations_bp.route('/<int:conversation_id>/members/add', methods=['POST'])
|
||||
@login_required
|
||||
@@ -379,7 +384,8 @@ def edit_conversation(conversation_id):
|
||||
|
||||
# Prepopulate form members with current members
|
||||
form.members.data = [str(user.id) for user in conversation.members]
|
||||
return render_template('conversations/create_conversation.html', form=form, edit_mode=True, conversation=conversation)
|
||||
unread_count = get_unread_count(current_user.id)
|
||||
return render_template('conversations/create_conversation.html', form=form, edit_mode=True, conversation=conversation, unread_notifications=unread_count)
|
||||
|
||||
@conversations_bp.route('/<int:conversation_id>/delete', methods=['POST'])
|
||||
@login_required
|
||||
|
||||
Reference in New Issue
Block a user