fixes jinja template conditional; removes redundant css

GSA · Dec 3, 2024 · 28486d8 · 28486d8
1 parent c1a5cf9
commit 28486d8
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -9,7 +9,7 @@ clean: ## Clean workspace and containers
 	CKAN_VERSION=$(CKAN_VERSION) docker compose  -f $(COMPOSE_FILE) down -v --remove-orphans
 
 lint: ## Lint the code (python 3 only)
-	docker compose  -f $(COMPOSE_FILE) run --rm ckan flake8 ckanext --count --show-source --statistics --exclude ckan
+	CKAN_VERSION=$(CKAN_VERSION) docker compose -f $(COMPOSE_FILE) run --rm ckan flake8 ckanext --count --show-source --statistics --exclude ckan
 
 test: ## Run extension tests
 	CKAN_VERSION=$(CKAN_VERSION) docker compose  -f $(COMPOSE_FILE) run --rm ckan ./test.sh

diff --git a/ckanext/datagovtheme/fanstatic_library/styles/datagovtheme.css b/ckanext/datagovtheme/fanstatic_library/styles/datagovtheme.css
@@ -2850,18 +2850,13 @@ body .usa-menu-btn {
         border-radius: 0;
         width: 100%;
     }
-    .control-custom input {
-        border-radius: 0;
-        width: 100%;
-    }
 }
 
 /* CKAN DEBUG PANEL SCROLL FIX */
 #flDebug .flDebugPanelContent {
     overflow: scroll;
 }
 
-
 .search-helper {
     font-style: italic;
 }
diff --git a/ckanext/datagovtheme/public/css/datagovtheme.css b/ckanext/datagovtheme/public/css/datagovtheme.css
@@ -2248,10 +2248,6 @@ margin-top: 0px;
         border-radius: 0;
         width: 100%;
     }
-    .control-custom input {
-        border-radius: 0;
-        width: 100%;
-    }
 }
 
 .faded.disclaimer {

diff --git a/ckanext/datagovtheme/templates/header.html b/ckanext/datagovtheme/templates/header.html
@@ -78,7 +78,7 @@
                         <button class="usa-nav__close">
                             <img src="/images/close.svg" alt="Close" />
                         </button>
-                        {% if request.endpoint.startswith('report.') %}
+                        {% if request and request.endpoint and request.endpoint.startswith('report.') %}
                             {% set current_is_report = 'usa-current' %}
                             {% set current_is_dataset = '' %}
                         {% else %}

diff --git a/ckanext/datagovtheme/templates/snippets/organization.html b/ckanext/datagovtheme/templates/snippets/organization.html
@@ -1,4 +1,5 @@
 {% ckan_extends %}
+{{organization}}
 
 {% set exists = [] %}
 {% for extra in organization.extras if extra.key == 'organization_type' %}

diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 
 setup(
     name="ckanext-datagovtheme",
-    version="0.2.35",
+    version="0.2.36",
     description="CKAN Extension to manage data.gov theme",
     long_description=long_description,
     classifiers=[