From 063ec08b930ef78949255760c971b100172489c6 Mon Sep 17 00:00:00 2001
From: Karsten Hopp <karsten@redhat.com>
Date: Nov 12 2018 11:22:00 +0000
Subject: Add a Date type to the custom fields


This adds a date entry to the pulldown menu in custom fields
clicking on it while modifying metadata of issues allows to pick a date.

Fixes: https://pagure.io/pagure/issue/3410

Signed-off-by: Karsten Hopp <karsten@redhat.com>

---

diff --git a/pagure/lib/query.py b/pagure/lib/query.py
index a35bfc8..a84a3ad 100644
--- a/pagure/lib/query.py
+++ b/pagure/lib/query.py
@@ -4763,7 +4763,7 @@ def save_report(session, repo, name, url, username):
 
 def set_custom_key_fields(session, project, fields, types, data, notify=None):
     """ Set or update the custom key fields of a project with the values
-    provided.  "data" is currently only used for lists
+    provided.  "data" is currently only used for lists and dates
     """
 
     current_keys = {}
@@ -4771,12 +4771,14 @@ def set_custom_key_fields(session, project, fields, types, data, notify=None):
         current_keys[key.name] = key
 
     for idx, key in enumerate(fields):
-        if types[idx] != "list":
-            # Only Lists use data, strip it otherwise
-            data[idx] = None
-        else:
+        if types[idx] == "list":
             if data[idx]:
                 data[idx] = [item.strip() for item in data[idx].split(",")]
+        elif types[idx] == "date":
+            if data[idx]:
+                data[idx] = data[idx].strip()
+        else:
+            data[idx] = None
 
         if notify and notify[idx] == "on":
             notify_flag = True
diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 474a75d..688bbd8 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -50,6 +50,7 @@
             {% else %}
               <input
                 {%- if field.key_type == 'boolean' %} type="checkbox" {% endif %}
+                {%- if field.key_type == 'date'%} type="date" {% endif %}
                 class="form-control" name="{{ field.name }}" id="{{ field.name }}"
                 {%- if field.name in knowns_keys %}
                   {% if field.key_type == 'boolean'%}
@@ -544,6 +545,7 @@ namespace=repo.namespace, repo=repo.name, issueid=issueid)
                 {% else %}
                   <input
                     {%- if field.key_type == 'boolean' %} type="checkbox" {% endif %}
+                    {%- if field.key_type == 'date'%} type="date" {% endif %}
                     class="form-control" name="{{ field.name }}" id="{{ field.name }}"
                     {%- if field.name in knowns_keys %}
                       {% if field.key_type == 'boolean'%}
diff --git a/pagure/templates/settings.html b/pagure/templates/settings.html
index 558d1bb..ce0c691 100644
--- a/pagure/templates/settings.html
+++ b/pagure/templates/settings.html
@@ -713,19 +713,19 @@
                                         value="" class="form-control"/>
                                     </div>
                                     <div class="col-sm-2 pr-0">
-                                      <select name="custom_keys_type" class="form-control">
+                                      <select name="custom_keys_type" class="form-control custom-keys">
                                         <option value="text">Text</option>
                                         <option value="boolean">Boolean</option>
                                         <option value="link">Link</option>
                                         <option value="list">List</option>
+                                        <option value="date">Date</option>
                                       </select>
                                     </div>
                                     <div class="col-sm-6 pr-0">
-                                        <input title="Comma separated list items" type="text" name="custom_keys_data"
-                                          value="" class="form-control"/>
+                                      <input title="Comma separated list items" type="text" name="custom_keys_data" value="" class="form-control custom-keys-list hidden" id="custom_keys_list"/>
                                     </div>
                                     <div class="col-sm-1 pr-0">
-                                      <input type="checkbox" name="custom_keys_notify" title="Trigger email notification when updated">
+                                      <input type="checkbox" name="custom_keys_notify" title="Trigger email notification when updated" class="form-control"/>
                                     </div>
                                     <div class="col-sm-1">
                                       <a href="javascript:void(0)" class="btn btn-outline-danger remove-settings-field-row"><i class="fa fa-trash"></i></a>
@@ -738,7 +738,7 @@
                                         value="{{ field.name }}" class="form-control"/>
                                     </div>
                                     <div class="col-sm-2 pr-0">
-                                      <select name="custom_keys_type" class="form-control">
+                                      <select name="custom_keys_type" class="form-control custom-keys">
                                         <option value="text" {%
                                           if field.key_type == 'text' %} selected {%
                                           endif %}>Text</option>
@@ -751,11 +751,19 @@
                                         <option value="list" {%
                                           if field.key_type == 'list' %} selected {%
                                           endif %}>List</option>
+                                        <option value="date" {%
+                                          if field.key_type == 'date' %} selected {%
+                                          endif %}>Date</option>
                                       </select>
                                     </div>
                                     <div class="col-sm-6 pr-0">
-                                        <input title="Comma separated list items" type="text" name="custom_keys_data"
-                                          value={% if field.data is none %}""{% else %}"{{ field.data | join(', ') }}"{% endif %} class="form-control"/>
+                                      {% if field.key_type == 'list' %}
+                                        <input title="Comma separated list items" type="text" name="custom_keys_data" id="custom_keys_list"
+                                          value={% if field.data is none %}""{% else %}"{{ field.data | join(', ') }}"{% endif %} class="form-control custom-keys-list"/>
+                                      {% else %}
+					 <input title="Comma separated list items" type="text" name="custom_keys_data" id="custom_keys_list"
+                                          value="{{ field.data or '' }}" class="form-control custom-keys-list hidden"/>
+                                      {% endif %}
                                     </div>
                                     <div class="col-sm-1 pr-0">
                                       <input type="checkbox" name="custom_keys_notify-{{ loop.index }}" title="Trigger email notification when updated"
@@ -1092,6 +1100,20 @@
 <script type="text/javascript" src="{{ url_for('static', filename='vendor/selectize/selectize.min.js') }}?version={{ g.version}}"></script>
 
 <script type="text/javascript">
+function updateform() {
+  $('.custom-keys').change(function() {
+    field_type = $(this).val();
+    if(field_type == "list") {
+       $(this).parent().parent().find('.custom-keys-list').removeClass("hidden");
+     } else {
+       $(this).parent().parent().find('.custom-keys-list').addClass("hidden");
+    }
+  });
+};
+updateform();
+</script>
+
+<script type="text/javascript">
 function show_acls(acls) {
   var _txt = '<div title="ACLs details" id="show_meeting">'
     + '<ul>';
@@ -1153,6 +1175,7 @@ $('.add-settings-field-row').click(function(e) {
     $(this).parent().parent().remove();
   });
   $(target + ".settings-field-rows").append(row);
+  updateform();
   console.log(row);
 });
 
diff --git a/tests/test_pagure_flask_api_issue.py b/tests/test_pagure_flask_api_issue.py
index a5cca6f..f664c54 100644
--- a/tests/test_pagure_flask_api_issue.py
+++ b/tests/test_pagure_flask_api_issue.py
@@ -3833,10 +3833,10 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
         repo = pagure.lib.query.get_authorized_project(self.session, 'test')
         msg = pagure.lib.query.set_custom_key_fields(
             self.session, repo,
-            ['bugzilla', 'upstream', 'reviewstatus'],
-            ['link', 'boolean', 'list'],
-            ['unused data for non-list type', '', 'ack, nack ,  needs review'],
-            [None, None, None])
+            ['bugzilla', 'upstream', 'reviewstatus', 'duedate'],
+            ['link', 'boolean', 'list', 'date'],
+            ['', '', 'ack, nack ,  needs review', '2018-10-10'],
+            [None, None, None, None])
         self.session.commit()
         self.assertEqual(msg, 'List of custom fields updated')
 
@@ -3851,6 +3851,10 @@ class PagureFlaskApiIssuetests(tests.SimplePagureTest):
                 self.assertEqual(
                     sorted(key.data), ['ack', 'nack', 'needs review'])
 
+            # Check that the duedate date field still has its date
+            if key.name == "duedate":
+                self.assertEqual(key.data, '2018-10-10')
+
         # Check that not setting the value on a non-existing custom field
         # changes nothing
         output = self.app.post(
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index 5c3fac2..b78dc36 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -1472,19 +1472,19 @@ class PagureFlaskRepotests(tests.Modeltests):
                                         value="" class="form-control"/>
                                     </div>
                                     <div class="col-sm-2 pr-0">
-                                      <select name="custom_keys_type" class="form-control">
+                                      <select name="custom_keys_type" class="form-control custom-keys">
                                         <option value="text">Text</option>
                                         <option value="boolean">Boolean</option>
                                         <option value="link">Link</option>
                                         <option value="list">List</option>
+                                        <option value="date">Date</option>
                                       </select>
                                     </div>
                                     <div class="col-sm-6 pr-0">
-                                        <input title="Comma separated list items" type="text" name="custom_keys_data"
-                                          value="" class="form-control"/>
+                                      <input title="Comma separated list items" type="text" name="custom_keys_data" value="" class="form-control custom-keys-list hidden" id="custom_keys_list"/>
                                     </div>
                                     <div class="col-sm-1 pr-0">
-                                      <input type="checkbox" name="custom_keys_notify" title="Trigger email notification when updated">
+                                      <input type="checkbox" name="custom_keys_notify" title="Trigger email notification when updated" class="form-control"/>
                                     </div>''', output_text)
 
     def test_view_forks(self):