diff --git a/pagure/flask_app.py b/pagure/flask_app.py index acf554f..7d8f484 100644 --- a/pagure/flask_app.py +++ b/pagure/flask_app.py @@ -227,6 +227,7 @@ def set_request(): flask.current_app.config['DB_URL']) flask.g.version = pagure.__version__ + flask.g.confirmationform = pagure.forms.ConfirmationForm() # The API namespace has its own way of getting repo and username and # of handling errors diff --git a/pagure/templates/comment_update.html b/pagure/templates/comment_update.html index 3380d56..3248ae4 100644 --- a/pagure/templates/comment_update.html +++ b/pagure/templates/comment_update.html @@ -53,7 +53,7 @@ type: 'POST', data: { content: _text, - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, dataType: 'html', success: function(res) { diff --git a/pagure/templates/commit.html b/pagure/templates/commit.html index ec07604..76bcdbb 100644 --- a/pagure/templates/commit.html +++ b/pagure/templates/commit.html @@ -205,7 +205,7 @@ repouser: "{{ repo.user.user if repo.is_fork else '' }}", namespace: "{{ repo.namespace if repo.namespace else '' }}", commit_id: "{{ commitid }}", - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, dataType: 'json', success: function(res) { diff --git a/pagure/templates/commits.html b/pagure/templates/commits.html index 17bc120..3fe0300 100644 --- a/pagure/templates/commits.html +++ b/pagure/templates/commits.html @@ -114,7 +114,7 @@ {{ diff_commit_full.author | author2avatar(20) | safe }} {{ diff_commit_full.author.name }} • + title="{{ diff_commit_full.commit_time|format_ts }}"> • {{ diff_commit_full.commit_time|humanize }}   @@ -144,7 +144,7 @@ {% for commit in last_commits %} -
{% if diff_commits and commit.oid.hex in diff_commits %} @@ -173,7 +173,7 @@ author=commit.author.email), cssclass="notblue")|safe}} • + title="{{ commit.commit_time|format_ts }}"> • {{ commit.commit_time|humanize }}  
@@ -223,7 +223,7 @@ repo: "{{ repo.name }}", repouser: "{{ repo.user.user if repo.is_fork else '' }}", namespace: "{{ repo.namespace if repo.namespace else '' }}", - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, dataType: 'json', success: function(res) { diff --git a/pagure/templates/issue.html b/pagure/templates/issue.html index 35d2b37..c19fc39 100644 --- a/pagure/templates/issue.html +++ b/pagure/templates/issue.html @@ -961,7 +961,7 @@ $( document ).ready(function() { type: 'POST', data: { content: _text, - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, dataType: 'html', success: function(res) { diff --git a/pagure/templates/new_issue.html b/pagure/templates/new_issue.html index 3c3a2b5..b4fc51c 100644 --- a/pagure/templates/new_issue.html +++ b/pagure/templates/new_issue.html @@ -233,7 +233,7 @@ $(document).ready(function() { url: _url , type: 'POST', data: { - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, dataType: 'json', success: function(res) { @@ -287,7 +287,7 @@ $(function() { type: 'POST', data: { content: _text, - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, dataType: 'html', success: function(res) { diff --git a/pagure/templates/pull_request.html b/pagure/templates/pull_request.html index 8dd1783..ebbac29 100644 --- a/pagure/templates/pull_request.html +++ b/pagure/templates/pull_request.html @@ -1268,7 +1268,7 @@ $(document).ready(function() { type: 'POST', dataType: 'json', data: { - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, success: function(res) { var _text = '' diff --git a/pagure/templates/pull_request_title.html b/pagure/templates/pull_request_title.html index a1d90f3..c520597 100644 --- a/pagure/templates/pull_request_title.html +++ b/pagure/templates/pull_request_title.html @@ -102,7 +102,7 @@ type: 'POST', data: { content: _text, - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, dataType: 'html', success: function(res) { diff --git a/pagure/templates/repo_branches.html b/pagure/templates/repo_branches.html index a7b0fe3..d50894b 100644 --- a/pagure/templates/repo_branches.html +++ b/pagure/templates/repo_branches.html @@ -50,7 +50,7 @@ identifier=branch, branchname=branch) }}" title="{{ branch }}" data-toggle="tooltip">{{ branch }} - +
@@ -86,7 +86,7 @@ branchname=branch) }}" method="post" class="inline icon del_icon" onsubmit="return confirm('Are you sure you want to remove the branch: {{ branch }}?\nThis cannot be un-done!');"> - {{ confirmationform.csrf_token }} + {{ g.confirmationform.csrf_token }} {{ repo.user.user }} /  + }}">{{ repo.user.user }} /  {%- endif -%} {%- if repo.namespace -%} {{ repo.namespace }} /  + }}">{{ repo.namespace }} /  {%- endif -%} - {{watch_button_text}} + {{watch_button_text}} {{repo.watchers|length}}
@@ -201,7 +201,7 @@ class="btn btn-sm dropdown-toggle btn-outline-primary font-weight-bold" data-toggle="dropdown"> - Members + Members {{repo.contributors|length+1}}
@@ -380,7 +380,7 @@ $(function() { namespace: "{{ repo.namespace if repo.namespace }}", repo: "{{ repo.name }}", repouser: "{{ repo.user.user if repo.is_fork else '' }}", - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", }, dataType: 'json', success: function(res) { diff --git a/pagure/templates/repo_master.html b/pagure/templates/repo_master.html index 524e729..8afb061 100644 --- a/pagure/templates/repo_master.html +++ b/pagure/templates/repo_master.html @@ -24,12 +24,12 @@ {% if repo.is_fork -%} {{ repo.user.user }} /  + }}">{{ repo.user.user }} /  {%- endif -%} {%- if repo.namespace -%} {{ repo.namespace }} /  + }}">{{ repo.namespace }} /  {%- endif -%}" ); var data = { - csrf_token: "{{ confirmationform.csrf_token.current_token }}", + csrf_token: "{{ g.confirmationform.csrf_token.current_token }}", repo: "{{ g.repo.name }}", username: "{{ username or '' }}", namespace: "{{ g.repo.namespace or '' }}", diff --git a/pagure/ui/fork.py b/pagure/ui/fork.py index 07ca938..4d3a865 100644 --- a/pagure/ui/fork.py +++ b/pagure/ui/fork.py @@ -157,7 +157,6 @@ def request_pulls(repo, username=None, namespace=None): status=status, assignee=assignee, author=author, - confirmationform=pagure.forms.ConfirmationForm(), head=head, total_page=total_page, ) @@ -260,7 +259,6 @@ def request_pull(repo, requestid, username=None, namespace=None): subscribers=pagure.lib.get_watch_list(flask.g.session, request), tag_list=pagure.lib.get_tags_of_project(flask.g.session, repo), can_delete_branch=can_delete_branch, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -710,7 +708,6 @@ def pull_request_edit_comment( form=form, comment=comment, is_js=is_js, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -1289,7 +1286,6 @@ def new_request_pull( contributing=contributing, parent=parent, project_to=project_to, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -1381,7 +1377,6 @@ def new_remote_request_pull(repo, username=None, namespace=None): branch_from=branch_from, remote_git=remote_git, parent=repo, - confirmationform=pagure.forms.ConfirmationForm(), ) try: diff --git a/pagure/ui/issues.py b/pagure/ui/issues.py index f4fce99..a7d05c3 100644 --- a/pagure/ui/issues.py +++ b/pagure/ui/issues.py @@ -441,7 +441,6 @@ def edit_tag(repo, tag, username=None, namespace=None): repo=repo, form=form, tagname=tag, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -739,7 +738,6 @@ def view_issues(repo, username=None, namespace=None): order=order, order_key=order_key, status=status, - confirmationform=pagure.forms.ConfirmationForm(), **fields ) @@ -818,7 +816,6 @@ def view_roadmap(repo, username=None, namespace=None): tags=tags, all_stones=all_stones, requested_stones=milestones, - confirmationform=pagure.forms.ConfirmationForm(), ) issues = pagure.lib.search_issues( @@ -874,7 +871,6 @@ def view_roadmap(repo, username=None, namespace=None): requested_stones=milestones, issues=milestone_issues, tags=tags, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -1043,8 +1039,6 @@ def new_issue(repo, username=None, namespace=None): types=types, default=default, tag_list=tag_list, - confirmationform=pagure.forms.ConfirmationForm(), - ) @@ -1115,7 +1109,6 @@ def view_issue(repo, issueid, username=None, namespace=None): knowns_keys=knowns_keys, subscribers=pagure.lib.get_watch_list(flask.g.session, issue), attachments=issue.attachments, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -1296,8 +1289,6 @@ def edit_issue(repo, issueid, username=None, namespace=None): username=username, issue=issue, issueid=issueid, - confirmationform=pagure.forms.ConfirmationForm(), - ) @@ -1429,7 +1420,6 @@ def view_issue_raw_file( username=username, diff=data, patchfile=orig_filename, - confirmationform=pagure.forms.ConfirmationForm(), ) return (data, 200, pagure.lib.mimetype.get_type_headers(filename, data)) @@ -1517,7 +1507,6 @@ def edit_comment_issue( form=form, comment=comment, is_js=is_js, - confirmationform=pagure.forms.ConfirmationForm(), ) diff --git a/pagure/ui/repo.py b/pagure/ui/repo.py index d3aff8c..3e1e45c 100644 --- a/pagure/ui/repo.py +++ b/pagure/ui/repo.py @@ -180,7 +180,6 @@ def view_repo(repo, username=None, namespace=None): branchname=branchname, last_commits=last_commits, tree=tree, - confirmationform=pagure.forms.ConfirmationForm(), git_url_ssh=get_git_url_ssh(), ) @@ -276,7 +275,6 @@ def view_repo_branch(repo, branchname, username=None, namespace=None): safe=safe, readme=readme, diff_commits=diff_commits, - confirmationform=pagure.forms.ConfirmationForm(), git_url_ssh=get_git_url_ssh(), ) """ @@ -416,7 +414,6 @@ def view_commits(repo, branchname=None, username=None, namespace=None): number_of_commits=n_commits, page=page, total_page=total_page, - confirmationform=pagure.forms.ConfirmationForm(), flag_statuses_labels=json.dumps(pagure_config['FLAG_STATUSES_LABELS']), ) @@ -487,7 +484,6 @@ def compare_commits(repo, commit1, commit2, username=None, namespace=None): commit2=commit2, diff=diff, diff_commits=diff_commits, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -652,7 +648,6 @@ def view_file(repo, identifier, filename, username=None, namespace=None): readme_ext=readme_ext, safe=safe, huge=huge, - confirmationform=pagure.forms.ConfirmationForm(), )), 200, headers @@ -792,7 +787,6 @@ def view_blame_file(repo, filename, username=None, namespace=None): content=content, output_type='blame', blame=blame, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -844,7 +838,6 @@ def view_commit(repo, commitid, username=None, namespace=None): commitid=commitid, commit=commit, diff=diff, - confirmationform=pagure.forms.ConfirmationForm(), flags=pagure.lib.get_commit_flag(flask.g.session, repo, commitid), ) @@ -963,7 +956,6 @@ def view_tree(repo, identifier=None, username=None, namespace=None): readme=readme, readme_ext=readme_ext, safe=safe, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -993,7 +985,6 @@ def view_tags(repo, username=None, namespace=None): repo=repo, tags=tags, pagure_checksum=pagure_checksum, - confirmationform=pagure.forms.ConfirmationForm(), ) @UI_NS.route('//branches/') @@ -1026,7 +1017,6 @@ def view_branches(repo, username=None, namespace=None): repo=repo_db, username=username, head=head, - confirmationform=pagure.forms.ConfirmationForm(), origin='view_repo', branchname=branchname, ) @@ -1181,8 +1171,6 @@ def view_settings(repo, username=None, namespace=None): plugins=plugins, branchname=branchname, pagure_admin=pagure.utils.is_admin(), - confirmationform=pagure.forms.ConfirmationForm(), - ) @@ -1748,7 +1736,6 @@ def add_deploykey(repo, username=None, namespace=None): form=form, username=username, repo=repo, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -1823,7 +1810,6 @@ def add_user(repo, username=None, namespace=None): access_levels=access_levels, user_to_update=user_to_update, user_access=user_access, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -1951,7 +1937,6 @@ def add_group_project(repo, username=None, namespace=None): access_levels=access_levels, group_to_update=group_to_update, group_access=group_access, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -2072,7 +2057,6 @@ def add_token(repo, username=None, namespace=None): acls=acls, username=username, repo=repo, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -2209,7 +2193,6 @@ def edit_file(repo, branchname, filename, username=None, namespace=None): filename=filename, form=form, user=user, - confirmationform=pagure.forms.ConfirmationForm(), ) @@ -2271,8 +2254,6 @@ def view_docs(repo, username=None, filename=None, namespace=None): username=username, filename=filename, endpoint='view_docs', - confirmationform=pagure.forms.ConfirmationForm(), - ) @@ -2704,5 +2685,4 @@ def view_stats(repo, username=None, namespace=None): select='stats', username=username, repo=flask.g.repo, - confirmationform=pagure.forms.ConfirmationForm(), )