Merge pull request #143 from sinag/development

mvoe new community link fix to master
sinag · Dec 16, 2019 · 95c8cb4 · 95c8cb4
2 parents 1c27966 + c543a44
commit 95c8cb4
Show file tree

Hide file tree

Showing 6 changed files with 50 additions and 37 deletions.
diff --git a/code/.idea/workspace.xml b/code/.idea/workspace.xml
diff --git a/code/community/__pycache__/models.cpython-37.pyc b/code/community/__pycache__/models.cpython-37.pyc
diff --git a/code/community/models.py b/code/community/models.py
@@ -1,14 +1,15 @@
 from django.contrib.auth.models import User
 from django.db import models
 from root import settings
+from django.contrib.auth import get_user_model
 
 """
 Community object model
 """
 
 
 class Community(models.Model):
-    author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT, default=settings.DEFAULT_ADMIN,
+    author = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.PROTECT, default=get_user_model().objects.get(username="admin"),
                                blank=False, null=False, db_index=True)
     name = models.CharField(max_length=100, blank=False, null=False)
     created_on = models.DateTimeField(auto_now_add=True, blank=False, null=False)

diff --git a/code/community/templates/community/index.html b/code/community/templates/community/index.html
@@ -56,14 +56,25 @@ <h5 class="card-title">{{ community.name }}</h5>
                         <div class="card-header text-white bg-secondary">
                             Oops, no community found!
                         </div>
-                        <div class="card-body">
-                            <h5 class="card-title">There is nothing here</h5>
-                            <p class="card-text">Click plus icon below to create a new community</p>
-                            <a href="#" class="btn btn-primary"><span class="fas fa-plus"></span> New Community</a>
-                        </div>
-                        <div class="card-footer text-muted">
-                            Just now
-                        </div>
+                        {% if user.is_authenticated %}
+                            <div class="card-body">
+                                <h5 class="card-title">There is nothing here</h5>
+                                <p class="card-text">Click plus icon below to create a new community</p>
+                                <a href="{% url 'community:create' %}" class="btn btn-primary"><span
+                                        class="fas fa-plus"></span> New Community</a>
+                            </div>
+                            <div class="card-footer text-muted">
+                                Just now
+                            </div>
+                        {% else %}
+                            <div class="card-body">
+                                <h5 class="card-title">There is nothing here</h5>
+                                <p class="card-text">Please login and create a new community</p>
+                            </div>
+                            <div class="card-footer text-muted">
+                                Just now
+                            </div>
+                        {% endif %}
                     </div>
                 </div>
             {% endif %}

diff --git a/code/root/__pycache__/settings.cpython-37.pyc b/code/root/__pycache__/settings.cpython-37.pyc
diff --git a/code/root/settings.py b/code/root/settings.py
@@ -140,24 +140,24 @@
 STATIC_URL = '/static/'
 # STATIC_ROOT = os.path.join(BASE_DIR, 'static2')
 
-LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'handlers': {
-        'file': {
-            'level': 'ERROR',
-            'class': 'logging.FileHandler',
-            'filename': 'django.log',
-        },
-    },
-    'loggers': {
-        'django': {
-            'handlers': ['file'],
-            'level': 'ERROR',
-            'propagate': True,
-        },
-    },
-}
+# LOGGING = {
+#     'version': 1,
+#     'disable_existing_loggers': False,
+#     'handlers': {
+#         'file': {
+#             'level': 'ERROR',
+#             'class': 'logging.FileHandler',
+#             'filename': 'django.log',
+#         },
+#     },
+#     'loggers': {
+#         'django': {
+#             'handlers': ['file'],
+#             'level': 'ERROR',
+#             'propagate': True,
+#         },
+#     },
+# }
 
 STATIC_URL = '/static/'
 LOGIN_REDIRECT_URL = '/'