mirror of
https://github.com/Xevion/v1.xevion.dev.git
synced 2025-12-09 04:09:06 -06:00
role adjustments and administration checking
This commit is contained in:
@@ -28,16 +28,17 @@ class User(UserMixin, db.Model):
|
||||
|
||||
# Retains order while making sure that there are no duplicate role values and they are capitalized
|
||||
def post_role_processing(self):
|
||||
user_roles = self.uroles.split(' ')
|
||||
user_roles = self.get_roles()
|
||||
user_roles = list(dict.fromkeys(user_roles))
|
||||
self.uroles = ' '.join([role.title() for role in user_roles])
|
||||
self.uroles = self.uroles.strip()
|
||||
|
||||
def delete_role(self, role):
|
||||
return self.delete_roles([role])
|
||||
|
||||
# Will return True if successful, else False if a role didn't exist
|
||||
def delete_roles(self, roles, ignore=True):
|
||||
user_roles = self.uroles.split(' ')
|
||||
user_roles = self.get_roles()
|
||||
success = True
|
||||
for role in roles:
|
||||
try:
|
||||
@@ -48,15 +49,14 @@ class User(UserMixin, db.Model):
|
||||
success = False
|
||||
return success
|
||||
|
||||
|
||||
def get_roles(self):
|
||||
return self.uroles.split(' ')
|
||||
return [] if len(self.uroles) == 0 else self.uroles.split(' ')
|
||||
|
||||
def add_role(self, role):
|
||||
self.add_roles([role])
|
||||
|
||||
def add_roles(self, roles, postprocess=True):
|
||||
user_roles = self.uroles.split(' ')
|
||||
user_roles = self.get_roles()
|
||||
if type(roles) == str:
|
||||
user_roles.append(roles)
|
||||
elif type(roles) == list:
|
||||
@@ -72,7 +72,7 @@ class User(UserMixin, db.Model):
|
||||
# Input: ['Insane', ['Fortunate', 'Blessed']]
|
||||
# Meaning: Must have 'Insane' role, as well as 'Fortunate' or 'Blessed' roles.
|
||||
def has_roles(self, roles):
|
||||
user_roles = self.uroles.split(' ')
|
||||
user_roles = self.get_roles()
|
||||
for reqrole in roles:
|
||||
# If we have this role
|
||||
if type(reqrole) == str:
|
||||
|
||||
@@ -15,6 +15,8 @@
|
||||
<ul class="menu-list">
|
||||
<li><a href="{{ url_for('profile_settings') }}" {% if profile_settings_active %}class="is-active"{% endif %}>Profile Settings</a></li>
|
||||
</ul>
|
||||
{% if current_user.has_role('Admin') %}
|
||||
|
||||
<p class="menu-label">
|
||||
Administration
|
||||
</p>
|
||||
@@ -28,6 +30,7 @@
|
||||
</ul>
|
||||
</li>
|
||||
</ul>
|
||||
{% endif %}
|
||||
</aside>
|
||||
</div>
|
||||
<div class="column"></div>
|
||||
|
||||
@@ -8,7 +8,7 @@
|
||||
Xevion
|
||||
</p>
|
||||
<p class="subtitle">
|
||||
Python Developer
|
||||
Cringe Python Developer
|
||||
</p>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
Reference in New Issue
Block a user