Add attachments, clean up UI, etc.

Signed-off-by: Etzelia <etzelia@hotmail.com>

__init__.py

@@ -0,0 +1 @@
+default_app_config = 'minecraft_manager.apps.MinecraftManagerAppConfig'

admin.py

@@ -4,7 +4,7 @@ from django.contrib import admin
 from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
 from django.contrib.auth.models import User
 from django.utils.translation import ugettext_lazy as _
-from minecraft_manager.models import Application, Note, Ticket, TicketNote, Player, IP, UserSettings, Alert
+from minecraft_manager.models import Application, Note, Ticket, TicketNote, Player, IP, UserSettings, Alert, Attachment
 from minecraft_manager.api.admin import register as api_register
 
 
@@ -90,6 +90,14 @@ class IPAdmin(admin.ModelAdmin):
     search_fields = ["player__username", "ip"]
 
 
+class AttachmentAdmin(admin.ModelAdmin):
+    list_display = ["file_name", "model_name"]
+
+    def model_name(self, attachment):
+        return attachment.ref_name
+    model_name.short_description = "Model"
+
+
 try:
     admin.site.unregister(User)
     admin.site.register(User, UserAdmin)
@@ -101,6 +109,7 @@ try:
     admin.site.register(Player, PlayerAdmin)
     admin.site.register(IP, IPAdmin)
     admin.site.register(Alert)
+    admin.site.register(Attachment, AttachmentAdmin)
     api_register()
 except admin.sites.AlreadyRegistered:
     pass

apps.py

@@ -0,0 +1,12 @@
+from django.apps import AppConfig
+from django.db.models.signals import pre_delete
+from minecraft_manager.signals.pre_delete import attachment_delete
+
+
+class MinecraftManagerAppConfig(AppConfig):
+    name = 'minecraft_manager'
+    verbose_name = "Minecraft Manager"
+
+    def ready(self):
+        pre_delete.connect(attachment_delete)
+

bot/commands.py

@@ -153,6 +153,29 @@ class Commands(commands.Cog):
             if not api.plugin(api.PLUGIN_DENY, application.username):
                 await self.bot.discord_message(ctx.message.channel, "Could not deny in-game, is the server running?")
 
+    @commands.command()
+    async def clear(self, ctx, app_id: int):
+        await self._clear(ctx, app_id)
+
+    @app.command("clear")
+    async def app_clear(self, ctx, app_id: int):
+        await self._clear(ctx, app_id)
+
+    async def _clear(self, ctx, app_id: int):
+        application = get_application(app_id)
+        if not application:
+            await self.bot.discord_message(ctx.message.channel, "An Application with that ID doesn't exist.")
+            return
+
+        if not application.accepted:
+            application.accepted = None
+            application.save()
+            if Player.objects.filter(username__iexact=application.username).exists():
+                player = Player.objects.get(username__iexact=application.username)
+                player.application_id = application.id
+                player.save()
+            await self.bot.discord_message(ctx.message.channel, "App ID **{0}** was successfully cleared.".format(app_id))
+
     @commands.command()
     async def search(self, ctx, search: str):
         await self._search(ctx, search)

forms.py

@@ -30,7 +30,7 @@ class TicketForm(ModelForm):
         fields = ['player', 'message', 'priority', 'world', 'x', 'y', 'z']
         widgets = {
             'player': TextInput,
-            'message': Textarea,
+            'message': Textarea(attrs={'style': 'display: block;'}),
         }
 
 
@@ -39,7 +39,7 @@ class NoteForm(ModelForm):
         model = Note
         fields = ['player', 'message', 'importance']
         widgets = {
-            'message': Textarea
+            'message': Textarea(attrs={'style': 'display: block;'})
         }
 
 

migrations/0015_auto_20210206_2140.py

@@ -0,0 +1,29 @@
+# Generated by Django 2.2.3 on 2021-02-06 21:40
+
+from django.db import migrations, models
+import minecraft_manager.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('minecraft_manager', '0014_auto_20190930_1103'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Attachment',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('ref_model', models.CharField(choices=[('T', 'Ticket Note'), ('N', 'Note')], max_length=1)),
+                ('ref_id', models.IntegerField()),
+                ('file', models.FileField(upload_to=minecraft_manager.models._attachment_upload_to)),
+                ('created', models.DateTimeField(auto_now_add=True)),
+            ],
+        ),
+        migrations.AlterField(
+            model_name='application',
+            name='reference',
+            field=models.CharField(blank=True, max_length=50, null=True, verbose_name='How did you find out about our server?'),
+        ),
+    ]

models.py

@@ -1,13 +1,13 @@
 from django.db import models
 from django.contrib.auth.models import User
 from django.db.models import Q
+from os.path import basename
 import logging, yaml, pytz, json, os
 from django.conf import settings
 from datetime import datetime
 
 logger = logging.getLogger(__name__)
 
-
 class MinecraftManagerUser(User):
 
     class Meta:
@@ -252,6 +252,10 @@ class Ticket(models.Model):
     def date_display(self):
         return str(self.date).split(".")[0]
 
+    @property
+    def notes(self):
+        return TicketNote.objects.filter(ticket=self)
+
     def __str__(self):
         return "{}: {}".format(self.issuer, self.snippet)
 
@@ -263,6 +267,10 @@ class TicketNote(models.Model):
     last_update = models.DateTimeField(auto_now_add=True, blank=True, null=True)
     date = models.DateTimeField(auto_now_add=True, blank=True, null=True)
 
+    @property
+    def attachments(self):
+        return Attachment.objects.filter(ref_model=RefModels.TICKET_NOTE[0], ref_id=self.id)
+
     class Meta:
         verbose_name = "Ticket Note"
         verbose_name_plural = "Ticket Notes"
@@ -324,10 +332,49 @@ class Note(models.Model):
     def date_display(self):
         return str(self.date).split(".")[0]
 
+    @property
+    def attachments(self):
+        return Attachment.objects.filter(ref_model=RefModels.NOTE[0], ref_id=self.id)
+
     def __str__(self):
         return "{}: {}".format(self.issuee, self.snippet)
 
 
+class RefModels:
+    TICKET_NOTE = 'T', 'Ticket Note'
+    NOTE = 'N', 'Note'
+    choices = TICKET_NOTE, NOTE
+
+    @staticmethod
+    def label(ref: str):
+        for c in RefModels.choices:
+            if c[0] == ref:
+                return c[1]
+        return "None"
+
+
+def _attachment_upload_to(instance, filename):
+    return f"attachments/{instance.ref_name.lower().replace(' ', '_')}s/{instance.ref_id}/{filename}"
+
+
+class Attachment(models.Model):
+    ref_model = models.CharField(max_length=1, choices=RefModels.choices)
+    ref_id = models.IntegerField()
+    file = models.FileField(upload_to=_attachment_upload_to)
+    created = models.DateTimeField(auto_now_add=True)
+
+    @property
+    def ref_name(self):
+        return RefModels.label(self.ref_model)
+
+    @property
+    def file_name(self):
+        return basename(self.file.name)
+
+    def __str__(self):
+        return self.file.name
+
+
 class IPManager(models.Manager):
     def get_queryset(self):
         users = User.objects.filter(is_active=True)

signals/pre_delete.py

@@ -0,0 +1,2 @@
+def attachment_delete(sender, instance, **kwargs):
+    instance.file.delete(False)

static/minecraft_manager/css/bootswatch-darkly.css

@@ -1,4 +1,9 @@
 @import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic");
+/* Custom CSS */
+.nav-sidebar {
+  border-right: 1px solid #464545;
+}
+
 /*!
  * bootswatch v3.3.7
  * Homepage: http://bootswatch.com

static/minecraft_manager/css/bootswatch-flatly.css

@@ -1,4 +1,9 @@
 @import url("https://fonts.googleapis.com/css?family=Lato:400,700,400italic");
+/* Custom CSS */
+.nav-sidebar {
+  border-right: 1px solid #ecf0f1;
+}
+
 /*!
  * bootswatch v3.3.7
  * Homepage: http://bootswatch.com

static/minecraft_manager/css/bootswatch-slate.css

@@ -1,3 +1,9 @@
+@import url("https://fonts.googleapis.com/css?family=Roboto:400,700");
+/* Custom CSS */
+.nav-sidebar {
+  border-right: 1px solid #1c1e22;
+}
+
 /*!
  * bootswatch v3.3.7
  * Homepage: http://bootswatch.com

static/minecraft_manager/css/bootswatch-solar.css

@@ -1,4 +1,9 @@
 @import url("https://fonts.googleapis.com/css?family=Roboto:400,700");
+/* Custom CSS */
+.nav-sidebar {
+  border-right: 1px solid #282828;
+}
+
 /*!
  * bootswatch v3.3.7
  * Homepage: http://bootswatch.com

templates/minecraft_manager/alert.html

@@ -4,7 +4,7 @@
 {% block title %}Alerts{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
-  <table id="model-table" class="table table-hover link-table">
+  <table id="model-table" class="table table-striped table-hover link-table">
       <thead>
           <tr>
               <th>Message</th>
@@ -14,9 +14,15 @@
       </thead>
       <tbody>
       {% for alert in alerts %}
-          <tr {% if alert.seen is True %}class="success"{% endif %} data-id="{{ alert.id }}">
+          <tr data-id="{{ alert.id }}">
               <td>{{ alert.snippet }}</td>
-              <td>{{ alert.seen }}</td>
+              <td>
+                  {% if alert.seen %}
+                      <span><i class="glyphicon glyphicon-ok-circle text-success"></i></span>
+                  {% else %}
+                      <span><i class="glyphicon glyphicon-remove-circle text-danger"></i></span>
+                  {% endif %}
+              </td>
               <td>{{ alert.date }}</td>
           </tr>
       {% endfor %}

templates/minecraft_manager/application.html

@@ -3,7 +3,7 @@
 {% block title %}Applications{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
-  <table id="model-table" class="table table-hover link-table">
+  <table id="model-table" class="table table-striped table-hover link-table">
       <thead>
           <tr>
               <th>App ID</th>
@@ -16,12 +16,19 @@
       </thead>
       <tbody>
       {% for app in applications %}
-          <tr {% if app.accepted is True %}class="success"{% endif %}{% if app.accepted is False %}class="danger"{% endif %} data-id="{{ app.id }}">
+          <tr data-id="{{ app.id }}">
               <td>{{ app.id }}</td>
               <td>{{ app.username }}</td>
               <td>{{ app.age }}</td>
               <td>{{ app.ever_banned }}</td>
-              <td>{{ app.status }}</td>
+              <td>
+                  {{ app.status }}
+                  {% if app.accepted is True %}
+                      <span><i class="glyphicon glyphicon-ok-circle text-success"></i></span>
+                  {% elif app.accepted is False %}
+                      <span><i class="glyphicon glyphicon-remove-circle text-danger"></i></span>
+                  {% endif %}
+              </td>
               <td>{{ app.date }}</td>
           </tr>
       {% endfor %}

templates/minecraft_manager/ban.html

@@ -2,7 +2,7 @@
 {% block title %}Bans{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
-  <table id="model-table" class="table table-hover link-table">
+  <table id="model-table" class="table table-striped table-hover link-table">
       <thead>
           <tr>
               <th>Player</th>

templates/minecraft_manager/bots.html

@@ -1,16 +0,0 @@
-{% extends "minecraft_manager/dashboard.html" %}
-{% load csrf_html %}
-{% block title %}Bots{% endblock %}
-{% block section %}
-<div id="content">
-    {% for bot in bots %}
-        <p>{{ bot.name }}: <span class="label {% if bot.status is True %}label-success{% else %}label-danger{% endif %}">{{ bot.display }}</span></p>
-        <form action="" method="post">{% autoescape off %}{% get_csrf_html request %}{% endautoescape %}
-            <button class="btn btn-primary{% if bot.status is True %} disabled{% endif %}" type="submit" name="{{ bot.name }}" value="start" {% if bot.status is True %} disabled="disabled"{% endif %}>Start</button>
-            <button class="btn btn-primary{% if bot.status is False %} disabled{% endif %}" type="submit" name="{{ bot.name }}" value="stop" {% if bot.status is False %}disabled="disabled"{% endif %}>Stop</button>
-            <button class="btn btn-primary{% if bot.status is False %} disabled{% endif %}" type="submit" name="{{ bot.name }}" value="restart" {% if bot.status is False %}disabled="disabled"{% endif %}>Restart</button>
-        </form>
-        <br/>
-    {% endfor %}
-</div>
-{% endblock section %}

templates/minecraft_manager/dashboard.html

@@ -28,6 +28,9 @@
             <li class="dropdown">
                 <a class="dropdown-toggle " href="#" role="button" data-toggle="dropdown" id="accountDropdown">{{ user.username }}</a>
                 <ul class="dropdown-menu" role="menu" aria-labelledby="accountDropdown">
+                    {% if user.is_staff %}
+                        <li><a target="_blank" href="{% url "admin:index" %}">Admin Site</a></li>
+                    {% endif %}
                     <li><a style="cursor:pointer;" data-toggle="modal" data-target="#settingsModal">Settings</a></li>
                     <li><a style="cursor:pointer;" data-toggle="modal" data-target="#passwordModal">Change Password</a></li>
                     <li><a href="{% url "logout"  %}">Logout</a></li>
@@ -69,9 +72,6 @@
               <form id="settingsForm" method="POST" action="{% url 'api-web' keyword='settings' %}">{% autoescape off %}{% get_csrf_html request %}{% endautoescape %}
               <div class="modal-body">
                     {% get_form 'usersettings' request %}
-                    {% if user.is_staff %}
-                        <br/><a target="_blank" href="{% url "admin:index" %}">Admin Site</a>
-                    {% endif %}
               </div>
               <div class="modal-footer">
                   <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>

templates/minecraft_manager/modal/add_attachment.html

@@ -0,0 +1,47 @@
+<div id="addAttachmentModal" class="modal fade" role="dialog">
+  <div class="modal-dialog">
+
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">&times;</button>
+        <h4 class="modal-title">Add Attachment(s)</h4>
+      </div>
+      <div class="modal-body">
+          <form method="post" id="add-attachment-form" enctype="multipart/form-data">{% csrf_token %}
+              <input type="file" multiple name="attachments"/>
+              <input type="hidden" name="next" value="{% url 'note_info' note.id %}"/>
+          </form>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary" id="add-attachment-save">Save</button>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+    $(document).ready(() => {
+        const $modal = $('#addAttachmentModal');
+        const addAttachmentSave = document.querySelector('#add-attachment-save');
+        const addAttachmentForm = document.querySelector('#add-attachment-form');
+        document.querySelectorAll('.add-attachment[data-model][data-ref]').forEach((elem) => {
+            elem.addEventListener('click', () => {
+                addAttachmentModal(elem.dataset.model, elem.dataset.ref);
+            });
+        });
+        $modal.on('hidden.bs.modal', () => {
+            addAttachmentForm.reset();
+        });
+        addAttachmentSave.addEventListener('click', () => {
+            addAttachmentForm.submit();
+        });
+
+        function addAttachmentModal(model, ref) {
+            addAttachmentForm.action = '{% url 'attachment_add' 'X' 0 %}'
+                .replace('X', model)
+                .replace('0', ref);
+            $modal.modal('show');
+        }
+    });
+</script>

templates/minecraft_manager/modal/delete_attachment.html

@@ -0,0 +1,48 @@
+<div id="deleteAttachmentModal" class="modal fade" role="dialog">
+  <div class="modal-dialog">
+
+    <!-- Modal content-->
+    <div class="modal-content">
+      <div class="modal-header">
+        <button type="button" class="close" data-dismiss="modal">&times;</button>
+        <h4 class="modal-title">Delete Attachment</h4>
+      </div>
+      <div class="modal-body">
+        <p>Are you sure you want to delete <code id="delete-attachment-name"></code>?</p>
+      </div>
+      <div class="modal-footer">
+        <button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
+        <button type="button" class="btn btn-primary" id="delete-attachment-confirm">Confirm</button>
+      </div>
+    </div>
+  </div>
+</div>
+<script>
+    $(document).ready(() => {
+        const $modal = $('#deleteAttachmentModal');
+        const deleteAttachmentName = document.querySelector('#delete-attachment-name');
+        const deleteAttachmentConfirm = document.querySelector('#delete-attachment-confirm');
+        document.querySelectorAll('.delete-attachment[data-name][data-id]').forEach((elem) => {
+            elem.addEventListener('click', () => {
+                deleteAttachmentModal(elem.dataset.name, elem.dataset.id);
+            });
+        });
+        deleteAttachmentConfirm.addEventListener('click', () => {
+            const attachmentURL = '{% url 'attachment' 0 %}'.replace('0', deleteAttachmentConfirm.dataset.id);
+            fetch(attachmentURL, {
+                method: 'DELETE',
+                headers: {
+                    'X-CSRFToken': '{{ csrf_token }}'
+                }
+            }).then(() => {
+                location.reload();
+            });
+        });
+
+        function deleteAttachmentModal(name, id) {
+            deleteAttachmentName.innerHTML = name;
+            deleteAttachmentConfirm.dataset.id = id;
+            $modal.modal('show');
+        }
+    });
+</script>

templates/minecraft_manager/note.html

@@ -2,24 +2,34 @@
 {% block title %}Notes{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
-  <table id="model-table" class="table table-hover link-table">
+  <table id="model-table" class="table table-striped table-hover link-table">
       <thead>
           <tr>
               <th>Player</th>
               <th>Message</th>
               <th>Importance</th>
               <td>Issued By</td>
+              <td>Attachments</td>
               <th>Date</th>
           </tr>
       </thead>
       <tbody>
       {% for note in notes %}
-          <tr {% if note.importance == 'L' %}class="info"{% endif %}{% if note.importance == 'M' %}class="warning"{% endif %}{% if note.importance == 'H' %}class="danger"{% endif %} data-id="{{ note.id }}">
+          <tr data-id="{{ note.id }}">
               <!-- <td>{{ note.id }}</td> -->
               <td>{{ note.issuee }}</td>
               <td>{{ note.snippet }}</td>
-              <td>{{ note.importance_display }}</td>
+              <td>
+                  <span class="label label-{% if note.importance == 'L' %}info{% elif note.importance == 'M' %}warning{% elif note.importance == 'H' %}danger{% endif %}">
+                      {{ note.importance_display }}
+                  </span>
+              </td>
               <td>{{ note.issuer }}</td>
+              <td>
+                  {% for attachment in note.attachments %}
+                      <a href="{% url 'attachment' attachment.id %}">{{ attachment.file_name }}</a><br/>
+                  {% endfor %}
+              </td>
               <td>{{ note.date }}</td>
           </tr>
       {% endfor %}

templates/minecraft_manager/note_add.html

@@ -6,21 +6,17 @@
   <h2 class="sub-header">New Note</h2>
   <div class="row">
       <div class="col-xs-18 col-md-12">
-          <form action="" method="post">{% autoescape off %}{% get_csrf_html request %}{% endautoescape %}
+          <form action="" method="post" enctype="multipart/form-data">{% autoescape off %}{% get_csrf_html request %}{% endautoescape %}
-            <p><label for="">Player Filter:</label> <input id="id_filter" type="text"/></p>
+            <p><label for="id_filter">Player Filter:</label> <input id="id_filter" type="text"/></p>
             {{ form }}
+            <p>
+                <label for="attachments">Attachments:</label>
+                <input id="attachments" name="attachments" type="file" multiple/>
+            </p>
             <button id="saveButton" class="btn btn-primary" type="submit">Save</button>
           </form>
       </div>
   </div>
-<div class="row">
-    <div class="col-xs-6 col-md-4">
-          
-      </div>
-      <div class="col-xs-12 col-md-8">
-
-      </div>
-</div>
 </div>
 <script>
     $(document).ready(function() {

templates/minecraft_manager/note_info.html

@@ -15,7 +15,7 @@
       <div class="col-xs-12 col-md-8">
           <form action="" method="post">{% autoescape off %}{% get_csrf_html request %}{% endautoescape %}
             <p>Issuer: {{ note.staff.username }} </p>
-            <p>Importance:
+            <p><label for="noteImportance">Importance:</label>
                 {% if user.is_staff or user == note.staff %}
                     <select id="noteImportance" name="importance">
                         {% for p in form.importance %}
@@ -32,23 +32,42 @@
           </form>
       </div>
   </div>
+{% if note.attachments.all|length > 0 %}
 <div class="row">
-    <div class="col-xs-6 col-md-4">
+    <table>
-          
+        <thead>
-      </div>
+        <tr><th>Attachments</th></tr>
-      <div class="col-xs-12 col-md-8">
+        </thead>
-
+        <tbody>
-      </div>
+        {% for attachment in note.attachments %}
+            <tr>
+            <td>
+                <a href="{% url 'attachment' attachment.id %}">{{ attachment.file_name }}</a>
+                <span class="delete-attachment" data-name="{{ attachment.file_name }}" data-id="{{ attachment.id }}">
+                    <i class="glyphicon glyphicon-remove-circle text-danger"></i>
+                </span>
+            </td>
+            </tr>
+        {% endfor %}
+        </tbody>
+    </table>
 </div>
+{% endif %}
+<br/>
+<button type="button" class="btn btn-sm btn-primary add-attachment" data-model="N" data-ref="{{ note.id }}">Add Attachment(s)</button>
+
 </div>
 <script>
     $("#saveButton").hide();
     $("#noteImportance").change(function() {
-        if (("{{ user.username }}" == "{{ note.staff.username }}" || "{{ user.is_staff }}" == "True") && $(this).val() != "{{ note.importance }}") {
+        if (("{{ user.username }}" === "{{ note.staff.username }}" || "{{ user.is_staff }}" === "True") && $(this).val() !== "{{ note.importance }}") {
             $("#saveButton").show();
         } else {
             $("#saveButton").hide();
         }
     });
 </script>
+
+{% include 'minecraft_manager/modal/add_attachment.html' %}
+{% include 'minecraft_manager/modal/delete_attachment.html' %}
 {% endblock section %}

templates/minecraft_manager/player.html

@@ -2,7 +2,7 @@
 {% block title %}Players{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
-  <table id="model-table" class="table table-hover link-table">
+  <table id="model-table" class="table table-striped table-hover link-table">
       <thead>
           <tr>
               <th>Username</th>
@@ -13,10 +13,18 @@
       </thead>
       <tbody>
       {% for player in players %}
-          <tr {% if player.uuid in bans %}class="danger"{% endif %}{% if player.uuid not in bans %}class="success"{% endif %} data-id="{{ player.id }}">
+          <tr data-id="{{ player.id }}">
               <td>{{ player.username }}{% if user.usersettings.search_player_ip is True %}<span hidden="hidden">{{ player.ips }}</span>{% endif %}</td>
               <td>{{ player.uuid }}</td>
-              <td>{% if player.uuid in bans %}True {% else %}False{% endif %}</td>
+              <td>
+                  {% if player.uuid in bans %}
+                      Yes
+                    <span><i class="glyphicon glyphicon-remove-circle text-danger"></i></span>
+                  {% else %}
+                      No
+                    <span><i class="glyphicon glyphicon-ok-circle text-success"></i></span>
+                  {% endif %}
+              </td>
               <td>{{ player.last_seen }}</td>
           </tr>
       {% endfor %}

templates/minecraft_manager/player_info.html

@@ -6,12 +6,12 @@
   <h2 class="sub-header">Player Info ({{ player.username }})</h2>
   <div class="row">
       <div class="col-xs-9 col-md-6">
-          <p>UUID: {{ player.uuid }}</p>
+          <p>UUID: <code>{{ player.uuid }}</code> <button data-copy="{{ player.uuid }}" class="btn btn-xs btn-primary"><i class="glyphicon glyphicon-copy"></i></button></p>
           {% if player.auth_user %}
               <p>Connected User: {{ player.auth_user.username }}</p>
           {% endif %}
           {% if player.application %}
-              <p>Application: <a href="{% url "application" %}{{ player.application.id }}">Here</a></p>
+              <p>Application: <a href="{% url "application" %}{{ player.application.id }}">{{ player.application.username }}</a></p>
           {% endif %}
           <p>Donor Status: {{ player.donor_status }}</p>
           <p>First Seen: {{ player.first_seen }}</p>
@@ -20,14 +20,35 @@
       </div>
       <div class="col-xs-9 col-md-6">
           <h4>Tickets</h4>
-          <table class="table table-hover link-table">
+          <table class="table table-striped table-hover link-table">
+              <thead>
+              <tr>
+                  <td>ID</td>
+                  <td>Message</td>
+                  <td>Resolved</td>
+                  <td>Attachments</td>
+              </tr>
+              </thead>
               <tbody>
               {% if form.tickets %}
                   {% for ticket in form.tickets %}
-                      <tr {% if ticket.resolved is True %}class="success"{% else %}class="danger"{% endif %} data-id="{{ ticket.id }}" data-url="{% url "ticket" %}">
+                      <tr data-id="{{ ticket.id }}" data-url="{% url "ticket" %}">
                           <td>{{ ticket.id }}</td>
                           <td>{{ ticket.snippet }}</td>
-                          <td>{{ ticket.resolved }}</td>
+                          <td>
+                              {% if ticket.resolved is True %}
+                                  <span><i class="glyphicon glyphicon-ok-circle text-success"></i></span>
+                              {% else %}
+                                  <span><i class="glyphicon glyphicon-remove-circle text-danger"></i></span>
+                              {% endif %}
+                          </td>
+                          <td>
+                              {% for note in ticket.notes %}
+                                  {% for attachment in note.attachments %}
+                                      <a href="{% url 'attachment' attachment.id %}">{{ attachment.file_name }}</a> ({{ note.author.username }})<br/>
+                                  {% endfor %}
+                              {% endfor %}
+                          </td>
                       </tr>
                   {% endfor %}
               {% else %}
@@ -36,15 +57,33 @@
               </tbody>
           </table>
           <br/>
-          <table class="table table-hover link-table">
+          <h4>Notes</h4>
-              <h4>Notes</h4>
+          <table class="table table-striped table-hover link-table">
+              <thead>
+              <tr>
+                  <td>Message</td>
+                  <td>Importance</td>
+                  <td>Attachments</td>
+              </tr>
+              </thead>
               <tbody>
               {% if form.notes %}
                   {% for note in form.notes %}
-                      <tr {% if note.importance == 'L' %}class="info"{% endif %}{% if note.importance == 'M' %}class="warning"{% endif %}{% if note.importance == 'H' %}class="danger"{% endif %} data-id="{{ note.id }}" data-url="{% url "note" %}">
+                      <tr data-id="{{ note.id }}" data-url="{% url "note" %}">
                           <!-- {{ note.id }} -->
                           <td>{{ note.snippet }}</td>
-                          <td>{{ note.importance_display }}</td>
+                          <td>
+                              <span class="label label-{% if note.importance == 'L' %}info{% elif note.importance == 'M' %}warning{% elif note.importance == 'H' %}danger{% endif %}">
+                                  {{ note.importance_display }}
+                              </span>
+                          </td>
+                          <td>
+                              {% for attachment in note.attachments %}
+                                  <a href="{% url 'attachment' attachment.id %}">{{ attachment.file_name }}</a>
+                                  {% if note.staff %}({{ note.staff.username }}){% endif %}
+                                  <br/>
+                              {% endfor %}
+                          </td>
                       </tr>
                   {% endfor %}
               {% else %}
@@ -54,14 +93,22 @@
           </table>
           <a class="btn btn-primary" href="{% url 'note_add' %}?player={{ player.id }}">Add Note</a>
           <br/><br/>
+          <h4>IPs</h4>
           <table class="table table-striped table-hover link-table">
-              <h4>IPs</h4>
+              <thead>
+              <tr>
+                  <th>IP</th>
+                  <th>Last Used</th>
+                  <th>Associated Users</th>
+              </tr>
+              </thead>
               <tbody>
               {% if form.ips %}
                   {% for ip in form.ips %}
                       <tr class="default" data-id="" data-url="{% url 'ip' ip.id %}">
                           <!-- {{ ip.id }} -->
-                          <td>{{ ip.ip }} ({{ ip.last_used_formatted }})</td>
+                          <td>{{ ip.ip }}</td>
+                          <td>{{ ip.last_used_formatted }}</td>
                           {% if ip.associated %}
                               <td>
                               {% for assoc in ip.associated %}
@@ -81,4 +128,21 @@
       </div>
   </div>
 </div>
+
+<script>
+document.querySelectorAll('[data-copy]').forEach((elem) => {
+    elem.addEventListener('click', () => {
+        const text = document.createElement('textarea');
+        text.value = elem.dataset.copy;
+        text.style.top = "0";
+        text.style.left = "0";
+        text.style.position = "fixed";
+        document.body.appendChild(text);
+        text.focus();
+        text.select();
+        document.execCommand('copy');
+        text.remove();
+    });
+});
+</script>
 {% endblock section %}

templates/minecraft_manager/ticket.html

@@ -2,7 +2,7 @@
 {% block title %}Tickets{% endblock %}
 {% block section %}
 <div id="content" hidden="hidden">
-  <table id="model-table" class="table table-hover link-table">
+  <table id="model-table" class="table table-striped table-hover link-table">
       <thead>
           <tr>
               <th>ID</th>
@@ -16,13 +16,23 @@
       </thead>
       <tbody>
       {% for ticket in tickets %}
-          <tr {% if ticket.resolved is True %}class="info"{% elif ticket.priority == 'L' %}class="success"{% elif ticket.priority == 'M' %}class="warning"{% elif ticket.priority == 'H' %}class="danger"{% endif %} data-id="{{ ticket.id }}">
+          <tr data-id="{{ ticket.id }}">
               <td>{{ ticket.id }}</td>
               <td>{{ ticket.issuer }}</td>
               <td>{{ ticket.snippet }}</td>
-              <td>{{ ticket.priority_display }}</td>
+              <td>
+                  <span class="label label-{% if ticket.priority == 'L' %}info{% elif ticket.priority == 'M' %}warning{% elif ticket.priority == 'H' %}danger{% endif %}">
+                      {{ ticket.priority_display }}
+                  </span>
+              </td>
               <td>{{ ticket.claimed_by }}</td>
-              <td>{{ ticket.resolved }}</td>
+              <td>
+                  {% if ticket.resolved %}
+                      <span><i class="glyphicon glyphicon-ok-circle text-success"></i></span>
+                  {% else %}
+                      <span><i class="glyphicon glyphicon-remove-circle text-danger"></i></span>
+                  {% endif %}
+              </td>
               <td>{{ ticket.date }}</td>
           </tr>
       {% endfor %}

templates/minecraft_manager/ticket_info.html

@@ -74,20 +74,42 @@
             {% endif %}
             <p>Created: {{ ticket_note.date }}</p>
             <p>Last Update: {{ ticket_note.last_update }}</p>
+            {% if ticket_note.attachments|length > 0 %}
+                    <table>
+                        <thead>
+                        <tr><th>Attachments</th></tr>
+                        </thead>
+                        <tbody>
+                        {% for attachment in ticket_note.attachments %}
+                            <tr>
+                                <td>
+                                    <a href="{% url 'attachment' attachment.id %}">{{ attachment.file_name }}</a>
+                                    <span class="delete-attachment" data-name="{{ attachment.file_name }}" data-id="{{ attachment.id }}">
+                                        <i class="glyphicon glyphicon-remove-circle text-danger"></i>
+                                    </span>
+                                </td>
+                            </tr>
+                        {% endfor %}
+                        </tbody>
+                    </table>
+            {% endif %}
         </div>
     {% endfor %}
 </div>
 {% if not form.has_ticket_note and not form.show_ticket_note %}
     <div id="createDiv" class="row">
-        <button class="btn btn-primary" onClick="showNote()">Create Note</button>
+        <button class="btn btn-primary" onClick="showNote();">Create Note</button>
     </div>
 {% endif %}
 <div id="ticket_noteDiv" class="row" {% if not form.show_ticket_note %}style="display: none;"{% endif %}>
     <br/>
     <h3>Note</h3>
-    <form action="" method="POST">{% autoescape off %}{% get_csrf_html request %}{% endautoescape %}
+    <form action="" method="POST" enctype="multipart/form-data">{% autoescape off %}{% get_csrf_html request %}{% endautoescape %}
         {{ form.ticket_note_form }}
-        <br/>
+        <p>
+            <label for="attachments">Attachments:</label>
+            <input id="attachments" name="attachments" type="file" multiple/>
+        </p>
         <button type="submit" class="btn btn-primary" name="ticket_note" value="{% if form.has_ticket_note %}edit{% else %}create{% endif %}">Save</button>
     </form>
 </div>
@@ -97,7 +119,7 @@
     $("#saveButton").hide();
     $("#ticketStaff").change(function() {
         var $priority = $("#ticketPriority");
-        if ($(this).val() != "{{ ticket.staff.id }}" || $priority.val() != "{{ ticket.priority }}") {
+        if ($(this).val() !== "{{ ticket.staff.id }}" || $priority.val() !== "{{ ticket.priority }}") {
             toggleSave(true);
         } else {
             toggleSave(false);
@@ -105,7 +127,7 @@
     });
     $("#ticketPriority").change(function() {
         var $staff = $("#ticketStaff");
-        if ($(this).val() != "{{ ticket.priority }}" || $staff.val() != "{{ ticket.staff.id }}") {
+        if ($(this).val() !== "{{ ticket.priority }}" || $staff.val() !== "{{ ticket.staff.id }}") {
             toggleSave(true);
         } else {
             toggleSave(false);
@@ -113,10 +135,10 @@
     });
 
     function toggleSave(toggle) {
-        if (toggle == true) {
+        if (toggle === true) {
             $("#resolveButton").hide();
             $("#saveButton").show();
-        } else if (toggle == false) {
+        } else if (toggle === false) {
             $("#resolveButton").show();
             $("#saveButton").hide();
         }
@@ -128,4 +150,5 @@
         $("#editBtn").hide();
     }
 </script>
+{% include 'minecraft_manager/modal/delete_attachment.html' %}
 {% endblock section %}

urls.py

@@ -7,37 +7,41 @@ urlpatterns = [
     url(r'^$', RedirectView.as_view(pattern_name='overview')),
 
     # Dashboard
-    url(r'^dashboard/overview/$', login_required(mcm.Overview.as_view()), name="overview"),
+    url(r'^overview/$', login_required(mcm.Overview.as_view()), name="overview"),
-    url(r'^dashboard/ban/$', login_required(mcm.Ban.as_view()), name="ban"),
+    url(r'^ban/$', login_required(mcm.Ban.as_view()), name="ban"),
 
     # Alerts
-    url(r'^dashboard/alert/$', login_required(mcm.Alert.as_view()), name="alert"),
+    url(r'^alert/$', login_required(mcm.Alert.as_view()), name="alert"),
-    url(r'^dashboard/alert/(?P<alert_id>[0-9]{1,5})/$', login_required(mcm.AlertInfo.as_view())),
+    url(r'^alert/(?P<alert_id>[0-9]{1,5})/$', login_required(mcm.AlertInfo.as_view())),
 
     # Applications
-    url(r'^dashboard/application/$', login_required(mcm.Application.as_view()), name="application"),
+    url(r'^application/$', login_required(mcm.Application.as_view()), name="application"),
-    url(r'^dashboard/reference/$', login_required(mcm.Reference.as_view()), name="reference"),
+    url(r'^reference/$', login_required(mcm.Reference.as_view()), name="reference"),
-    url(r'^dashboard/application/(?P<application_id>[0-9]{1,5})/$', login_required(mcm.ApplicationInfo.as_view())),
+    url(r'^application/(?P<application_id>[0-9]{1,5})/$', login_required(mcm.ApplicationInfo.as_view())),
 
     # Players
-    url(r'^dashboard/player/$', login_required(mcm.Player.as_view()), name="player"),
+    url(r'^player/$', login_required(mcm.Player.as_view()), name="player"),
-    url(r'^dashboard/player/(?P<player_id>[0-9]{1,5})/$', login_required(mcm.PlayerInfo.as_view())),
+    url(r'^player/(?P<player_id>[0-9]{1,5})/$', login_required(mcm.PlayerInfo.as_view())),
 
     # Tickets
-    url(r'^dashboard/ticket/$', login_required(mcm.Ticket.as_view()), name="ticket"),
+    url(r'^ticket/$', login_required(mcm.Ticket.as_view()), name="ticket"),
-    url(r'^dashboard/ticket/(?P<ticket_id>[0-9]{1,5})/$', login_required(mcm.TicketInfo.as_view())),
+    url(r'^ticket/(?P<ticket_id>[0-9]{1,5})/$', login_required(mcm.TicketInfo.as_view())),
 
-    # Warnings
+    # Notes
-    url(r'^dashboard/note/$', login_required(mcm.Note.as_view()), name="note"),
+    url(r'^note/$', login_required(mcm.Note.as_view()), name="note"),
-    url(r'^dashboard/note/(?P<note_id>[0-9]{1,5})/$', login_required(mcm.NoteInfo.as_view())),
+    url(r'^note/(?P<note_id>[0-9]{1,5})/$', login_required(mcm.NoteInfo.as_view()), name='note_info'),
-    url(r'^dashboard/note/add$', login_required(mcm.NoteAdd.as_view()), name="note_add"),
+    url(r'^note/add$', login_required(mcm.NoteAdd.as_view()), name="note_add"),
+
+    # Attachments
+    url(r'^attachment/(?P<attachment_id>[0-9]{1,5})/$', login_required(mcm.Attachment.as_view()), name="attachment"),
+    url(r'attachment/(?P<ref_model>[A-Za-z])/(?P<ref_id>[0-9]{1,5})/$', login_required(mcm.AddAttachment.as_view()), name='attachment_add'),
 
     # IP
-    url(r'^dashboard/ip/(?P<ip_id>[0-9]{1,5})/$', login_required(mcm.IP.as_view()), name="ip"),
+    url(r'^ip/(?P<ip_id>[0-9]{1,5})/$', login_required(mcm.IP.as_view()), name="ip"),
 
     # Report
     url(r'^report/$', login_required(mcm.Report.as_view()), name="report"),
 
     # Chat
-    url(r'^dashboard/chat/$', permission_required('minecraft_manager.chat')(mcm.Chat.as_view()), name="chat"),
+    url(r'^chat/$', permission_required('minecraft_manager.chat')(mcm.Chat.as_view()), name="chat"),
 ]

utils.py

@@ -1,5 +1,6 @@
 import discord, requests
 from django.conf import settings
+from django.core.files.storage import FileSystemStorage
 from minecraft_manager.models import Player, Application
 
 

views.py

@@ -1,18 +1,16 @@
-#create your views here.
-# https://api.mojang.com/users/profiles/minecraft/<username>
 from __future__ import absolute_import
 
-import json, datetime, pytz, os, sys
+import json, datetime, pytz, os
 from django.utils import timezone
 from itertools import chain
-from django.http import JsonResponse
+from django.http import JsonResponse, HttpResponse
 from django.shortcuts import render, reverse, redirect
 from django.views.decorators.csrf import csrf_protect
 from django.utils.decorators import method_decorator
 from django.conf import settings
 from django.views.generic import View
 from django.contrib.auth.models import User
-from minecraft_manager.models import Application as AppModel, Player as PlayerModel, Ticket as TicketModel, TicketNote as TicketNoteModel, Note as NoteModel, IP as IPModel, Alert as AlertModel, UserSettings as UserSettingsModel
+from minecraft_manager.models import Application as AppModel, Player as PlayerModel, Ticket as TicketModel, TicketNote as TicketNoteModel, Note as NoteModel, IP as IPModel, Alert as AlertModel, UserSettings as UserSettingsModel, Attachment as AttachmentModel, RefModels
 from minecraft_manager.forms import TicketNoteForm, NoteForm
 from minecraft_manager.overview import overview_data
 from minecraft_manager.utils import resolve_player
@@ -280,6 +278,11 @@ class TicketInfo(View):
                     db.message = n.message
                     db.last_update = timezone.now()
                     db.save()
+                # Refresh to get the ID for attachments
+                note = TicketNoteModel.objects.get(ticket=ticket, author=request.user)
+                for file in request.FILES.getlist('attachments', []):
+                    attachment = AttachmentModel(ref_model=RefModels.TICKET_NOTE[0], ref_id=note.id, file=file)
+                    attachment.save()
             else:
                 show_ticket_note = True
         else:
@@ -314,23 +317,30 @@ class NoteInfo(View):
     def get(self, request, note_id):
         note = NoteModel.objects.get(id=note_id)
         form = {'importance': NoteModel.IMPORTANCE}
-        return render(request, 'minecraft_manager/note_info.html', {'current_app': 'note', 'form': form, 'note': note})
+        return render(request, 'minecraft_manager/note_info.html', {
+            'current_app': 'note',
+            'form': form,
+            'note': note
+        })
 
     def post(self, request, note_id):
         post = request.POST
         note = NoteModel.objects.get(id=note_id)
         if 'importance' in post:
-            API.discord_mcm("Note #**{0}**'s importance was changed from {1} to {2} by {3}".format(note.id,
+            API.discord_mcm("Note #**{0}**'s importance was changed from {1} to {2} by {3}".format(
-                                                                                                             note.importance_display,
+                note.id,
-                                                                                                             NoteModel.importance_code_to_display(
+                note.importance_display,
-                                                                                                                 post[
+                NoteModel.importance_code_to_display(post['importance']),
-                                                                                                                     'importance']),
+                request.user.player.username)
-                                                                                                             request.user.player.username))
+            )
             note.importance = post['importance']
         note.save()
         form = {'importance': NoteModel.IMPORTANCE}
-        return render(request, 'minecraft_manager/note_info.html',
+        return render(request, 'minecraft_manager/note_info.html', context={
-                                  {'current_app': 'note', 'form': form, 'note': note})
+            'current_app': 'note',
+            'form': form,
+            'note': note
+        })
 
 
 class NoteAdd(View):
@@ -341,8 +351,7 @@ class NoteAdd(View):
         form = NoteForm()
         if 'player' in get:
             form.initial = {'player': get['player']}
-        return render(request, 'minecraft_manager/note_add.html',
+        return render(request, 'minecraft_manager/note_add.html', context={'current_app': 'note', 'form': form.as_p()})
-                                  {'current_app': 'note', 'form': form.as_p()})
 
     def post(self, request):
         post = request.POST
@@ -352,14 +361,41 @@ class NoteAdd(View):
             note.staff = request.user
             note.save()
             API.discord_mcm(
-                "**{0}** made a **{1}** importance note for **{2}**\nPreview: {3}".format(note.staff.player.username,
+                "**{0}** made a **{1}** importance note for **{2}**\nPreview: {3}".format(
-                                                                                            note.importance_display,
+                    note.staff.player.username,
-                                                                                            note.player.username,
+                    note.importance_display,
-                                                                                            note.snippet))
+                    note.player.username,
+                    note.snippet)
+            )
+            for file in request.FILES.getlist('attachments', []):
+                attachment = AttachmentModel(ref_model=RefModels.NOTE[0], ref_id=note.id, file=file)
+                attachment.save()
             return redirect("{0}{1}".format(reverse('note'), note.id))
         else:
-            return render(request, 'minecraft_manager/note_add.html',
+            return render(request, 'minecraft_manager/note_add.html', context={'current_app': 'note', 'form': form})
-                                      {'current_app': 'note', 'form': form})
+
+
+class Attachment(View):
+
+    def get(self, request, attachment_id):
+        attachment = AttachmentModel.objects.get(id=attachment_id)
+        resp = HttpResponse(attachment.file)
+        resp['Content-Disposition'] = f"attachment; filename={attachment.file_name}"
+        return resp
+
+    def delete(self, request, attachment_id):
+        attachment = AttachmentModel.objects.get(id=attachment_id)
+        attachment.delete()
+        return HttpResponse(status=204)
+
+
+class AddAttachment(View):
+
+    def post(self, request, ref_model, ref_id):
+        for file in request.FILES.getlist('attachments', []):
+            attachment = AttachmentModel(ref_model=ref_model, ref_id=ref_id, file=file)
+            attachment.save()
+        return redirect(request.POST.get('next', reverse('overview')))
 
 
 class IP(View):
@@ -427,7 +463,6 @@ class Report(View):
 
 class Chat(View):
 
-
     @staticmethod
     def replace_ascii(message):
         return message.replace(" ", "\\040").replace("\"", "\\042").replace("#", "\\043").replace("$", "\\044")\