Mercurial > kallithea
changeset 6542:62ac1470b748
pullrequests: rename "as_form" to something more descriptive
This parameter is (only) used for showing the PR contents preview on the
"New Pull Request" page.
| author | Søren Løvborg <sorenl@unity3d.com> |
|---|---|
| date | Wed, 15 Mar 2017 21:20:45 +0100 |
| parents | bacc854a3853 |
| children | 9059da57b431 |
| files | kallithea/controllers/compare.py kallithea/controllers/pullrequests.py kallithea/templates/compare/compare_cs.html kallithea/templates/pullrequests/pullrequest.html kallithea/tests/functional/test_compare_local.py |
| diffstat | 5 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/controllers/compare.py Wed Mar 15 20:39:38 2017 +0100 +++ b/kallithea/controllers/compare.py Wed Mar 15 21:20:45 2017 +0100 @@ -192,9 +192,9 @@ c.fulldiff = request.GET.get('fulldiff') # partial uses compare_cs.html template directly partial = request.environ.get('HTTP_X_PARTIAL_XHR') - # as_form puts hidden input field with changeset revisions - c.as_form = partial and request.GET.get('as_form') - # swap url for compare_diff page - never partial and never as_form + # is_ajax_preview puts hidden input field with changeset revisions + c.is_ajax_preview = partial and request.GET.get('is_ajax_preview') + # swap url for compare_diff page - never partial and never is_ajax_preview c.swap_url = h.url('compare_url', repo_name=c.cs_repo.repo_name, org_ref_type=other_ref_type, org_ref_name=other_ref_name,
--- a/kallithea/controllers/pullrequests.py Wed Mar 15 20:39:38 2017 +0100 +++ b/kallithea/controllers/pullrequests.py Wed Mar 15 21:20:45 2017 +0100 @@ -637,7 +637,7 @@ ) = cs_model.calculate_pull_request_result(c.pull_request) c.changeset_statuses = ChangesetStatus.STATUSES - c.as_form = False + c.is_ajax_preview = False c.ancestors = None # [c.a_rev] ... but that is shown in an other way return render('/pullrequests/pullrequest_show.html')
--- a/kallithea/templates/compare/compare_cs.html Wed Mar 15 20:39:38 2017 +0100 +++ b/kallithea/templates/compare/compare_cs.html Wed Mar 15 21:20:45 2017 +0100 @@ -94,7 +94,7 @@ </div> - %if c.as_form: + %if c.is_ajax_preview: <h5> ## links should perhaps use ('rev', c.a_rev) instead ... ${h.link_to(_('Show merge diff'), @@ -120,7 +120,7 @@ %endif </div> -%if c.as_form: +%if c.is_ajax_preview: <div id="jsdata" style="display:none">${h.js(c.jsdata)}</div> %else: <script type="text/javascript" src="${h.url('/js/graph.js', ver=c.kallithea_version)}"></script> @@ -129,7 +129,7 @@ <script type="text/javascript"> $(document).ready(function(){ -%if not c.as_form: +%if not c.is_ajax_preview: var jsdata = ${h.js(c.jsdata)}; var r = new BranchRenderer('graph_canvas', 'graph_content_pr', 'chg_'); r.render(jsdata);
--- a/kallithea/templates/pullrequests/pullrequest.html Wed Mar 15 20:39:38 2017 +0100 +++ b/kallithea/templates/pullrequests/pullrequest.html Wed Mar 15 21:20:45 2017 +0100 @@ -147,7 +147,7 @@ other_repo='__org_repo__', other_ref_type='rev', other_ref_name='__org_ref_name__', - as_form=True, + is_ajax_preview=True, merge=True, ))}; var org_repo = $('#pull_request_form #org_repo').val();
--- a/kallithea/tests/functional/test_compare_local.py Wed Mar 15 20:39:38 2017 +0100 +++ b/kallithea/tests/functional/test_compare_local.py Wed Mar 15 21:20:45 2017 +0100 @@ -189,7 +189,7 @@ ## files response.mustcontain("""<a href="#C--c8e92ef85cd1">.hgignore</a>""") - def test_compare_revisions_hg_as_form(self): + def test_compare_revisions_hg_is_ajax_preview(self): self.log_user() rev1 = 'b986218ba1c9' rev2 = '3d8f361e72ab' @@ -200,7 +200,7 @@ org_ref_name=rev1, other_ref_type="rev", other_ref_name=rev2, - as_form=True, + is_ajax_preview=True, ), extra_environ={'HTTP_X_PARTIAL_XHR': '1'},) @@ -210,7 +210,7 @@ response.mustcontain('Merge Ancestor') response.mustcontain("""<a class="changeset_hash" href="/%s/changeset/b986218ba1c9b0d6a259fac9b050b1724ed8e545">%s</a>""" % (HG_REPO, rev1)) - def test_compare_revisions_git_as_form(self): + def test_compare_revisions_git_is_ajax_preview(self): self.log_user() rev1 = 'c1214f7e79e02fc37156ff215cd71275450cffc3' rev2 = '38b5fe81f109cb111f549bfe9bb6b267e10bc557' @@ -221,7 +221,7 @@ org_ref_name=rev1, other_ref_type="rev", other_ref_name=rev2, - as_form=True, + is_ajax_preview=True, ), extra_environ={'HTTP_X_PARTIAL_XHR': '1'},) ## outgoing changesets between those revisions