Commit 180b5de2 authored by lueyuw's avatar lueyuw
Browse files

save

parent c987dfe2
......@@ -152,18 +152,6 @@ def validate_login():
return jsonify(False)
<<<<<<< HEAD
@ app.route('/vue-admin-template/user/form', methods=["POST"])
def send_messages():
"""Send messages to different users."""
connection = get_db()
data = request.get_json()
message = data["message"]
# file_list = data["form"]["fileList"]
sender = data["username"]
receiver = data["receiver"]
=======
@app.route('/user/search', methods=["GET", "POST"])
def search_user():
json_data = {}
......@@ -187,7 +175,6 @@ def send_messages():
message = data['message']
noneVal = None
now = datetime.datetime.now()
>>>>>>> brian_omega
connection = get_db()
connection.execute(
......@@ -218,19 +205,12 @@ def receive_messages():
return_messages = []
for message in messages:
m = {
<<<<<<< HEAD
"message": message["text"],
"fileList": [message["filename"]],
"sender": message["sender"],
"receiver": message["receiver"]
=======
"message": message["message"],
"from": message["sender"],
"date": message["sendTime"],
"dialogVisible": False,
"urls": [],
"pdf": ''
>>>>>>> brian_omega
}
return_messages.append(m)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment