manually merge kwk#104

Author: swalberg

app/app.js

@@ -60,15 +60,15 @@ angular
         templateUrl: 'repository/repository-list.html',
         controller: 'RepositoryListController'
       }).
-      when('/repository/:repositoryUser/:repositoryName', {
+      when('/repository/:repositoryUser?/:repositoryName', {
         templateUrl: 'repository/repository-detail.html',
         controller: 'RepositoryDetailController',
       }).
       when('/repository/:repositoryUser/:repositoryName/:tagsPage?', {
         templateUrl: 'repository/repository-detail.html',
         controller: 'RepositoryDetailController'
       }).
-      when('/repository/:repositoryUser/:repositoryName/tags/:searchName?', {
+      when('/repository/:repositoryUser?/:repositoryName/tags/:searchName?', {
         templateUrl: 'repository/repository-detail.html',
         controller: 'RepositoryController',
       }).

app/repository/repository-detail-controller.js

@@ -18,7 +18,7 @@ angular.module('repository-detail-controller', ['registry-services', 'app-mode-s
     //$scope.searchTerm = $route.current.params.searchTerm;
     $scope.repositoryUser = $route.current.params.repositoryUser;
     $scope.repositoryName = $route.current.params.repositoryName;
-    $scope.repository = $scope.repositoryUser + '/' + $scope.repositoryName;
+    $scope.repository = ($scope.repositoryUser ? $scope.repositoryUser + '/' : '') + $scope.repositoryName;
 
     $scope.appMode = AppMode.query( function (result){
       $scope.tagsPerPage = result.defaultTagsPerPage

app/repository/repository-list-controller.js

@@ -17,7 +17,7 @@ angular.module('repository-list-controller', ['registry-services', 'app-mode-ser
 
     $scope.repositoryUser = $route.current.params.repositoryUser;
     $scope.repositoryName = $route.current.params.repositoryName;
-    $scope.repository = $scope.repositoryUser + '/' + $scope.repositoryName;
+    $scope.repository = ($scope.repositoryUser ? $scope.repositoryUser + '/' : '') + $scope.repositoryName;
 
     $scope.appMode = AppMode.query();