Skip to content

Commit

Permalink
Merge pull request #197 from zediious/0.5.3
Browse files Browse the repository at this point in the history
Changes for 0.5.3
  • Loading branch information
zediious authored Jul 16, 2024
2 parents c528c73 + c4cc8ee commit 445949e
Show file tree
Hide file tree
Showing 15 changed files with 467 additions and 601 deletions.
51 changes: 51 additions & 0 deletions raptorWeb/authprofiles/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -256,6 +256,18 @@ def update_discord_user_details(self, new_info: Response) -> 'DiscordUserInfo':

def __str__(self):
return f"{RaptorUser.objects.get(discord_user_info=self).username}'s Discord User Info"

def routes(self, app):
if app == 'main':
return None

if app == 'panel':
return ((f'panel/users/discorduserinfo/update/{self.pk}',),)

return Exception('Either "app" or "main" must be passed as an argument')

def route_name(self):
return 'discorduserinfo'

class Meta:
verbose_name = "User - Discord Information"
Expand Down Expand Up @@ -377,6 +389,18 @@ def _create_profile_picture_filename(self) -> str:

def __str__(self):
return f"{RaptorUser.objects.get(user_profile_info=self).username}'s Extra Profile Info"

def routes(self, app):
if app == 'main':
return None

if app == 'panel':
return ((f'panel/users/userprofileinfo/update/{self.pk}',),)

return Exception('Either "app" or "main" must be passed as an argument')

def route_name(self):
return 'userprofileinfo'

class Meta:
verbose_name = "User - Extra Information"
Expand Down Expand Up @@ -473,6 +497,21 @@ def get_discord_info(self):

def get_absolute_url(self):
return f"/{BASE_USER_URL}/{self.user_slug}"

def routes(self, app):
if app == 'main':
return (
(f'user/{self.user_slug}',),
(f'user/reset/{self.user_slug}/{self.password_reset_token}', False if self.password_reset_token == None else True)
)

if app == 'panel':
return ((f'panel/users/raptoruser/update/{self.pk}',),)

return Exception('Either "app" or "main" must be passed as an argument')

def route_name(self):
return 'user'

def delete(self, *args, **kwargs):
"""
Expand Down Expand Up @@ -500,6 +539,18 @@ class RaptorUserGroup(Group):
"""
A group for assigning permissions to Users.
"""
def routes(self, app):
if app == 'main':
return None

if app == 'panel':
return ((f'panel/users/raptorusergroup/update/{self.pk}',),)

return Exception('Either "app" or "main" must be passed as an argument')

def route_name(self):
return 'raptorusergroup'

class Meta:
verbose_name = "Permission Group"
verbose_name_plural = "Permission Groups"
Expand Down
37 changes: 37 additions & 0 deletions raptorWeb/donations/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

from django.db import models
from django.core.validators import MinValueValidator
from django.utils.text import slugify

from rcon.source import Client
from django_resized import ResizedImageField
Expand All @@ -27,6 +28,18 @@ class DonationServerCommand(models.Model):

def __str__(self) -> str:
return f'`{self.command}`'

def routes(self, app):
if app == 'main':
return None

if app == 'panel':
return ((f'panel/donations/donationservercommand/update/{self.pk}',),)

return Exception('Either "app" or "main" must be passed as an argument')

def route_name(self):
return 'donationservercommand'

class Meta:
verbose_name = "Server Command"
Expand All @@ -51,6 +64,18 @@ class DonationDiscordRole(models.Model):

def __str__(self) -> str:
return f'`{self.name}`'

def routes(self, app):
if app == 'main':
return None

if app == 'panel':
return ((f'panel/donations/donationdiscordrole/update/{self.pk}',),)

return Exception('Either "app" or "main" must be passed as an argument')

def route_name(self):
return 'donationdiscordrole'

class Meta:
verbose_name = "Discord Role"
Expand Down Expand Up @@ -136,6 +161,18 @@ def __str__(self) -> str:

def get_absolute_url(self):
return f'/panel/donations/donationpackage/update/{self.pk}'

def routes(self, app):
if app == 'main':
return ((f'donations/checkout/{slugify(self.pk)}',),)

if app == 'panel':
return ((f'panel/donations/donationpackage/update/{self.pk}',),)

return Exception('Either "app" or "main" must be passed as an argument')

def route_name(self):
return 'donationpackage'

class Meta:
verbose_name = "Donation Package"
Expand Down
12 changes: 12 additions & 0 deletions raptorWeb/gameservers/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

from django.db import models
from django.utils.timezone import localtime, now
from django.utils.text import slugify
from django.dispatch import receiver
from django.db.models.signals import pre_save
from django.conf import settings
Expand Down Expand Up @@ -436,7 +437,18 @@ def __str__(self) -> str:

def get_absolute_url(self):
return f'/panel/server/update/{self.pk}'

def routes(self, app):
if app == 'main':
return ((f'onboarding/{slugify(self.modpack_name)}',),)

if app == 'panel':
return ((f'panel/server/update/{self.pk}',),)

return Exception('Either "app" or "main" must be passed as an argument')

def route_name(self):
return 'server'

class Meta:
permissions = [
Expand Down
Loading

0 comments on commit 445949e

Please sign in to comment.