.- ProjectController::build: now also checks GET-vars for chosen bran…

…ch name .- Project/view: changed link on "build now": when a different branch is chosen, then send it through GET-vars, so slashes are not a problem
dancryer · Sep 6, 2017 · cdccd5d · cdccd5d
1 parent 9403b5d
commit cdccd5d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/PHPCI/Controller/ProjectController.php b/PHPCI/Controller/ProjectController.php
@@ -105,6 +105,10 @@ public function build($projectId, $branch = '')
         /* @var \PHPCI\Model\Project $project */
         $project = $this->projectStore->getById($projectId);
 
+		if ($branch === '' && filter_input(INPUT_GET, 'branch') !== null) {
+			$branch = filter_input(INPUT_GET, 'branch');
+		}
+
         if (empty($branch)) {
             $branch = $project->getBranch();
         }

diff --git a/PHPCI/View/Project/view.phtml b/PHPCI/View/Project/view.phtml
@@ -14,7 +14,7 @@
     </a>
 
     <div class="pull-right btn-group">
-        <a class="btn btn-success" href="<?php print PHPCI_URL . 'project/build/' . $project->getId(); ?><?php echo !empty($branch) ? '/' . urlencode($branch) : '' ?>">
+        <a class="btn btn-success" href="<?php print PHPCI_URL . 'project/build/' . $project->getId(); ?><?php echo !empty($branch) ? '?branch=' . urlencode($branch) : '' ?>">
             <?php Lang::out('build_now'); ?>
         </a>