Merge pull request #2614 from 0xF013/fix/18744-slashes-encoding

most likely fixes the slashes encoding for the new ui.router version
pull/2652/head
Florian Kraft 10 years ago
commit 61e5ed43e9
  1. 17
      frontend/app/routing.js

@ -31,11 +31,24 @@ angular.module('openproject')
.config([ .config([
'$stateProvider', '$stateProvider',
'$urlRouterProvider', '$urlRouterProvider',
function($stateProvider, $urlRouterProvider) { '$urlMatcherFactoryProvider',
function($stateProvider, $urlRouterProvider, $urlMatcherFactoryProvider) {
(function() {
function valToString(val) { return val !== null ? val.toString() : val; }
function valFromString(val) { return val !== null ? val.toString() : val; }
function regexpMatches(val) { /*jshint validthis:true */ return this.pattern.test(val); }
$urlMatcherFactoryProvider.type('projectPathType', {
encode: valToString,
decode: valFromString,
is: regexpMatches,
pattern: /.*/
});
})();
$stateProvider $stateProvider
.state('work-packages', { .state('work-packages', {
url: '{projectPath:.*}/work_packages?query_id', url: '{projectPath:projectPathType}/work_packages?query_id',
abstract: true, abstract: true,
templateUrl: "/templates/work_packages.html", templateUrl: "/templates/work_packages.html",
controller: 'WorkPackagesController', controller: 'WorkPackagesController',

Loading…
Cancel
Save