Merge pull request #142 from sinag/development

move search function images to master
sinag · Dec 16, 2019 · 1c27966 · 1c27966
2 parents 1b2b122 + a690b51
commit 1c27966
Show file tree

Hide file tree

Showing 18 changed files with 26 additions and 72 deletions.
diff --git a/code/.elasticbeanstalk/config.yml b/code/.elasticbeanstalk/config.yml
@@ -1,6 +1,6 @@
 branch-defaults:
   default:
-    environment: pcp-env
+    environment: django-pcp
     group_suffix: null
 environment-defaults:
   Pcp-env:

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/__pycache__/views.cpython-37.pyc b/code/community/__pycache__/views.cpython-37.pyc
diff --git a/code/community/templates/community/update.html b/code/community/templates/community/update.html
@@ -22,13 +22,6 @@ <h4 class="mb-0">Update Community - {{ community.name }}</h4>
                                required>{{ community.description }}</textarea>
                         <div class="invalid-feedback">Oops, you missed description.</div>
                     </div>
-                    <div class="form-group">
-                        <label for="id_post_count">Post Count</label>
-                        <input type="number" class="form-control form-control-lg rounded" name="post_count"
-                               id="id_post_count"
-                               required value="{{ community.post_count }}">
-                        <div class="invalid-feedback">Oops, you missed post count.</div>
-                    </div>
                     {% if form.errors %}
                         {% for field in form %}
                             {% for error in field.errors %}

diff --git a/code/community/templatetags/__pycache__/community_tags.cpython-37.pyc b/code/community/templatetags/__pycache__/community_tags.cpython-37.pyc
diff --git a/code/datatype/templates/datatype/index.html b/code/datatype/templates/datatype/index.html
@@ -22,7 +22,7 @@ <h5 class="card-title">{{ datatype.name }}</h5>
                                         class="fas fa-search"></span> Search</a>
                             <a href="{% url 'property:index' datatype.id %}"
                                    class="btn btn-primary"><span
-                                        class="fas fa-list"></span> View Properties</a>
+                                        class="fas fa-list"></span> View Fields</a>
                                 {% if user.is_authenticated %}
                                     {% if datatype.author == request.user %}
                                         {% if datatype.generic == False %}

diff --git a/code/property/templates/property/delete.html b/code/property/templates/property/delete.html
@@ -10,7 +10,7 @@ <h4 class="mb-0">Remove property - {{ property.name }}</h4>
             <div class="card-body">
                 <form class="form" role="form" autocomplete="off" id="delete_confirm_form" method="post">
                     {% csrf_token %}
-                    <p class="card-text">Are you sure you want to remove property "{{ property.name }}" from post type
+                    <p class="card-text">Are you sure you want to remove field "{{ property.name }}" from post type
                         "{{ view.kwargs.datatype_id|datatype_name }}"?</p>
                     {% if form.errors %}
                         {% for field in form %}

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
@@ -24,7 +24,7 @@
 # SECURITY WARNING: don't run with debug turned on in production!
 DEBUG = True
 
-ALLOWED_HOSTS = ['pcp-env.mvkkwvkkha.us-east-1.elasticbeanstalk.com', '127.0.0.1', 'localhost']
+ALLOWED_HOSTS = ['django-pcp.stwa93mwsa.us-east-1.elasticbeanstalk.com', '127.0.0.1', 'localhost']
 
 # Application definition
 
@@ -160,8 +160,8 @@
 }
 
 STATIC_URL = '/static/'
-LOGIN_REDIRECT_URL = 'communities'
-LOGOUT_REDIRECT_URL = 'communities'
+LOGIN_REDIRECT_URL = '/'
+LOGOUT_REDIRECT_URL = '/'
 EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
 EMAIL_FILE_PATH = os.path.join(BASE_DIR, "sent_emails")
 AUTH_USER_MODEL = 'users.CustomUser'

diff --git a/code/sent_emails/20191105-122034-84796496.log b/code/sent_emails/20191105-122034-84796496.log
diff --git a/code/subscription/__pycache__/models.cpython-37.pyc b/code/subscription/__pycache__/models.cpython-37.pyc
diff --git a/code/subscription/__pycache__/views.cpython-37.pyc b/code/subscription/__pycache__/views.cpython-37.pyc
diff --git a/documents/usermanualimages/search1.png b/documents/usermanualimages/search1.png
diff --git a/documents/usermanualimages/search2.png b/documents/usermanualimages/search2.png
diff --git a/documents/usermanualimages/search3.png b/documents/usermanualimages/search3.png
diff --git a/documents/usermanualimages/search4.png b/documents/usermanualimages/search4.png
diff --git a/documents/usermanualimages/search5.png b/documents/usermanualimages/search5.png