You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@allura.apache.org by jo...@apache.org on 2012/10/10 17:38:42 UTC
git commit: [#5036] ticket:182 fixed js and remove clone_info
Updated Branches:
refs/heads/master 5215f01fa -> 5448d2496
[#5036] ticket:182 fixed js and remove clone_info
Project: http://git-wip-us.apache.org/repos/asf/incubator-allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-allura/commit/5448d249
Tree: http://git-wip-us.apache.org/repos/asf/incubator-allura/tree/5448d249
Diff: http://git-wip-us.apache.org/repos/asf/incubator-allura/diff/5448d249
Branch: refs/heads/master
Commit: 5448d2496384dd0b9ea4c6b3865519ced4add982
Parents: 5215f01
Author: Yuriy Arhipov <yu...@yandex.ru>
Authored: Wed Oct 3 17:42:44 2012 +0400
Committer: Cory Johns <jo...@geek.net>
Committed: Wed Oct 10 15:37:22 2012 +0000
----------------------------------------------------------------------
Allura/allura/templates/repo/commit.html | 2 +-
Allura/allura/templates/repo/commit_browser.html | 1 -
Allura/allura/templates/repo/diff.html | 1 -
Allura/allura/templates/repo/file.html | 2 --
Allura/allura/templates/repo/log.html | 1 -
Allura/allura/templates/repo/merge_request.html | 2 --
Allura/allura/templates/repo/merge_requests.html | 3 ---
Allura/allura/templates/repo/request_merge.html | 3 ---
Allura/allura/templates/repo/tags.html | 1 -
.../forgegit/tests/functional/test_controllers.py | 15 +++++++++++++++
10 files changed, 16 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/commit.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/commit.html b/Allura/allura/templates/repo/commit.html
index df3f42e..fd3c247 100644
--- a/Allura/allura/templates/repo/commit.html
+++ b/Allura/allura/templates/repo/commit.html
@@ -15,6 +15,7 @@ Commit <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a> {{commit_labels(
{% endblock %}
{% block extra_js %}
+{{ super() }}
<script type="text/javascript">
var MAX_REQUESTS = 5; // max simultaneous load requests
var WAIT_FOR = 500; // wait for 100ms when requests queue is full and try again
@@ -60,7 +61,6 @@ Commit <a href="{{commit.url()}}">{{commit.shorthand_id()}}</a> {{commit_labels(
{% endblock %}
{% block content %}
-{{ clone_info(c.app.repo) }}
{{c.revision_widget.display(value=commit, prev=prev, next=next)}}
{{c.page_list.display(page=page, limit=limit, count=count)}}
<table>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/commit_browser.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/commit_browser.html b/Allura/allura/templates/repo/commit_browser.html
index 046d611..161b5bf 100644
--- a/Allura/allura/templates/repo/commit_browser.html
+++ b/Allura/allura/templates/repo/commit_browser.html
@@ -12,7 +12,6 @@
{%- endblock %}
{% block content %}
- {{ clone_info(c.app.repo) }}
{% if status == 'no_commits' %}
<p>No commits to display.</p>
{% elif status == 'too_many_commits' %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/diff.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/diff.html b/Allura/allura/templates/repo/diff.html
index dbef19a..fbdfad2 100644
--- a/Allura/allura/templates/repo/diff.html
+++ b/Allura/allura/templates/repo/diff.html
@@ -17,7 +17,6 @@
{% endblock %}
{% block content %}
- {{ clone_info(c.app.repo) }}
{% if a.has_image_view and b.has_image_view %}
<div class="grid-19">
<img src="{{a.url()}}?format=raw"
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/file.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/file.html b/Allura/allura/templates/repo/file.html
index 1529130..83afe6c 100644
--- a/Allura/allura/templates/repo/file.html
+++ b/Allura/allura/templates/repo/file.html
@@ -44,9 +44,7 @@
}());
</script>
{% endblock %}
-
{% block content %}
- {{ clone_info(c.app.repo) }}
{% if prev %}
<p>
Parent:
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/log.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/log.html b/Allura/allura/templates/repo/log.html
index ad7ff13..ffe1022 100644
--- a/Allura/allura/templates/repo/log.html
+++ b/Allura/allura/templates/repo/log.html
@@ -11,7 +11,6 @@
{% block header %}{{c.app.config.options.mount_label}} Log{% endblock %}
{% block content %}
- {{ clone_info(c.app.repo) }}
<br style="clear:both"/>
{% if log %}
{{c.log_widget.display(value=log, limit=limit, page=page, count=count)}}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/merge_request.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_request.html b/Allura/allura/templates/repo/merge_request.html
index 5f9bbf4..89688b9 100644
--- a/Allura/allura/templates/repo/merge_request.html
+++ b/Allura/allura/templates/repo/merge_request.html
@@ -13,8 +13,6 @@ Merge Request #{{req.request_number}}: {{req.summary}} ({{req.status}})
{% endblock %}
{% block content %}
-
- {{ clone_info(c.app.repo) }}
<p>
<a href="{{req.creator_url}}">{{req.creator_name}}</a>
would like you to merge {{ req.commits | count }} commits
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/merge_requests.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/merge_requests.html b/Allura/allura/templates/repo/merge_requests.html
index 2e905fe..1990d24 100644
--- a/Allura/allura/templates/repo/merge_requests.html
+++ b/Allura/allura/templates/repo/merge_requests.html
@@ -9,10 +9,7 @@
{% endblock %}
{% block header %}{{c.app.config.options.mount_label}} Merge Requests{% endblock %}
-
{% block content %}
- {{ clone_info(c.app.repo) }}
-
{{ c.mr_filter.display(action='.', value=dict(status=status)) }}
<table>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/request_merge.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/request_merge.html b/Allura/allura/templates/repo/request_merge.html
index c55f74d..ad01d51 100644
--- a/Allura/allura/templates/repo/request_merge.html
+++ b/Allura/allura/templates/repo/request_merge.html
@@ -11,8 +11,5 @@
{% block header %}Request merge of {{c.app.config.options.mount_label}} {% endblock %}
{% block content %}
- {{ clone_info(c.app.repo) }}
-
{{ c.form.display(action='do_request_merge', value=dict(source_branch=source_branch))}}
-
{% endblock %}
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/Allura/allura/templates/repo/tags.html
----------------------------------------------------------------------
diff --git a/Allura/allura/templates/repo/tags.html b/Allura/allura/templates/repo/tags.html
index 2945ded..148c28f 100644
--- a/Allura/allura/templates/repo/tags.html
+++ b/Allura/allura/templates/repo/tags.html
@@ -11,7 +11,6 @@
{% block header %}{{c.app.config.options.mount_label}} Tags{% endblock %}
{% block content %}
- {{ clone_info(c.app.repo) }}
<div class="grid-19">
{% for b in c.app.repo.repo_tags %}
<a href="{{c.app.url}}?branch=ref/{{b.name}}">{{b.name}}</a><br>
http://git-wip-us.apache.org/repos/asf/incubator-allura/blob/5448d249/ForgeGit/forgegit/tests/functional/test_controllers.py
----------------------------------------------------------------------
diff --git a/ForgeGit/forgegit/tests/functional/test_controllers.py b/ForgeGit/forgegit/tests/functional/test_controllers.py
index f0ec19e..cf5b986 100644
--- a/ForgeGit/forgegit/tests/functional/test_controllers.py
+++ b/ForgeGit/forgegit/tests/functional/test_controllers.py
@@ -230,6 +230,21 @@ class TestRootController(_TestCase):
resp = self.app.get(ci + 'tree/')
assert "Thu Oct 07, 2010 06:44 PM UTC" in resp, resp.showbrowser()
+ def test_checkout_input(self):
+ ci = self._get_ci()
+ r = self.app.get('/src-git/commit_browser')
+ assert not '<div id="access_urls"' in r
+ r = self.app.get('/src-git/fork')
+ assert not '<div id="access_urls"' in r
+ r = self.app.get(
+ ci +
+ 'tree/README?diff=df30427c488aeab84b2352bdf88a3b19223f9d7a')
+ assert not '<div id="access_urls"' in r
+ r = self.app.get(ci + 'tree/README')
+ assert not '<div id="access_urls"' in r
+ r = self.app.get(ci + 'tree/')
+ assert '<div id="access_urls"' in r
+
class TestRestController(_TestCase):