From 0d9dae1c01b329021c2d03735fec62fd8ecfbde1 Mon Sep 17 00:00:00 2001
From: Pierre-Yves Chibon <pingou@pingoured.fr>
Date: Aug 23 2018 13:35:42 +0000
Subject: Fix showing the settings page of a project having custom fields


This worked in python2 but not python3 as the way object can be sorted
changed between both versions.
This commit fixes this and add a test which should now pass on both
py2 and py3.

Signed-off-by: Pierre-Yves Chibon <pingou@pingoured.fr>

---

diff --git a/pagure/lib/model.py b/pagure/lib/model.py
index 2332f72..81a62ef 100644
--- a/pagure/lib/model.py
+++ b/pagure/lib/model.py
@@ -1494,6 +1494,10 @@ class IssueKeys(BASE):
         )
     )
 
+    def __lt__(self, other):
+        if hasattr(other, 'name'):
+            return self.name.__lt__(other.name)
+
     @property
     def data(self):
         ''' Return the list of items '''
diff --git a/tests/test_pagure_flask_ui_repo.py b/tests/test_pagure_flask_ui_repo.py
index d1a5b47..5ed28cc 100644
--- a/tests/test_pagure_flask_ui_repo.py
+++ b/tests/test_pagure_flask_ui_repo.py
@@ -1288,6 +1288,31 @@ class PagureFlaskRepotests(tests.Modeltests):
                 '<input id="issue_tracker" type="checkbox" value="y" '
                 'name="issue_tracker" checked=""/>', output_text)
 
+    @patch('pagure.decorators.admin_session_timedout',
+           MagicMock(return_value=False))
+    def test_view_settings_custom_fields(self):
+        """ Test the view_settings endpoint when the project has some custom
+        field for issues. """
+
+        tests.create_projects(self.session)
+        tests.create_projects_git(os.path.join(self.path, 'repos'))
+
+        repo = pagure.lib.get_authorized_project(self.session, 'test')
+        msg = pagure.lib.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])
+        self.session.commit()
+        self.assertEqual(msg, 'List of custom fields updated')
+        self.assertIsNotNone(repo.issue_keys)
+
+        user = tests.FakeUser(username='pingou')
+        with tests.user_set(self.app.application, user):
+            output = self.app.get('/test/settings')
+            self.assertEqual(output.status_code, 200)
+
     @patch('pagure.lib.git.generate_gitolite_acls')
     @patch('pagure.decorators.admin_session_timedout')
     def test_view_settings_pr_only(self, ast, gen_acl):