Merge lp:~dholbach/developer-ubuntu-com/store-admin into lp:developer-ubuntu-com

[Daniel Holbach]

[lp:~dholbach/developer-ubuntu-com/store-admin]

208. By Daniel Holbach on 2016-03-29

sort alphabetically

=== modified file 'store_data/admin.py'
--- store_data/admin.py	2015-06-29 09:17:29 +0000
+++ store_data/admin.py	2016-03-29 08:41:51 +0000
@@ -1,22 +1,27 @@
-from .models import Release, Architecture, GadgetSnap
+from .models import (
+    Architecture,
+    GadgetSnap,
+    Release,
+    ScreenshotURL,
+)
 from django.contrib import admin
 
-# Register your models here.
-
-
-class ReleaseAdmin(admin.ModelAdmin):
-    list_display = ('name',)
-    search_fields = ('name',)
-admin.site.register(Release, ReleaseAdmin)
-
-
+
[e-mail](Architecture)
 class ArchitectureAdmin(admin.ModelAdmin):
-    list_display = ('name',)
-    search_fields = ('name',)
-admin.site.register(Architecture, ArchitectureAdmin)
-
-
+    pass
+
+
[e-mail](GadgetSnap)
 class GadgetSnapAdmin(admin.ModelAdmin):
-    list_display = ('name',)
-    search_fields = ('name', 'alias', 'publisher')
-admin.site.register(GadgetSnap, GadgetSnapAdmin)
+    pass
+
+
[e-mail](Release)
+class ReleaseAdmin(admin.ModelAdmin):
+    pass
+
+
[e-mail](ScreenshotURL)
+class ScreenshotURLAdmin(admin.ModelAdmin):
+    pass

=== modified file 'store_data/cms_plugins.py'
--- store_data/cms_plugins.py	2015-11-10 11:46:15 +0000
+++ store_data/cms_plugins.py	2016-03-29 08:41:51 +0000
@@ -6,7 +6,7 @@
 
 
 class GadgetSnapListPluginLarge(CMSPluginBase):
-    # Keeping the name short to be able to differentiate them 
+    # Keeping the name short to be able to differentiate them
     # in the editor dropdown
     name = _("Snap list - Gadget")
     render_template = "gadget_snap_list.html"
@@ -20,8 +20,9 @@
 
 plugin_pool.register_plugin(GadgetSnapListPluginLarge)
 
+
 class GadgetSnapListPluginSmall(CMSPluginBase):
-    # Keeping the name short to be able to differentiate them 
+    # Keeping the name short to be able to differentiate them
     # in the editor dropdown
     name = _("Snap shortlist - Gadget")
     render_template = "gadget_snap_shortlist.html"

=== added file 'store_data/migrations/0002_make_screenshot_optional.py'
--- store_data/migrations/0002_make_screenshot_optional.py	1970-01-01 00:00:00 +0000
+++ store_data/migrations/0002_make_screenshot_optional.py	2016-03-29 08:41:51 +0000
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('store_data', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='gadgetsnap',
+            name='screenshot_url',
+            field=models.ManyToManyField(to='store_data.ScreenshotURL', blank=True),
+        ),
+    ]

=== modified file 'store_data/models.py'
--- store_data/models.py	2015-11-10 14:52:15 +0000
+++ store_data/models.py	2016-03-29 08:41:51 +0000
@@ -4,14 +4,23 @@
 class Release(models.Model):
     name = models.CharField(max_length=25)
 
+    def __str__(self):
+        return self.name
+
 
 class Architecture(models.Model):
     name = models.CharField(max_length=10)
 
+    def __str__(self):
+        return self.name
+
 
 class ScreenshotURL(models.Model):
     url = models.URLField(blank=True)
 
+    def __str__(self):
+        return self.url
+
 
 class GadgetSnap(models.Model):
     icon_url = models.URLField(blank=True)
@@ -27,5 +36,8 @@
     architecture = models.ManyToManyField(Architecture)
     last_updated = models.DateTimeField()
     description = models.TextField(max_length=5000)
-    screenshot_url = models.ManyToManyField(ScreenshotURL)
+    screenshot_url = models.ManyToManyField(ScreenshotURL, blank=True)
     website = models.URLField(blank=True)
+
+    def __str__(self):
+        return self.name

=== removed file 'store_data/tests.py'
--- store_data/tests.py	2015-06-23 09:23:50 +0000
+++ store_data/tests.py	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.

=== modified file 'store_data/urls.py'
--- store_data/urls.py	2015-06-23 09:23:50 +0000
+++ store_data/urls.py	2016-03-29 08:41:51 +0000
@@ -1,5 +1,5 @@
+from django.contrib import admin
 from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+
 urlpatterns = staticfiles_urlpatterns()
-
-from django.contrib import admin
 admin.autodiscover()

=== removed file 'store_data/views.py'
--- store_data/views.py	2015-06-23 09:23:50 +0000
+++ store_data/views.py	1970-01-01 00:00:00 +0000
@@ -1,3 +0,0 @@
-from django.shortcuts import render
-
-# Create your views here.