From ea8d8dd002916b4f592e2cae25b17137b773fad5 Mon Sep 17 00:00:00 2001 From: rizwanisready Date: Thu, 29 Feb 2024 14:00:35 +0530 Subject: [PATCH] corrected brand to event_master --- manage_events/urls.py | 8 ++++---- manage_events/views.py | 8 ++++---- requirements.txt | 3 +++ templates/manage_events/event_category_list.html | 2 +- templates/manage_events/event_list.html | 2 +- .../{brand_add.html => event_master_add.html} | 0 .../{brand_list.html => event_master_list.html} | 4 ++-- 7 files changed, 15 insertions(+), 12 deletions(-) rename templates/manage_events/{brand_add.html => event_master_add.html} (100%) rename templates/manage_events/{brand_list.html => event_master_list.html} (98%) diff --git a/manage_events/urls.py b/manage_events/urls.py index 7c6bc6d..b9e699f 100644 --- a/manage_events/urls.py +++ b/manage_events/urls.py @@ -29,22 +29,22 @@ urlpatterns = [ path( "event-master/list/", views.EventMasterView.as_view(), - name="EventMaster_list", + name="event_master_list", ), path( "event-master/add/", views.EventMasterCreateOrUpdateView.as_view(), - name="EventMaster_add", + name="event_master_add", ), path( "event-master/edit//", views.EventMasterCreateOrUpdateView.as_view(), - name="EventMaster_edit", + name="event_master_edit", ), path( "event-master/delete/", views.EventMasterDeleteView.as_view(), - name="EventMaster_delete", + name="event_master_delete", ), # Event path( diff --git a/manage_events/views.py b/manage_events/views.py index d706813..f922f57 100644 --- a/manage_events/views.py +++ b/manage_events/views.py @@ -127,10 +127,10 @@ class EventMasterCreateOrUpdateView(LoginRequiredMixin, generic.View): # Initialize the action as ACTION_CREATE (can change based on logic) action = resource_action.ACTION_CREATE # Default action - template_name = "manage_events/EventMaster_add.html" + template_name = "manage_events/event_master_add.html" model = EventMaster form_class = EventMasterForm - success_url = reverse_lazy("manage_events:EventMaster_list") + success_url = reverse_lazy("manage_events:event_master_list") error_message = "An error occurred while saving the data." # Determine the success message dynamically based on whether it's an update or create @@ -187,8 +187,8 @@ class EventMasterView(LoginRequiredMixin, generic.ListView): resource = resource_action.RESOURCE_MANAGE_EVENTS action = resource_action.ACTION_READ model = EventMaster - template_name = "manage_events/EventMaster_list.html" - context_object_name = "EventMaster_obj" + template_name = "manage_events/event_master_list.html" + context_object_name = "event_master_obj" def get_queryset(self): return super().get_queryset().filter(deleted=False) diff --git a/requirements.txt b/requirements.txt index a17ee49..caaf31c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -24,6 +24,7 @@ django-taggit==5.0.1 django-widget-tweaks==1.5.0 djangorestframework==3.14.0 djangorestframework-simplejwt==5.3.1 +googlemaps==4.10.0 hyperlink==21.0.0 idna==3.6 incremental==22.10.0 @@ -35,9 +36,11 @@ pyasn1==0.5.1 pyasn1-modules==0.3.0 pycparser==2.21 PyJWT==2.8.0 +pyngrok==7.1.2 pyOpenSSL==24.0.0 python3-openid==3.2.0 pytz==2024.1 +PyYAML==6.0.1 requests==2.31.0 requests-oauthlib==1.3.1 service-identity==24.1.0 diff --git a/templates/manage_events/event_category_list.html b/templates/manage_events/event_category_list.html index 0e1e206..9499b70 100644 --- a/templates/manage_events/event_category_list.html +++ b/templates/manage_events/event_category_list.html @@ -23,7 +23,7 @@ --> Add Event Category Events - Brands + Event Master diff --git a/templates/manage_events/event_list.html b/templates/manage_events/event_list.html index 37d5b43..9ce2026 100644 --- a/templates/manage_events/event_list.html +++ b/templates/manage_events/event_list.html @@ -23,7 +23,7 @@ --> Add Event Event Category - Brand + Event Master diff --git a/templates/manage_events/brand_add.html b/templates/manage_events/event_master_add.html similarity index 100% rename from templates/manage_events/brand_add.html rename to templates/manage_events/event_master_add.html diff --git a/templates/manage_events/brand_list.html b/templates/manage_events/event_master_list.html similarity index 98% rename from templates/manage_events/brand_list.html rename to templates/manage_events/event_master_list.html index a0e8f0e..2f591c3 100644 --- a/templates/manage_events/brand_list.html +++ b/templates/manage_events/event_master_list.html @@ -12,7 +12,7 @@
-

Manage Brand

+

Manage Event Master