From 6d4bb1a1878d6ed6032be0d4e5fb13a08d595069 Mon Sep 17 00:00:00 2001
From: DEKHTIARJonathan <contact@jonathandekhtiar.eu>
Date: Wed, 23 Aug 2017 14:58:32 +0200
Subject: [PATCH 1/2] Travis Configuration File modified with no email
 notification and improvements on slack notifications

---
 .gitignore  | 1 +
 .travis.yml | 5 +++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index ad04549..5f10cd3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -118,3 +118,4 @@ scripts/django_q.sql
 /celery*
 Procfile
 venv_linux/
+.idea/
diff --git a/.travis.yml b/.travis.yml
index 92309d7..07b160b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -39,9 +39,10 @@ after_success:
 - codecov --token=8b655609-dc18-4e1b-ade7-9484c83357df
 
 notifications:
+  matrix:
+  - email: false
   slack:
-    rooms:
-      secure: lyTZ6DK0gCPEi4/GUm16SLGvi55QIj84UMPY4+O0Dlu8mxNEabAUeYCVi31Qit13Hlicn+2rt2Nq+OHO5ZJ7jin4geEYen+PgOmHiLtfEs0JLRrjeiJ5MFrn4maBslMCjBNWqSh4ICAXYt/O/w0O/QrtMiogVgbK6Bn6kGCgRBq6qBWSjCbzr92lW5aK8ox3frXnditZzYl9KtffjJHgc9AyaIm441Ysb6V4EkAMQ5Yo+1bgzsSKZ+9lUMeYlhK7oCcqWJNI3iwxHgflhcCEw0C4TcLy7NW71lICvhH3uOExAKIi23OKp+RFh3TN8X0NUqlMpPD0+YSGQw6IiAAtkYEDN+c5mGDB+Erg9hMNVkrIdixOxtgQwDyBkq/RmUmg3s/lWN2fR2TgUwiOZRleGEioiznXCRPoAB9RBl8boMyR8q187zB9FjO4SI3NY+opvuo4Mxxdrc1Q4ARqcSUoC2K280N11L7bZLqO/20EEiRF17HQk7wQBGNrcgjFamhZ8QHdYNTpH2CY1iRgNxPFQCMXsSm2Ap5sAyEu1IA55a750lbA7d9AooDKbtxRp2Q8RCjKitAmSTbDY2oKUebPH97U3HjOsqHxx2/XRB4g9J8diiehbzzs/a44DrnXZwRXsrSAcq72RrLbQ4jQoUtcKO0lfozcddWUXrpvde/J1NU=
+    secure: CX3x9d562S90xbISGDBGmdrCeu6Bvv/kezMGDa6U2nOAgu6esDVXFwT4GRIPze4tW8zbH7yuDeRPKTIU+p/GpOu4woS+u/c/n9OYVKwRjfqZE2LhHGmu8QkpXzpeZBSZeRWVFmYkIzsgRNcHkVbyMVJoByKGfAVD3x0ENvm3Sr3Ij2WyvRky6ZrgmTXuhil+Fqph9uamq3C1+G8DyTL9OFnz4hZZSktO29SmL9F3G/hvTMlZ9ezan2LngVPaYllfxWhMxuWkjkt7sdnc1iwlq0yxLxoQmokQao+FGMFlUNRT0ASIG0NhBKU/GJl0XR1l2n4zfy4SiBZaU1aDnQvIiFJABW6GUqdbYi4Fzi/nZS7mZTbMZcBTlHFoG7Ebu6StLINTp5bLk+90sa/RAWG4CXwoDZLSpD6hPeun482Zud3wHKyOAB3rwFP2qR2qwGM+ZMh3+49Ca7ngdloNs3DFhY9ISKLqGgUUD2zcS97U8H8qSAbAqlvzqU1oWhv7AIh2sjU7159XfH3yaXyV9mqtyBCtn9/NrYWt9OtSmb1EsMsP/1OjWGgzDGqaeVsjEINnbm/0ERSHFzRfyKqc+fejQpkVvWj0bA/Z1RB9FBfgZQSzkkLHfxwm/tVF6PVg36NxwD/HGIlRzJFlThB8XcK+j4t2J8kwbkskYyZoM6hOGOQ=
 
 env:
   global:

From 9f6596b3defb1492194ca2b0928a88fca8b61423 Mon Sep 17 00:00:00 2001
From: DEKHTIARJonathan <contact@jonathandekhtiar.eu>
Date: Wed, 23 Aug 2017 15:20:13 +0200
Subject: [PATCH 2/2] Multiple Fix in django administration to fix 500 errors

---
 feedcrunch/admin.py | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/feedcrunch/admin.py b/feedcrunch/admin.py
index 4b7e5a2..1f9f990 100644
--- a/feedcrunch/admin.py
+++ b/feedcrunch/admin.py
@@ -38,7 +38,7 @@ def has_delete_permission(self, request, obj=None):
         return False
     """
 
-    search_fields = ('username', 'country', 'email')
+    search_fields = ('username', 'country__name', 'email')
     list_filter = ('country',)
 
 admin.site.register(FeedUser, FeedUserAdmin)
@@ -76,7 +76,7 @@ def _get_tags_count(self, obj):
         return obj.get_tags_count()
     _get_tags_count.short_description="Tag Count"
 
-    search_fields = ('user', 'title', 'get_domain')
+    search_fields = ('user__username', 'title', 'link')
     list_filter = ('user',)
 
 admin.site.register(Post, PostAdmin)
@@ -140,7 +140,7 @@ class RSSArticlesAdmin(admin.ModelAdmin):
     list_display = ('id', 'rssfeed', 'title', 'get_domain', 'link', 'added_date')
     ordering = ('-id',)
 
-    search_fields = ('title', 'get_domain')
+    search_fields = ('title', 'link')
 
 admin.site.register(RSSArticle, RSSArticlesAdmin)
 
@@ -173,16 +173,17 @@ class RSSSubscriberAdmin(admin.ModelAdmin):
     list_display = ('user', 'ipaddress', 'feedtype', 'date', 'visit_hour')
     ordering = ('-date', '-visit_hour')
 
-    search_fields = ('user',)
+    search_fields = ('user__username',)
 
 admin.site.register(RSSSubscriber, RSSSubscriberAdmin)
 
 # ==================== RSS Subscriber ============================
+
 class RSSSubsStatAdmin(admin.ModelAdmin):
     list_display = ('user', 'date', 'count')
     ordering = ('-date',)
 
-    search_fields = ('user',)
+    search_fields = ('user__username',)
 
 admin.site.register(RSSSubsStat, RSSSubsStatAdmin)
 
@@ -191,6 +192,6 @@ class SlackIntegrationAdmin(admin.ModelAdmin):
     list_display = ('id', 'user', 'team_name', 'channels', 'access_token')
     ordering = ('user','team_name')
 
-    search_fields = ('user','team_name')
+    search_fields = ('user__username','team_name')
 
 admin.site.register(SlackIntegration, SlackIntegrationAdmin)