Skip to content

armgit / Vvveb

Public Imported from GitHub
0

Powerful and easy to use cms to build websites, blogs or ecommerce stores.

Include role name in admin user info

givanz22cf311b3ddf
diff --git a/admin/sql/mysqli/admin.sql b/admin/sql/mysqli/admin.sql
index df545d6..de034db 100755
--- a/admin/sql/mysqli/admin.sql
+++ b/admin/sql/mysqli/admin.sql
@@ -71,7 +71,7 @@
)
BEGIN
- SELECT _.*, role.permissions FROM admin AS _
+ SELECT _.*, role.name as role,role.permissions FROM admin AS _
LEFT JOIN role ON (_.role_id = role.role_id)
WHERE 1 = 1
@@ -79,7 +79,7 @@
@IF isset(:username)
THEN
AND _.username = :username
- END @IF
+ END @IF
@IF isset(:email)
THEN
@@ -89,22 +89,22 @@
@IF isset(:admin_id)
THEN
AND _.admin_id = :admin_id
- END @IF
+ END @IF
@IF isset(:status)
THEN
AND _.status = :status
- END @IF
+ END @IF
@IF isset(:token)
THEN
AND _.token = :token
- END @IF
+ END @IF
@IF isset(:role_id)
THEN
AND _.role_id = :role_id
- END @IF
+ END @IF
LIMIT 1;
diff --git a/admin/sql/pgsql/admin.sql b/admin/sql/pgsql/admin.sql
index 78b8bc5..7506724 100755
--- a/admin/sql/pgsql/admin.sql
+++ b/admin/sql/pgsql/admin.sql
@@ -71,7 +71,7 @@
)
BEGIN
- SELECT _.*, role.permissions FROM admin AS _
+ SELECT _.*, role.name as role,role.permissions FROM admin AS _
LEFT JOIN role ON (_.role_id = role.role_id)
WHERE 1 = 1
diff --git a/admin/sql/sqlite/admin.sql b/admin/sql/sqlite/admin.sql
index 5282aee..0dd500a 100755
--- a/admin/sql/sqlite/admin.sql
+++ b/admin/sql/sqlite/admin.sql
@@ -71,7 +71,7 @@
)
BEGIN
- SELECT _.*, role.permissions FROM admin AS _
+ SELECT _.*, role.name as role,role.permissions FROM admin AS _
LEFT JOIN role ON (_.role_id = role.role_id)
WHERE 1 = 1