Skip to content

Commit 516d312

Browse files
committed
remove "Please" msg to unify media form error
1 parent f3dd243 commit 516d312

File tree

3 files changed

+7
-28
lines changed

3 files changed

+7
-28
lines changed

app/utils.py

+7-9
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,9 @@ def validate_url(data, query):
171171
:return:
172172
"""
173173
if data and query not in data:
174-
raise forms.ValidationError("Please enter a valid {} url".format(query))
174+
if query:
175+
query += " "
176+
raise forms.ValidationError("Enter a valid {}URL.".format(query))
175177

176178

177179
@keep_lazy_text
@@ -240,7 +242,7 @@ def generateGTicketUrl(qrValue: str):
240242
{
241243
"header": "Disclaimer",
242244
"body": "This is a copy of the official ticket, do not treat this as the official ticket "
243-
"since it is not updated in real time.",
245+
"since it is not updated in real time.",
244246
"id": "TEXT_MODULE_ID",
245247
}
246248
],
@@ -289,9 +291,7 @@ def generateGTicketUrl(qrValue: str):
289291
}
290292

291293
generic.create_object(issuer_id, objSufix, cardObject)
292-
return generic.create_jwt_new_objects(
293-
issuer_id, class_suffix, cardObject
294-
)
294+
return generic.create_jwt_new_objects(issuer_id, class_suffix, cardObject)
295295

296296

297297
#
@@ -311,6 +311,7 @@ def generateGTicketUrl(qrValue: str):
311311
# the License.
312312
#
313313

314+
314315
class GenericPass:
315316
"""Class for creating and managing Generic passes in Google Wallet.
316317
@@ -348,10 +349,7 @@ def auth(self):
348349

349350
# [START createObject]
350351
def create_object(
351-
self,
352-
issuer_id: str,
353-
object_suffix: str,
354-
cardObject: dict
352+
self, issuer_id: str, object_suffix: str, cardObject: dict
355353
) -> str:
356354
"""Create an object.
357355

applications/forms/common_fields.py

-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
from django import forms
22
from django.conf import settings
3-
from django.core.validators import URLValidator
43

54

65
def common_first_timer():
@@ -35,20 +34,8 @@ def common_degree():
3534
)
3635

3736

38-
# class CustomURLValidator(URLValidator):
39-
# message = "Please enter a valid URL"
40-
4137

4238
def social_media_field(field_name, placeholder):
43-
if field_name == "website":
44-
return forms.CharField(
45-
required=False,
46-
widget=forms.TextInput(
47-
attrs={"class": "form-control", "placeholder": placeholder},
48-
validators=[URLValidator(message="Please enter a valid URL")],
49-
),
50-
label=field_name.capitalize(),
51-
)
5239
return forms.CharField(
5340
required=False,
5441
widget=forms.TextInput(

applications/forms/hacker.py

-6
Original file line numberDiff line numberDiff line change
@@ -79,12 +79,6 @@ def clean_projects(self):
7979
)
8080
return data
8181

82-
# def clean_site(self,):
83-
# data = self.cleaned_data["site"]
84-
85-
# if not URLValidator(data):
86-
# raise forms.ValidationError("Please enter a valid website url")
87-
# return data
8882

8983
first_timer = common_first_timer()
9084

0 commit comments

Comments
 (0)