diff --git a/pagure/forms.py b/pagure/forms.py index 1707da8..8623d76 100644 --- a/pagure/forms.py +++ b/pagure/forms.py @@ -316,11 +316,11 @@ class UpdateIssueForm(PagureForm): wtforms.validators.Length(max=255), ] ) - depends = wtforms.TextField( - 'dependency issue', [wtforms.validators.Optional()] + depending = wtforms.TextField( + 'depending issue', [wtforms.validators.Optional()] ) - blocks = wtforms.TextField( - 'blocked issue', [wtforms.validators.Optional()] + blocking = wtforms.TextField( + 'blocking issue', [wtforms.validators.Optional()] ) comment = wtforms.TextAreaField( 'Comment', [wtforms.validators.Optional()] diff --git a/pagure/lib/__init__.py b/pagure/lib/__init__.py index a4d2b42..53d395d 100644 --- a/pagure/lib/__init__.py +++ b/pagure/lib/__init__.py @@ -2762,8 +2762,8 @@ def update_dependency_issue( if isinstance(depends, basestring): depends = [depends] - toadd = set(depends) - set(issue.depends_text) - torm = set(issue.depends_text) - set(depends) + toadd = set(depends) - set(issue.depending_text) + torm = set(issue.depending_text) - set(depends) messages = [] # Add issue depending @@ -2772,7 +2772,7 @@ def update_dependency_issue( issue_depend = search_issues(session, repo, issueid=depend) if issue_depend is None: continue - if issue_depend.id in issue.depends_text: # pragma: no cover + if issue_depend.id in issue.depending_text: # pragma: no cover # we should never be in this case but better safe than sorry... continue @@ -2792,7 +2792,7 @@ def update_dependency_issue( # We cannot test this as it would mean we managed to put in an # invalid ticket as dependency earlier continue - if issue_depend.id not in issue.depends_text: # pragma: no cover + if issue_depend.id not in issue.depending_text: # pragma: no cover # we should never be in this case but better safe than sorry... continue @@ -2817,17 +2817,17 @@ def update_blocked_issue( if isinstance(blocks, basestring): blocks = [blocks] - toadd = set(blocks) - set(issue.blocks_text) - torm = set(issue.blocks_text) - set(blocks) + toadd = set(blocks) - set(issue.blocking_text) + torm = set(issue.blocking_text) - set(blocks) messages = [] # Add issue blocked for block in sorted([int(i) for i in toadd]): - messages.append("Issue marked as blocked by: #%s" % block) + messages.append("Issue marked as blocking: #%s" % block) issue_block = search_issues(session, repo, issueid=block) if issue_block is None: continue - if issue_block.id in issue.blocks_text: # pragma: no cover + if issue_block.id in issue.blocking_text: # pragma: no cover # we should never be in this case but better safe than sorry... continue @@ -2842,14 +2842,14 @@ def update_blocked_issue( # Remove issue blocked for block in sorted([int(i) for i in torm]): - messages.append("Issue **un**marked as blocked by: #%s" % block) + messages.append("Issue **un**marked as blocking: #%s" % block) issue_block = search_issues(session, repo, issueid=block) if issue_block is None: # pragma: no cover # We cannot test this as it would mean we managed to put in an # invalid ticket as dependency earlier continue - if issue_block.id not in issue.blocks_text: # pragma: no cover + if issue_block.id not in issue.blocking_text: # pragma: no cover # we should never be in this case but better safe than sorry... continue diff --git a/pagure/lib/model.py b/pagure/lib/model.py index 0414aa7..4af278d 100644 --- a/pagure/lib/model.py +++ b/pagure/lib/model.py @@ -944,12 +944,12 @@ class Issue(BASE): return [tag.tag for tag in self.tags] @property - def depends_text(self): + def depending_text(self): ''' Return the list of issue this issue depends on in simple text. ''' return [issue.id for issue in self.children] @property - def blocks_text(self): + def blocking_text(self): ''' Return the list of issue this issue blocks on in simple text. ''' return [issue.id for issue in self.parents] @@ -989,8 +989,8 @@ class Issue(BASE): 'user': self.user.to_json(public=public), 'private': self.private, 'tags': self.tags_text, - 'depends': [str(item) for item in self.depends_text], - 'blocks': [str(item) for item in self.blocks_text], + 'depends': [str(item) for item in self.depending_text], + 'blocks': [str(item) for item in self.blocking_text], 'assignee': self.assignee.to_json( public=public) if self.assignee else None, 'priority': self.priority, diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html index 98fb0fe..bce8b27 100644 --- a/pagure/templates/issue.html +++ b/pagure/templates/issue.html @@ -223,7 +223,7 @@ {% endif%}
- +
{% for ticket in issue.parents %} {% if authenticated and g.repo_user %} -
- - -
+
+ + +
{% endif%}
- +
{% endif%} @@ -826,7 +826,7 @@ $( document ).ready(function() { } }); - $('#blocks').selectize({ + $('#blocking').selectize({ plugins: ['remove_button'], valueField: 'id', labelField: 'id', @@ -857,7 +857,7 @@ $( document ).ready(function() { } }); - $('#depends').selectize({ + $('#depending').selectize({ plugins: ['remove_button'], valueField: 'id', labelField: 'id', diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index 5cde448..cfc6e17 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -150,7 +150,7 @@ def update_issue(repo, issueid, username=None, namespace=None): comment = form.comment.data depends = [] - for depend in form.depends.data.split(','): + for depend in form.depending.data.split(','): if depend.strip(): try: depends.append(int(depend.strip())) @@ -158,7 +158,7 @@ def update_issue(repo, issueid, username=None, namespace=None): pass blocks = [] - for block in form.blocks.data.split(','): + for block in form.blocking.data.split(','): if block.strip(): try: blocks.append(int(block.strip())) diff --git a/tests/test_pagure_flask_ui_issues.py b/tests/test_pagure_flask_ui_issues.py index c788243..6cb32b2 100644 --- a/tests/test_pagure_flask_ui_issues.py +++ b/tests/test_pagure_flask_ui_issues.py @@ -1207,7 +1207,7 @@ class PagureFlaskIssuestests(tests.Modeltests): # Add a dependent ticket data = { 'csrf_token': csrf_token, - 'depends': '2', + 'depending': '2', } output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) @@ -1223,7 +1223,7 @@ class PagureFlaskIssuestests(tests.Modeltests): # Add an invalid dependent ticket data = { 'csrf_token': csrf_token, - 'depends': '2,abc', + 'depending': '2,abc', } output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) @@ -1242,8 +1242,8 @@ class PagureFlaskIssuestests(tests.Modeltests): repo = pagure.lib.get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) - self.assertEqual(issue.depends_text, [2]) - self.assertEqual(issue.blocks_text, []) + self.assertEqual(issue.depending_text, [2]) + self.assertEqual(issue.blocking_text, []) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') @@ -1296,7 +1296,7 @@ class PagureFlaskIssuestests(tests.Modeltests): # Add a dependent ticket data = { 'csrf_token': csrf_token, - 'blocks': '2', + 'blocking': '2', } output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) @@ -1307,8 +1307,8 @@ class PagureFlaskIssuestests(tests.Modeltests): repo = pagure.lib.get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) - self.assertEqual(issue.depends_text, []) - self.assertEqual(issue.blocks_text, []) + self.assertEqual(issue.depending_text, []) + self.assertEqual(issue.blocking_text, []) user = tests.FakeUser() user.username = 'pingou' @@ -1329,7 +1329,7 @@ class PagureFlaskIssuestests(tests.Modeltests): # Add a dependent ticket data = { 'csrf_token': csrf_token, - 'blocks': '2', + 'blocking': '2', } output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) @@ -1345,7 +1345,7 @@ class PagureFlaskIssuestests(tests.Modeltests): # Add an invalid dependent ticket data = { 'csrf_token': csrf_token, - 'blocks': '2,abc', + 'blocking': '2,abc', } output = self.app.post( '/test/issue/1/update', data=data, follow_redirects=True) @@ -1364,8 +1364,8 @@ class PagureFlaskIssuestests(tests.Modeltests): repo = pagure.lib.get_project(self.session, 'test') issue = pagure.lib.search_issues(self.session, repo, issueid=1) - self.assertEqual(issue.depends_text, []) - self.assertEqual(issue.blocks_text, [2]) + self.assertEqual(issue.depending_text, []) + self.assertEqual(issue.blocking_text, [2]) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') diff --git a/tests/test_pagure_flask_ui_issues_acl_checks.py b/tests/test_pagure_flask_ui_issues_acl_checks.py index d9a45b0..41f7c69 100644 --- a/tests/test_pagure_flask_ui_issues_acl_checks.py +++ b/tests/test_pagure_flask_ui_issues_acl_checks.py @@ -175,15 +175,15 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): 'selected value="77">77', output.data) - # can view depends on + # can view depending self.assertIn( - '', + '', output.data) - # can't edit depends on + # can't edit depending on self.assertNotIn( - '', output.data) @@ -250,15 +250,15 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): 'selected value="77">77', output.data) - # can view depends on + # can view depending self.assertIn( - '', + '', output.data) - # can't edit depends on + # can't edit depending on self.assertNotIn( - '', output.data) @@ -439,15 +439,15 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): 'selected value="77">77', output.data) - # can view depends on + # can view depending self.assertIn( - '', + '', output.data) - # can't edit depends on + # can't edit depending on self.assertNotIn( - '', output.data) @@ -510,15 +510,15 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): 'value="77">77\n
\n', output.data) - # can view depends on + # can view depending self.assertIn( - '', + '', output.data) - # can edit depends on + # can edit depending on self.assertIn( - ' private @@ -702,15 +702,15 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): 'selected value="77">77', output.data) - # can view depends on + # can view depending self.assertIn( - '', + '', output.data) - # can't edit depends on + # can't edit depending on self.assertNotIn( - '', output.data) @@ -772,15 +772,15 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): 'name="milestone">\n
\n', output.data) - # can view depends on + # can view depending self.assertIn( - '', + '', output.data) - # can edit depends on + # can edit depending on self.assertIn( - ' private @@ -964,15 +964,15 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): 'selected value="77">77', output.data) - # can view depends on + # can view depending self.assertIn( - '', + '', output.data) - # can't edit depends on + # can't edit depending on self.assertNotIn( - '', output.data) @@ -1035,15 +1035,15 @@ class PagureFlaskIssuesACLtests(tests.Modeltests): 'value="77">77\n
\n', output.data) - # can view depends on + # can view depending self.assertIn( - '', + '', output.data) - # can edit depends on + # can edit depending on self.assertIn( - ' private diff --git a/tests/test_pagure_lib.py b/tests/test_pagure_lib.py index 5ea48f4..52afcde 100644 --- a/tests/test_pagure_lib.py +++ b/tests/test_pagure_lib.py @@ -2175,8 +2175,8 @@ class PagureLibtests(tests.Modeltests): # before self.assertEqual(issue.tags_text, []) - self.assertEqual(issue.depends_text, []) - self.assertEqual(issue.blocks_text, []) + self.assertEqual(issue.depending_text, []) + self.assertEqual(issue.blocking_text, []) messages = pagure.lib.update_dependency_issue( self.session, repo, issue, '2', 'pingou', ticketfolder=None) @@ -2196,8 +2196,8 @@ class PagureLibtests(tests.Modeltests): # after self.assertEqual(issue.tags_text, []) - self.assertEqual(issue.depends_text, [3]) - self.assertEqual(issue.blocks_text, []) + self.assertEqual(issue.depending_text, [3]) + self.assertEqual(issue.blocking_text, []) @patch('pagure.lib.git.update_git') @patch('pagure.lib.notify.send_email') @@ -2225,8 +2225,8 @@ class PagureLibtests(tests.Modeltests): # before self.assertEqual(issue.tags_text, []) - self.assertEqual(issue.depends_text, []) - self.assertEqual(issue.blocks_text, []) + self.assertEqual(issue.depending_text, []) + self.assertEqual(issue.blocking_text, []) messages = pagure.lib.update_blocked_issue( self.session, repo, issue, '2', 'pingou', ticketfolder=None) @@ -2243,8 +2243,8 @@ class PagureLibtests(tests.Modeltests): # after self.assertEqual(issue.tags_text, []) - self.assertEqual(issue.depends_text, []) - self.assertEqual(issue.blocks_text, [3]) + self.assertEqual(issue.depending_text, []) + self.assertEqual(issue.blocking_text, [3]) @patch('pagure.lib.notify.send_email') def test_add_pull_request_assignee(self, mockemail): diff --git a/tests/test_pagure_lib_git.py b/tests/test_pagure_lib_git.py index 9dccb1e..8f6d297 100644 --- a/tests/test_pagure_lib_git.py +++ b/tests/test_pagure_lib_git.py @@ -1577,8 +1577,8 @@ index 0000000..60f7480 self.assertEqual(repo.issues[0].id, 1) self.assertEqual(repo.issues[0].uid, 'foobar') self.assertEqual(repo.issues[0].title, 'foo') - self.assertEqual(repo.issues[0].depends_text, []) - self.assertEqual(repo.issues[0].blocks_text, []) + self.assertEqual(repo.issues[0].depending_text, []) + self.assertEqual(repo.issues[0].blocking_text, []) self.assertEqual(repo.issues[0].milestone, 'Next Release') self.assertEqual(repo.issues[0].priority, 1) self.assertEqual(repo.milestones, {'Next Release': None}) @@ -1595,8 +1595,8 @@ index 0000000..60f7480 self.assertEqual(repo.issues[0].id, 1) self.assertEqual(repo.issues[0].uid, 'foobar') self.assertEqual(repo.issues[0].title, 'fake issue for tests') - self.assertEqual(repo.issues[0].depends_text, []) - self.assertEqual(repo.issues[0].blocks_text, []) + self.assertEqual(repo.issues[0].depending_text, []) + self.assertEqual(repo.issues[0].blocking_text, []) self.assertEqual(repo.issues[0].priority, 1) data = { @@ -1659,13 +1659,13 @@ index 0000000..60f7480 self.assertEqual(len(repo.issues), 2) self.assertEqual(repo.issues[0].uid, 'foobar') self.assertEqual(repo.issues[0].title, 'fake issue for tests') - self.assertEqual(repo.issues[0].depends_text, [20]) - self.assertEqual(repo.issues[0].blocks_text, []) + self.assertEqual(repo.issues[0].depending_text, [20]) + self.assertEqual(repo.issues[0].blocking_text, []) # New one self.assertEqual(repo.issues[1].uid, 'foobar2') self.assertEqual(repo.issues[1].title, 'Rename pagure') - self.assertEqual(repo.issues[1].depends_text, []) - self.assertEqual(repo.issues[1].blocks_text, [1]) + self.assertEqual(repo.issues[1].depending_text, []) + self.assertEqual(repo.issues[1].blocking_text, [1]) self.assertEqual(repo.issues[1].milestone, 'Future') self.assertEqual(repo.milestones, {'Future': None, 'Next Release': None})