Skip to content

Fix folder details page links when path has no trailing slash #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 29, 2016
Merged

Fix folder details page links when path has no trailing slash #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e897b37
Minimal setup for local devlelopment, PHP changes having immediate ef…
solsson Dec 29, 2016
395317b
Fixes links from details to Add file, Edit properties etc when traili…
solsson Dec 29, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions docker-compose.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# For development at http://svn/, assuming local scripts build and libs install
# Create repo: docker-compose exec svn repocreate test -o daemon
# Install libs: http://svn/repos-web/lib/smarty/install.php
version: '2.1'
services:
svn:
image: solsson/rweb-httpd@sha256:f69fc496a781e6cdcd8156e6a2c14b33377ef6b2b8538cdc6b570e47cb89adc8
expose:
- "80"
ports:
- "80:80"
environment:
ADMIN_REST_ACCESS: "true"
AUTHN: "anon"
volumes:
- .:/opt/rweb
rweb:
image: solsson/rweb@sha256:4531be10995942642442a4efa73762dd9e11828a8457a98c2a15f673fbfa93d4
expose:
- "9000"
links:
- svn:svn
volumes:
- .:/opt/rweb
6 changes: 3 additions & 3 deletions repos-web/open/index.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@
$file = new SvnOpenFile($target, $rev);
// identify folders, even without trailing slash, for example when coming from history
$isFoler = $file->isFolder();
// for old revisions SvnOpenFile detects folder even if trailing slash is missing
if (!strEnds($target, '/')) $target .= '/';

// support redirect directly to real resorce (for services that don't know repository root but have target and base)
if (isset($_GET['redirect']) && $_GET['redirect']) {
if ($rev) {
// for old revisions SvnOpenFile detects folder even if trailing slash is missing
if (!strEnds($target, '/')) $target .= '/';
// does not use getRepository so "base" must be added manually
$b = isset($_REQUEST['base']) ? '&base='.$_REQUEST['base'] : '';
header('Location: '.getWebapp().'open/list/?target='.rawurlencode($target).$b.'&rev='.$rev);
Expand All @@ -49,7 +49,7 @@
$p = Presentation::getInstance();
$p->assign_by_ref('file', $file);
// for links to other operations we use the original parameters
$p->assign('target', getTarget());
$p->assign('target', $target);
if ($fromrev) $p->assign('fromrev', $fromrev);
// display a short log for the file on the edit page
if (!isset($_REQUEST['history']) || $_REQUEST['history'] != 'false') {
Expand Down