From 82ab6ce460319f86d0a6c34eb8677d1f9f2b1767 Mon Sep 17 00:00:00 2001
From: Johannes Englisch <johannes_englisch@eva.mpg.de>
Date: Fri, 3 Mar 2023 14:15:51 +0100
Subject: [PATCH 1/2] add button for feature combinations

---
 grambank/templates/parameter/detail_html.mako | 21 +++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/grambank/templates/parameter/detail_html.mako b/grambank/templates/parameter/detail_html.mako
index 73eb512..f9cbdcc 100644
--- a/grambank/templates/parameter/detail_html.mako
+++ b/grambank/templates/parameter/detail_html.mako
@@ -1,5 +1,7 @@
 <%inherit file="../${context.get('request').registry.settings.get('clld.app_template', 'app.mako')}"/>
 <%namespace name="util" file="../util.mako"/>
+<% from clld.db.meta import DBSession %>
+<% from grambank import models %>
 
 <%! active_menu_item = "parameters" %>
 <%block name="title">Feature ${ctx.id}: ${ctx.name}</%block>
@@ -59,6 +61,25 @@ ${u.process_markdown(ctx.description, req)|n}
 
 <br style="clear: right"/>
 
+<div class="well well-small">
+    <p>
+        You may combine this variable with a different variable by selecting on in the list below
+        and clicking "Submit".
+    </p>
+    <form action="${request.route_url('select_combination')}"
+          method="get"
+          class="form-inline">
+        <input type="hidden" name="parameters" value="${ctx.id}"/>
+        <select id="pa" name="parameters">
+            <label for="pa">Variable</label>
+            % for param in DBSession.query(models.Parameter).filter(models.Parameter.pk != ctx.pk):
+                <option value="${param.id}">${param.id} ${param.name}</option>
+            % endfor
+        </select>
+        <button class="btn" type="submit">Submit</button>
+    </form>
+</div>
+
 <h3 id="map-container">
     Map
     <a href="#top" title="go to top of the page" style="vertical-align: bottom">&#x21eb;</a>

From e2a45df8f12903d6a27688d5abaf6ec55fb0eb95 Mon Sep 17 00:00:00 2001
From: Johannes Englisch <johannes_englisch@eva.mpg.de>
Date: Mon, 6 Mar 2023 13:01:54 +0100
Subject: [PATCH 2/2] more idiomatic database access

---
 grambank/templates/parameter/detail_html.mako | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/grambank/templates/parameter/detail_html.mako b/grambank/templates/parameter/detail_html.mako
index f9cbdcc..65eee10 100644
--- a/grambank/templates/parameter/detail_html.mako
+++ b/grambank/templates/parameter/detail_html.mako
@@ -1,6 +1,5 @@
 <%inherit file="../${context.get('request').registry.settings.get('clld.app_template', 'app.mako')}"/>
 <%namespace name="util" file="../util.mako"/>
-<% from clld.db.meta import DBSession %>
 <% from grambank import models %>
 
 <%! active_menu_item = "parameters" %>
@@ -72,7 +71,7 @@ ${u.process_markdown(ctx.description, req)|n}
         <input type="hidden" name="parameters" value="${ctx.id}"/>
         <select id="pa" name="parameters">
             <label for="pa">Variable</label>
-            % for param in DBSession.query(models.Parameter).filter(models.Parameter.pk != ctx.pk):
+            % for param in request.db.query(models.Parameter).filter(models.Parameter.pk != ctx.pk):
                 <option value="${param.id}">${param.id} ${param.name}</option>
             % endfor
         </select>