1
Fork 0
mirror of https://github.com/jech/galene.git synced 2024-11-22 08:35:57 +01:00

Use /group/name/ as the main page for the group.

We used to omit the slash, which users found confusing.
This commit is contained in:
Juliusz Chroboczek 2021-10-26 19:36:05 +02:00
parent 5b1bc8141a
commit de7dc9252f
3 changed files with 9 additions and 6 deletions

View file

@ -3089,7 +3089,9 @@ async function serverConnect() {
}
function start() {
group = decodeURIComponent(location.pathname.replace(/^\/[a-z]*\//, ''));
group = decodeURIComponent(
location.pathname.replace(/^\/[a-z]*\//, '').replace(/\/$/, '')
);
setTitle(capitalise(group));
addFilters();
setMediaChoices(false).then(e => reflectSettings());

View file

@ -24,7 +24,7 @@ document.getElementById('groupform').onsubmit = function(e) {
e.preventDefault();
let group = document.getElementById('group').value.trim();
if(group !== '')
location.href = '/group/' + group;
location.href = '/group/' + group + '/';
};
async function listPublicGroups() {
@ -59,8 +59,8 @@ async function listPublicGroups() {
let tr = document.createElement('tr');
let td = document.createElement('td');
let a = document.createElement('a');
a.textContent = group.name;
a.href = '/group/' + encodeURIComponent(group.displayName || group.name);
a.textContent = group.displayName || group.name;
a.href = '/group/' + group.name + '/';
td.appendChild(a);
tr.appendChild(td);
let td2 = document.createElement('td');

View file

@ -283,8 +283,9 @@ func groupHandler(w http.ResponseWriter, r *http.Request) {
return
}
if r.URL.Path != "/group/"+name {
http.Redirect(w, r, "/group/"+name, http.StatusPermanentRedirect)
if r.URL.Path != "/group/"+name+"/" {
http.Redirect(w, r, "/group/"+name+"/",
http.StatusPermanentRedirect)
return
}