| {{ user.id }} |
{{ user.email }} |
+ {{ user.usersbalance.balance }} |
{% if user.status == 0 %}
Inactive
diff --git a/SWSCloudCore/controllers/users/__init__.py b/SWSCloudCore/controllers/users/__init__.py
index a601cb0..afcde30 100644
--- a/SWSCloudCore/controllers/users/__init__.py
+++ b/SWSCloudCore/controllers/users/__init__.py
@@ -118,10 +118,15 @@ class ControllerUsersRecoveryCodes():
return True
def check(self, user_id, code):
- print user_id
- if models.UsersRecoveryCodes.select().\
- where(models.UsersRecoveryCodes.user == user_id, models.UsersRecoveryCodes.recovery_code == code).\
- count() == 0:
+ """
+ Проверка существования кода
+ :param user_id:
+ :param code:
+ :return: bool
+ """
+ if models.UsersRecoveryCodes.select().where(
+ models.UsersRecoveryCodes.user == user_id, models.UsersRecoveryCodes.recovery_code == code
+ ).count() == 0:
return False
return True
diff --git a/SWSCloudCore/controllers/users/manage.py b/SWSCloudCore/controllers/users/manage.py
index 694e8b6..4b1ce82 100644
--- a/SWSCloudCore/controllers/users/manage.py
+++ b/SWSCloudCore/controllers/users/manage.py
@@ -23,13 +23,26 @@ class ControllerManageUsers:
формируем массив со списком пользователей
:return:
"""
+ from peewee import JOIN_LEFT_OUTER, JOIN_INNER, JOIN_FULL
+
+ jj = models.Users.select(
+ models.UsersBalance.balance.alias('balance'),
+ models.Users.id,
+ models.Users.email,
+ models.Users.created,
+ models.Users.status,
+ ).join(
+ models.UsersBalance
+ )
+ for j in jj:
+ print j.usersbalance.balance
return {
- 'total': models.Users.select().count(),
- 'items': models.Users.select()
+ 'total': len(jj),
+ 'items': jj
}
def item_get(self, user_id):
- return models.Users.select().where(models.Users.id == user_id)[0]
+ return models.Users.select().where(models.Users.id == user_id).get()
class ControllerManageUsersDetails:
diff --git a/SWSCloudWeb/application.py b/SWSCloudWeb/application.py
index 1161e59..aea97e8 100644
--- a/SWSCloudWeb/application.py
+++ b/SWSCloudWeb/application.py
@@ -97,3 +97,7 @@ def after_request(response):
# TODO: code to email alert
# pass
return response
+
+
+if __name__ == '__main__':
+ app.run(host='0.0.0.0', port=5000, debug=True)
diff --git a/SWSCloudWeb/static/js/foundation/foundation.js b/SWSCloudWeb/static/js/foundation/foundation.js
index 65e6304..ebddff0 100644
--- a/SWSCloudWeb/static/js/foundation/foundation.js
+++ b/SWSCloudWeb/static/js/foundation/foundation.js
@@ -587,7 +587,7 @@
}
}
},
-
+
// Description:
// Performs a callback function when an image is fully loaded
//
diff --git a/SWSCloudWeb/templates/default/_footer.html b/SWSCloudWeb/templates/default/_footer.html
index 14bd789..83d2a96 100644
--- a/SWSCloudWeb/templates/default/_footer.html
+++ b/SWSCloudWeb/templates/default/_footer.html
@@ -1,28 +1,19 @@
|