xevion/v1.xevion.dev
1
0
Fork 0
mirror of https://github.com/Xevion/v1.xevion.dev.git synced 2025-12-08 22:09:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

role adjustments and administration checking

Browse Source
This commit is contained in:
Xevion
2019-07-11 21:52:31 -05:00
parent a923f78218
commit 9c4a16cf63
3 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
app/models.py
View File

@@ -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 # Retains order while making sure that there are no duplicate role values and they are capitalized
def post_role_processing(self): def post_role_processing(self):
user_roles = self.uroles.split(' ') user_roles = self.get_roles()
user_roles = list(dict.fromkeys(user_roles)) user_roles = list(dict.fromkeys(user_roles))
self.uroles = ' '.join([role.title() for role in user_roles]) self.uroles = ' '.join([role.title() for role in user_roles])
self.uroles = self.uroles.strip()
def delete_role(self, role): def delete_role(self, role):
return self.delete_roles([role]) return self.delete_roles([role])
# Will return True if successful, else False if a role didn't exist # Will return True if successful, else False if a role didn't exist
def delete_roles(self, roles, ignore=True): def delete_roles(self, roles, ignore=True):
user_roles = self.uroles.split(' ') user_roles = self.get_roles()
success = True success = True
for role in roles: for role in roles:
try: try:
@@ -48,15 +49,14 @@ class User(UserMixin, db.Model):
success = False success = False
return success return success
def get_roles(self): def get_roles(self):
return self.uroles.split(' ') return [] if len(self.uroles) == 0 else self.uroles.split(' ')
def add_role(self, role): def add_role(self, role):
self.add_roles([role]) self.add_roles([role])
def add_roles(self, roles, postprocess=True): def add_roles(self, roles, postprocess=True):
user_roles = self.uroles.split(' ') user_roles = self.get_roles()
if type(roles) == str: if type(roles) == str:
user_roles.append(roles) user_roles.append(roles)
elif type(roles) == list: elif type(roles) == list:
@@ -72,7 +72,7 @@ class User(UserMixin, db.Model):
# Input: ['Insane', ['Fortunate', 'Blessed']] # Input: ['Insane', ['Fortunate', 'Blessed']]
# Meaning: Must have 'Insane' role, as well as 'Fortunate' or 'Blessed' roles. # Meaning: Must have 'Insane' role, as well as 'Fortunate' or 'Blessed' roles.
def has_roles(self, roles): def has_roles(self, roles):
user_roles = self.uroles.split(' ') user_roles = self.get_roles()
for reqrole in roles: for reqrole in roles:
# If we have this role # If we have this role
if type(reqrole) == str: if type(reqrole) == str:

3
app/templates/dashboard/dashboard_base.html
View File

@@ -15,6 +15,8 @@
<ul class="menu-list"> <ul class="menu-list">
<li><a href="{{ url_for('profile_settings') }}" {% if profile_settings_active %}class="is-active"{% endif %}>Profile Settings</a></li> <li><a href="{{ url_for('profile_settings') }}" {% if profile_settings_active %}class="is-active"{% endif %}>Profile Settings</a></li>
</ul> </ul>
{% if current_user.has_role('Admin') %}
<p class="menu-label"> <p class="menu-label">
Administration Administration
</p> </p>
@@ -28,6 +30,7 @@
</ul> </ul>
</li> </li>
</ul> </ul>
{% endif %}
</aside> </aside>
</div> </div>
<div class="column"></div> <div class="column"></div>

2
app/templates/index.html
View File

@@ -8,7 +8,7 @@
Xevion Xevion
</p> </p>
<p class="subtitle"> <p class="subtitle">
Python Developer Cringe Python Developer
</p> </p>
</div> </div>
</div> </div>