merged codes

This commit is contained in:
venusbb
2017-08-10 10:29:31 +01:00
parent 26ed24abb2
commit 050c68142b
6 changed files with 114 additions and 22 deletions

View File

@@ -10,23 +10,13 @@ from flask_login import login_required
from app.main import main
from app import inbound_number_client
from app.utils import user_has_permissions
from flask import jsonify
@main.route('/inbound-sms-admin', methods=['GET', 'POST'])
@login_required
@user_has_permissions(admin_override=True)
def inbound_sms_admin():
#data = user_api_client.get_inboundsms_number_service()
data = inbound_number_client.get_inbound_sms_number_service()
# return jsonify(data)
return render_template('views/inbound_sms_admin.html',
inbound_num_list = data)
data = inbound_number_client.get_all_inbound_sms_number_service()
return render_template('views/inbound_sms_admin.html', inbound_num_list=data)