This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/attic.git
The following commit(s) were added to refs/heads/main by this push:
new 8169623 Simplify: drop fallback logic as keys always present
8169623 is described below
commit 81696238871eb036d22bdbf14f576abee20d20fb
Author: Sebb <[email protected]>
AuthorDate: Sat Oct 4 21:39:31 2025 +0100
Simplify: drop fallback logic as keys always present
---
_layouts/project-layout.html | 16 ++--------------
_layouts/project-templates-layout.html | 10 ++--------
2 files changed, 4 insertions(+), 22 deletions(-)
diff --git a/_layouts/project-layout.html b/_layouts/project-layout.html
index d0d959f..6aea233 100644
--- a/_layouts/project-layout.html
+++ b/_layouts/project-layout.html
@@ -87,10 +87,10 @@ limitations under the License.
<td>Source Code ({{ source_repo.type}})</td>
{%- case source_repo.type %}
{%- when "Subversion" %}
- {%- assign svn_path = source_repo.path | default: page.project_id |
prepend: "svn.apache.org/repos/asf/" %}
+ {%- assign svn_path = source_repo.path | prepend:
"svn.apache.org/repos/asf/" %}
<td><a href="https://{{ svn_path }}/">{{ svn_path }}</a></td>
{%- when "Git" %}
- {%- assign git_path = source_repo.path | default: page.project_id |
prepend: "gitbox.apache.org/repos/asf#" %}
+ {%- assign git_path = source_repo.path | prepend:
"gitbox.apache.org/repos/asf#" %}
<td><a href="https://{{ git_path }}">{{ git_path }}</a></td>
{%- else %}
<td>??? {{ source_repo.type}} ???</td>
@@ -108,9 +108,6 @@ limitations under the License.
{%- for jira_key in issue_tracker.keys %}
{%- unless forloop.first %} | {% endunless %}
<a href="https://issues.apache.org/jira/browse/{{ jira_key }}/">{{
jira_key }}</a>
- {%- else %}
- {%- assign jira_key = page.project_id | upcase %}
- <a href="https://issues.apache.org/jira/browse/{{ jira_key }}/">{{
jira_key }}</a>
{%- endfor %}
</td>
{% when "GitHub" %}
@@ -118,9 +115,6 @@ limitations under the License.
{%- for github_key in issue_tracker.keys %}
{%- unless forloop.first %} | {% endunless %}
<a href="https://github.com/apache/{{ github_key
}}/issues?q=is%3Aissue">{{ github_key }}</a>
- {%- else %}
- {%- assign github_key = page.project_id %}
- <a href="https://github.com/apache/{{ github_key
}}/issues?q=is%3Aissue">{{ github_key }}</a>
{%- endfor %}
</td>
{% when "Bugzilla" %}
@@ -128,9 +122,6 @@ limitations under the License.
{%- for bz_key in issue_tracker.keys %}
{%- unless forloop.first %} | {% endunless %}
<a href="https://bz.apache.org/bugzilla/buglist.cgi?product={{ bz_key
}}">{{ bz_key }}</a>
- {%- else %}
- {%- assign bz_key = page.project_id | upcase %}
- <a href="https://bz.apache.org/bugzilla/buglist.cgi?product={{ bz_key
}}">{{ bz_key }}</a>
{%- endfor %}
</td>
@@ -149,9 +140,6 @@ limitations under the License.
{%- for wiki_key in page.wiki.keys %}
{%- unless forloop.first %} | {% endunless %}
<a href="https://cwiki.apache.org/confluence/display/{{ wiki_key
}}/">cwiki: {{ wiki_key }}</a>
- {%- else %}
- {%- assign wiki_key = page.project_id %}
- <a href="https://cwiki.apache.org/confluence/display/{{ wiki_key
}}/">cwiki: {{ wiki_key }}</a>
{%- endfor %}
</td>
{%- else %}
diff --git a/_layouts/project-templates-layout.html
b/_layouts/project-templates-layout.html
index 156d628..69182bb 100644
--- a/_layouts/project-templates-layout.html
+++ b/_layouts/project-templates-layout.html
@@ -107,15 +107,11 @@ Mailing lists https://lists.apache.org/list.html?{{
page.project_id }}.apache.or
Make the following JIRA project(s) read-only and flag as retired:
{%- for jira_key in issue_tracker.keys %}
- https://issues.apache.org/jira/projects/{{ jira_key }}/
- {%- else %}
- - https://issues.apache.org/jira/projects/{{ page.project_id | upcase }}/
{%- endfor %}
{%- when "Bugzilla" %}
Make the following Bugzilla project(s) read-only and flag as retired:
{%- for bz_key in issue_tracker.keys %}
- https://bz.apache.org/bugzilla/buglist.cgi?product={{ bz_key }}
- {%- else %}
- - https://bz.apache.org/bugzilla/buglist.cgi?product={{ page.project_id
| downcase }}
{%- endfor %}
{% endcase %}
{%- endfor %}
@@ -125,12 +121,12 @@ Make the following Bugzilla project(s) read-only and flag
as retired:
{%- for source_repo in page.source_repositories -%}
{% case source_repo.type -%}
{%- when "Subversion" %}
- SVN: https://svn.apache.org/repos/asf/{{ source_repo.path | default:
page.project_id }}
+ SVN: https://svn.apache.org/repos/asf/{{ source_repo.path }}
{%- when "Git" %}
{% for git_repo_hash in git_repositories -%}
Git: http://gitbox.apache.org/repos/asf/{{git_repo_hash[0]}}.git
{% else -%}
- Git: https://gitbox.apache.org/repos/asf#{{ source_repo.path | default:
page.project_id }}.git
+ Git: https://gitbox.apache.org/repos/asf#{{ source_repo.path }}.git
{% endfor -%}
{%- else %}
{{ source_repo.type}}: ???
@@ -145,8 +141,6 @@ Make the following Bugzilla project(s) read-only and flag
as retired:
Make CWIKI readonly:
{%- for wiki_key in page.wiki.keys %}
https://cwiki.apache.org/confluence/display/{{ wiki_key }}/
- {%- else %}
- https://cwiki.apache.org/confluence/display/{{ page.project_id }}/
{%- endfor %}
{%- else %}
{{ page.wiki.type}} ???
