From f1a62a4843eeed761bf673f7a74f676f4db14c6b Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 20 2017 08:38:58 +0000
Subject: [PATCH 1/4] Fix displaying issues when the custom field list has no options


Basically this has happened a few times when importing a project into
pagure, the custom field of type list is created, given a value but no
data field (ie: no list of options).
This breaks the entire page since we fails at offering the different
options for that field.

With this fix, we do not fix the root cause but we do fix the symptoms.

---

diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html
index 3836e49..52b4516 100644
--- a/pagure/templates/issue.html
+++ b/pagure/templates/issue.html
@@ -385,7 +385,7 @@
               {% if field.key_type == 'list' %}
                 <select class="form-control" name="{{ field.name }}" id="{{ field.name }}>
                   <option value="None">None</option>
-                  {% for item in field.data %}
+                  {% for item in field.data or [] %}
                     <option value="{{item}}" {% if field.name in knowns_keys and item == knowns_keys[field.name].value %} selected {% endif %}>
                       {{ item }}
                     </option>

From 67342629e9412d61fdcfd5a45975d913ebad9850 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 20 2017 08:49:48 +0000
Subject: [PATCH 2/4] Fix indentation of the docstring


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 6e32617..46c7640 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -192,7 +192,7 @@ def search_user(session, username=None, email=None, token=None, pattern=None):
 
 
 def is_valid_ssh_key(key):
-""" Validates the ssh key using ssh-keygen. """
+    """ Validates the ssh key using ssh-keygen. """
     key = key.strip()
     if not key:
         return None
@@ -211,7 +211,7 @@ def is_valid_ssh_key(key):
 
 
 def are_valid_ssh_keys(keys):
-""" Checks if all the ssh keys are valid or not. """
+    """ Checks if all the ssh keys are valid or not. """
     return all([is_valid_ssh_key(key) is not False
                 for key in keys.split('\n')])
 

From 49c96e7469c7a848fa0e3e5c0eb115139853cf42 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 20 2017 08:49:57 +0000
Subject: [PATCH 3/4] Only generate the list of items if there is something to split


---

diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py
index 46c7640..52599bd 100644
--- a/pagure/lib/__init__.py
+++ b/pagure/lib/__init__.py
@@ -3710,7 +3710,11 @@ def set_custom_key_fields(session, project, fields, types, data):
             # Only Lists use data, strip it otherwise
             data[idx] = None
         else:
-            data[idx] = [item.strip() for item in data[idx].split(',')]
+            if data[idx]:
+                data[idx] = [
+                    item.strip()
+                    for item in data[idx].split(',')
+                ]
 
         if key in current_keys:
             issuekey = current_keys[key]

From 032f6eb94ba3830f9c22cf7ce22caca0af17681a Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Feb 20 2017 08:50:16 +0000
Subject: [PATCH 4/4] Add unit-tests ensuring we can render the issue even with invalid content


Basically this test ensure we render the issue page fine even if the
project was created in such a way that we have a custom field of type
list that has no list of items (ie a list without option) but the issue
displayed does have a value for this field.

---

diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py
index 2cc2dd6..06b38f5 100644
--- a/tests/test_pagure_flask_ui_issues.py
+++ b/tests/test_pagure_flask_ui_issues.py
@@ -647,6 +647,62 @@ class PagureFlaskIssuestests(tests.Modeltests):
 
     @patch('pagure.lib.git.update_git')
     @patch('pagure.lib.notify.send_email')
+    def test_view_issue_list_no_data(self, p_send_email, p_ugt):
+        """ Test the view_issue endpoint when the issue has a custom field
+        of type list with no data attached. """
+        p_send_email.return_value = True
+        p_ugt.return_value = True
+
+        tests.create_projects(self.session)
+        tests.create_projects_git(
+            os.path.join(self.path), bare=True)
+
+        repo = pagure.lib.get_project(self.session, 'test')
+
+        # Add custom fields to the project
+        msg = pagure.lib.set_custom_key_fields(
+            session=self.session,
+            project=repo,
+            fields=['test1'],
+            types=['list'],
+            data=[None]
+        )
+        self.session.commit()
+        self.assertEqual(msg, 'List of custom fields updated')
+
+        # Create issues to play with
+        msg = pagure.lib.new_issue(
+            session=self.session,
+            repo=repo,
+            title='Test issue',
+            content='We should work on this',
+            user='pingou',
+            ticketfolder=None
+        )
+        self.session.commit()
+        self.assertEqual(msg.title, 'Test issue')
+
+        # Assign a value to the custom key on that ticket
+        cfield = pagure.lib.get_custom_key(
+            session=self.session,
+            project=repo,
+            keyname='test1')
+        msg = pagure.lib.set_custom_key_value(
+            session=self.session,
+            issue=msg,
+            key=cfield,
+            value='item')
+        self.session.commit()
+        self.assertEqual(msg, 'Custom field test1 adjusted to item')
+
+        user = tests.FakeUser()
+        user.username = 'pingou'
+        with tests.user_set(pagure.APP, user):
+            output = self.app.get('/test/issue/1')
+            self.assertEqual(output.status_code, 200)
+
+    @patch('pagure.lib.git.update_git')
+    @patch('pagure.lib.notify.send_email')
     def test_update_issue(self, p_send_email, p_ugt):
         """ Test the update_issue endpoint. """
         p_send_email.return_value = True