Fix resolvable url routing

CSCfi · Jan 12, 2017 · 4f66370 · 4f66370
1 parent cb92ef9
commit 4f66370
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/src/routes.ts b/src/routes.ts
@@ -39,7 +39,7 @@ export function routeConfig($routeProvider: route.IRouteProvider) {
         const resource = $location.hash();
 
         if (resource) {
-          $location.url(resourceUrl(prefix, new Uri(prefix + ':' + resource, {})));
+          $location.url(resourceUrl(prefix, resource));
         } else {
           $location.url(modelUrl(prefix));
         }

diff --git a/src/utils/entity.ts b/src/utils/entity.ts
@@ -21,10 +21,14 @@ export function modelUrl(prefix: string): RelativeUrl {
   return `/model/${prefix}` + '/';
 }
 
-export function resourceUrl(modelPrefix: string, resource: Uri) {
-  const resolved = resource.resolve();
-  const linked = resolved && resolved.prefix !== modelPrefix;
-  return modelUrl(modelPrefix) +  (linked ? resource.curie : resource.name) + '/';
+export function resourceUrl(modelPrefix: string, resource: Uri|string) {
+  if (typeof resource === 'string') {
+    return modelUrl(modelPrefix) +  resource + '/';
+  } else {
+    const resolved = resource.resolve();
+    const linked = resolved && resolved.prefix !== modelPrefix;
+    return modelUrl(modelPrefix) +  (linked ? resource.curie : resource.name) + '/';
+  }
 }
 
 export function contextlessInternalUrl(destination: Destination) {