misc: move station and audio_streams to context_processors (in order to have them available in accounts views)
This commit is contained in:
		
							
								
								
									
										3
									
								
								aircox/context_processors/__init__.py
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								aircox/context_processors/__init__.py
									
									
									
									
									
										Normal file
									
								
							@ -0,0 +1,3 @@
 | 
				
			|||||||
 | 
					def station(request):
 | 
				
			||||||
 | 
					    station = request.station
 | 
				
			||||||
 | 
					    return {"station": station, "audio_streams": station.streams}
 | 
				
			||||||
@ -54,13 +54,11 @@ class TestBaseView:
 | 
				
			|||||||
        context = base_view.get_context_data()
 | 
					        context = base_view.get_context_data()
 | 
				
			||||||
        assert context == {
 | 
					        assert context == {
 | 
				
			||||||
            "view": base_view,
 | 
					            "view": base_view,
 | 
				
			||||||
            "station": station,
 | 
					 | 
				
			||||||
            "page": None,  # get_page() returns None
 | 
					            "page": None,  # get_page() returns None
 | 
				
			||||||
            "has_sidebar": base_view.has_sidebar,
 | 
					            "has_sidebar": base_view.has_sidebar,
 | 
				
			||||||
            "has_filters": False,
 | 
					            "has_filters": False,
 | 
				
			||||||
            "sidebar_object_list": published_pages[: base_view.list_count],
 | 
					            "sidebar_object_list": published_pages[: base_view.list_count],
 | 
				
			||||||
            "sidebar_list_url": base_view.get_sidebar_url(),
 | 
					            "sidebar_list_url": base_view.get_sidebar_url(),
 | 
				
			||||||
            "audio_streams": station.streams,
 | 
					 | 
				
			||||||
            "model": base_view.model,
 | 
					            "model": base_view.model,
 | 
				
			||||||
        }
 | 
					        }
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
				
			|||||||
@ -33,7 +33,6 @@ class BaseView(TemplateResponseMixin, ContextMixin):
 | 
				
			|||||||
        return None
 | 
					        return None
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def get_context_data(self, **kwargs):
 | 
					    def get_context_data(self, **kwargs):
 | 
				
			||||||
        kwargs.setdefault("station", self.station)
 | 
					 | 
				
			||||||
        kwargs.setdefault("page", self.get_page())
 | 
					        kwargs.setdefault("page", self.get_page())
 | 
				
			||||||
        kwargs.setdefault("has_filters", self.has_filters)
 | 
					        kwargs.setdefault("has_filters", self.has_filters)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@ -44,9 +43,6 @@ class BaseView(TemplateResponseMixin, ContextMixin):
 | 
				
			|||||||
                kwargs["sidebar_object_list"] = sidebar_object_list[: self.list_count]
 | 
					                kwargs["sidebar_object_list"] = sidebar_object_list[: self.list_count]
 | 
				
			||||||
                kwargs["sidebar_list_url"] = self.get_sidebar_url()
 | 
					                kwargs["sidebar_list_url"] = self.get_sidebar_url()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        if "audio_streams" not in kwargs:
 | 
					 | 
				
			||||||
            kwargs["audio_streams"] = self.station.streams
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
        if "model" not in kwargs:
 | 
					        if "model" not in kwargs:
 | 
				
			||||||
            model = getattr(self, "model", None) or hasattr(self, "object") and type(self.object)
 | 
					            model = getattr(self, "model", None) or hasattr(self, "object") and type(self.object)
 | 
				
			||||||
            kwargs["model"] = model
 | 
					            kwargs["model"] = model
 | 
				
			||||||
 | 
				
			|||||||
@ -237,6 +237,7 @@ TEMPLATES = [
 | 
				
			|||||||
                "django.template.context_processors.static",
 | 
					                "django.template.context_processors.static",
 | 
				
			||||||
                "django.template.context_processors.tz",
 | 
					                "django.template.context_processors.tz",
 | 
				
			||||||
                "django.contrib.messages.context_processors.messages",
 | 
					                "django.contrib.messages.context_processors.messages",
 | 
				
			||||||
 | 
					                "aircox.context_processors.station",
 | 
				
			||||||
            ),
 | 
					            ),
 | 
				
			||||||
            "loaders": (
 | 
					            "loaders": (
 | 
				
			||||||
                "django.template.loaders.filesystem.Loader",
 | 
					                "django.template.loaders.filesystem.Loader",
 | 
				
			||||||
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user