Installed basic reversion

assets/admin.py

@@ -1,6 +1,7 @@
 from django.contrib import admin
 
 from image_cropping import ImageCroppingMixin
+from reversion.admin import VersionAdmin
 
 from .models import Entry,Category, VersionHistory, EntryImage
 
@@ -11,10 +12,10 @@
 #     fields = ('entry', 'version', 'timestamp', 'changelog')
 #     list_display = ('entry', 'version')
 
-class EntryAdmin(admin.ModelAdmin):
+class EntryAdmin(VersionAdmin):
     class Meta:
         model = Entry
-    fields = ('category', 'user', 'name', 'description')
+    # fields = ('category', 'user', 'name', 'description')
     list_display = ('name', 'category', 'user', 'total_likes')
 
 class EntryImageAdmin(ImageCroppingMixin, admin.ModelAdmin):

assets/repos/bitbucket_handler.py

@@ -1,5 +1,7 @@
 import json
 
+from django.utils import timezone
+
 import requests
 
 from warnings import warn
@@ -73,6 +75,7 @@ def fetch_metadata(self, asset):
         # except requests.exceptions.HTTPError:
         #     return asset
         asset.repo_stars = data['followers_count']
+        asset.repo_updated = timezone.now()
 
         return asset
 

assets/repos/github_handler.py

@@ -46,6 +46,7 @@ def fetch_metadata(self, asset):
             commit_activity.append(str(sum(stat.days)))
         asset.commits = ",".join(commit_activity)
 
+        #TODO: get releases
         # contributors = []
         # for contributor in repo.iter_contributors():
         #     contributors.append(contributor.login)

assets/templates/assets_detail.html

@@ -19,10 +19,10 @@ <h1>{{ entry.name }}
                         <table class="table table-striped">
                             <thead>
                             <tr>
-                                <th>Stars</th>
-                                <th>Forks</th>
-                                <th>Repo updated</th>
-                                <th>Stats</th>
+                                <th><i class="fas fa-star"></i>Stars</th>
+                                <th><i class="fas fa-code-branch"></i>Forks</th>
+                                <th><i class="far fa-calendar-alt"></i> Repo fetched</th>
+                                <th><i class="fas fa-chart-bar"></i>Stats</th>
                             </tr>
                             </thead>
                             <tbody>

assets/views.py

@@ -6,6 +6,8 @@
 from django.core.paginator import Paginator, PageNotAnInteger, EmptyPage
 from django.db.models import Count
 
+import reversion
+
 from .models import Category, Entry, VersionHistory
 from .forms import EntryForm, VersionForm, EntryImageFormSet, VersionFormEdit, EntrySettingsForm
 from .filters import EntryFilter
@@ -66,12 +68,17 @@ def add_entry(request):  # TODO:REFACTOR to display formset
     form = EntryForm(request.POST or None)
     form2 = EntrySettingsForm(request.POST or None)
     if form.is_valid() and form2.is_valid():
-        settings = form2.save()
-        entry = form.save(commit=False)
-        entry.user = request.user
-        entry.settings = settings
-        entry.save()
-        form.save_m2m()
+        with reversion.create_revision():
+            settings = form2.save()
+            entry = form.save(commit=False)
+            entry.user = request.user
+            entry.settings = settings
+            entry.save()
+            form.save_m2m()
+
+            reversion.set_user(request.user)
+            reversion.set_comment("Initial revision")
+
         if form2.cleaned_data['entry_type'] == 1:
             messages.success(request, 'Successfully created new asset. Now add version.')
             return redirect('assets:add_version', id=entry.id)
@@ -113,7 +120,12 @@ def edit(request, id):  # TODO: REFACTOR!
         form2 = EntrySettingsForm(request.POST or None, instance=asset.settings)
         formset = EntryImageFormSet(request.POST or None, request.FILES or None, instance=asset)
         if form.is_valid() and form2.is_valid() and formset.is_valid():
-            form.save()
+            with reversion.create_revision():
+                form.save()
+
+                reversion.set_user(request.user)
+                reversion.set_comment("Edited by user")
+
             formset.save()
             form2.save()
             messages.success(request, 'Asset saved')

godot_site/settings.py

@@ -50,6 +50,7 @@
     'mptt',
     'easy_thumbnails',
     'image_cropping',
+    'reversion',
 
     'allauth',
     'allauth.account',

requirements.txt

@@ -12,6 +12,7 @@ django-image-cropping==1.1.0
 django-js-asset==1.0.0
 django-mptt==0.9.0
 django-registration-redux==2.2
+django-reversion==2.0.13
 djangorestframework==3.7.7
 easy-thumbnails==2.5
 Markdown==2.6.5

templates/base.html

@@ -93,14 +93,8 @@
     <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.6/js/bootstrap.min.js"
             integrity="sha384-0mSbJDEHialfmuBBQP6A4Qrprq5OVfW37PRR3j5ELqxss1yVqOtnepnHVP9aJ7xS"
             crossorigin="anonymous"></script>
-    <script defer src="https://use.fontawesome.com/releases/v5.0.9/js/solid.js"
-            integrity="sha384-P4tSluxIpPk9wNy8WSD8wJDvA8YZIkC6AQ+BfAFLXcUZIPQGu4Ifv4Kqq+i2XzrM"
-            crossorigin="anonymous"></script>
-    <script defer src="https://use.fontawesome.com/releases/v5.0.9/js/fontawesome.js"
-            integrity="sha384-2IUdwouOFWauLdwTuAyHeMMRFfeyy4vqYNjodih+28v2ReC+8j+sLF9cK339k5hY"
-            crossorigin="anonymous"></script>
-    <script defer src="https://use.fontawesome.com/releases/v5.0.9/js/brands.js"
-            integrity="sha384-qJKAzpOXfvmSjzbmsEtlYziSrpVjh5ROPNqb8UZ60myWy7rjTObnarseSKotmJIx"
+    <script defer src="https://use.fontawesome.com/releases/v5.0.9/js/all.js"
+            integrity="sha384-8iPTk2s/jMVj81dnzb/iFR2sdA7u06vHJyyLlAd4snFpCl/SnyUjRrbdJsw1pGIl"
             crossorigin="anonymous"></script>
     <script src="/static/godot-ajax.js"></script>
 {% endblock scripts %}

templates/messages.html

@@ -1,3 +1,3 @@
 {% for message in messages %}
-    <div class="alert alert-success col-lg-6 col-lg-offset-3" role="alert">{{ message }}</div>
+    <div class="alert alert-success" role="alert">{{ message }}</div>
 {% endfor %}