Skip to content

Commit

Permalink
Merge pull request #298 from SinghaniaV/main
Browse files Browse the repository at this point in the history
Fixed trailing whitespaces
  • Loading branch information
robotichead committed Oct 17, 2021
2 parents 441e6d6 + 295e7f3 commit b6f4ff0
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 13 deletions.
4 changes: 2 additions & 2 deletions NearBeach/models.py
Expand Up @@ -153,7 +153,7 @@ class Meta:
Contact History is a simple form that user will fill out every time they
have some form of contact with the customer. This table will store both
contact history for customer and Organisations. The customer field in
this instance is not required, and implies that the contact history is
this instance is not required, and implies that the contact history is
applied to the organisation. The organisation field will fill out automatically
when a user applies it to a customer. :)
"""
Expand Down Expand Up @@ -2024,7 +2024,7 @@ class permission_set(models.Model):
ADDITIVE permission
~~~~~~~~~~~~~~~~~~~~
Designed to add on extra abilities to those user who have "READ ONLY" for certain modules.
If a user has the ability to "EDIT" for any of these modules, then this section does not
If a user has the ability to "EDIT" for any of these modules, then this section does not
need to be populated with data.
"""
document = models.IntegerField(
Expand Down
2 changes: 1 addition & 1 deletion NearBeach/views/authentication_views.py
Expand Up @@ -113,7 +113,7 @@ def check_recaptcha(post_data):
The URL could contain a file. Which we do not want executed by mistake. So we just make sure that the URL starts
with a http instead of ftp or file.
We place the at the end of the json_data because we have checked the field. This should be just a json
We place the at the end of the json_data because we have checked the field. This should be just a json
response. If it is not at this point then it will produce a server issue.
"""
if url.lower().startswith('http'):
Expand Down
6 changes: 3 additions & 3 deletions NearBeach/views/document_views.py
Expand Up @@ -248,7 +248,7 @@ def document_upload(request, destination, location_id):
if hasattr(settings, 'AWS_ACCESS_KEY_ID'):
# Use boto to upload the file
s3 = boto3.client(
's3',
's3',
aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY
)
Expand Down Expand Up @@ -373,7 +373,7 @@ def private_download_file(request, document_key):
if hasattr(settings, 'AWS_ACCESS_KEY_ID'):
# Use boto3 to download
s3 = boto3.client(
's3',
's3',
aws_access_key_id=settings.AWS_ACCESS_KEY_ID,
aws_secret_access_key=settings.AWS_SECRET_ACCESS_KEY
)
Expand All @@ -386,7 +386,7 @@ def private_download_file(request, document_key):
print(response['Body'])

return FileResponse(
response['Body'],
response['Body'],
as_attachment=True,
filename=document_results.document_description,
)
Expand Down
2 changes: 1 addition & 1 deletion NearBeach/views/kanban_views.py
Expand Up @@ -220,7 +220,7 @@ def kanban_information(request, kanban_board_id, *args, **kwargs):

# Get context
c = get_context(kanban_board_id)
c['user_level'] = user_level
c['user_level'] = user_level
c['kanban_card_results'] = serializers.serialize('json', kanban_card_results)

# Get the template
Expand Down
6 changes: 3 additions & 3 deletions NearBeach/views/object_data_views.py
Expand Up @@ -441,7 +441,7 @@ def bug_list(request, destination, location_id):

"""
As explained on stack overflow here - https://stackoverflow.com/questions/7650448/django-serialize-queryset-values-into-json#31994176
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
json.dumps() and transforming your ValuesQuerySet to a list by using list().[sic]
"""

Expand Down Expand Up @@ -809,7 +809,7 @@ def object_link_list(request, destination, location_id):

"""
As explained on stack overflow here - https://stackoverflow.com/questions/7650448/django-serialize-queryset-values-into-json#31994176
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
json.dumps() and transforming your ValuesQuerySet to a list by using list().[sic]
"""

Expand Down Expand Up @@ -866,7 +866,7 @@ def query_bug_client(request, destination, location_id):
The URL could contain a file. Which we do not want executed by mistake. So we just make sure that the URL starts
with a http instead of ftp or file.
We place the at the end of the json_data because we have checked the field. This should be just a json
We place the at the end of the json_data because we have checked the field. This should be just a json
response. If it is not at this point then it will produce a server issue.
"""
if url.lower().startswith('http'):
Expand Down
2 changes: 1 addition & 1 deletion NearBeach/views/requirement_item_views.py
Expand Up @@ -94,7 +94,7 @@ def get_requirement_item_links_list(request, requirement_item_id, *args, **kwarg

"""
As explained on stack overflow here - https://stackoverflow.com/questions/7650448/django-serialize-queryset-values-into-json#31994176
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
json.dumps() and transforming your ValuesQuerySet to a list by using list().[sic]
"""

Expand Down
4 changes: 2 additions & 2 deletions NearBeach/views/requirement_views.py
Expand Up @@ -94,7 +94,7 @@ def get_requirement_item_links(request, requirement_id, *args, **kwargs):

"""
As explained on stack overflow here - https://stackoverflow.com/questions/7650448/django-serialize-queryset-values-into-json#31994176
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
json.dumps() and transforming your ValuesQuerySet to a list by using list().[sic]
"""

Expand Down Expand Up @@ -176,7 +176,7 @@ def get_requirement_links_list(request, requirement_id, *args, **kwargs):

"""
As explained on stack overflow here - https://stackoverflow.com/questions/7650448/django-serialize-queryset-values-into-json#31994176
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
We need to Django's serializers can't handle a ValuesQuerySet. However, you can serialize by using a standard
json.dumps() and transforming your ValuesQuerySet to a list by using list().[sic]
"""

Expand Down

0 comments on commit b6f4ff0

Please sign in to comment.