Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAngel Avila2015-10-20 14:01:45 -0400
committerRyan D. Brooks2015-10-20 14:01:45 -0400
commit9408d4d65ba756f23c173b2d26d6158ae98db877 (patch)
tree57763be1bfc61104cb0e10c6df93e80b782eaaa4 /plugins/org.eclipse.osee.web.ui
parentc15fcb82464c74e25eaddc6e834df98bdeb20558 (diff)
downloadorg.eclipse.osee-9408d4d65ba756f23c173b2d26d6158ae98db877.tar.gz
org.eclipse.osee-9408d4d65ba756f23c173b2d26d6158ae98db877.tar.xz
org.eclipse.osee-9408d4d65ba756f23c173b2d26d6158ae98db877.zip
bug: Fix imports on landing html page
Diffstat (limited to 'plugins/org.eclipse.osee.web.ui')
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js10
-rw-r--r--plugins/org.eclipse.osee.web.ui/src/osee/ui/index.html4
2 files changed, 11 insertions, 3 deletions
diff --git a/plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js b/plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js
index 51dfcee63f..2fa862d38f 100644
--- a/plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js
+++ b/plugins/org.eclipse.osee.web.ui/src/dispo/js/userController.js
@@ -435,7 +435,15 @@ app.controller('userController', [
});
if($rootScope.type == 'codeCoverage') {
- $scope.annotations.sort(function(a, b){return a.locationRefs-b.locationRefs});
+ $scope.annotations.sort(function(a, b){
+ if(a.locationRefs == undefined) {
+ return 1;
+ }
+ if(b.locationRefs == undefined) {
+ return -1;
+ }
+ return a.locationRefs-b.locationRefs
+ });
}
}
diff --git a/plugins/org.eclipse.osee.web.ui/src/osee/ui/index.html b/plugins/org.eclipse.osee.web.ui/src/osee/ui/index.html
index 5123e81127..87af996a04 100644
--- a/plugins/org.eclipse.osee.web.ui/src/osee/ui/index.html
+++ b/plugins/org.eclipse.osee.web.ui/src/osee/ui/index.html
@@ -10,7 +10,7 @@
</meta>
<link rel="stylesheet" href="/ajax/libs/bootstrap/3.3.2/css/bootstrap.min.css">
</link>
- <link rel="stylesheet" href="/ajax/libs/ui-grid/3.0.1/ui-grid.css">
+ <link rel="stylesheet" href="/ajax/libs/ui-grid/3.0.0/ui-grid.min.css">
</link>
<script src="/ajax/libs/jquery/2.1.3/jquery.min.js"></script>
<script src="/ajax/libs/angularjs/1.3.11/angular.js"></script>
@@ -22,7 +22,7 @@
<script src="/ajax/libs/oauth-ng/0.3.8/oauth-ng.js"></script>
<script src="/libs/js/oseeAuth/oseeAuth.js"></script>
<script src="/libs/js/support/linkRewrite.js"></script>
- <script src="/ajax/libs/ui-grid/3.0.1/ui-grid.js"></script>
+ <script src="/ajax/libs/ui-grid/3.0.0/ui-grid.min.js"></script>
<script src="../js/oseeApp.js"></script>
<script src="../js/meController.js"></script>
<link rel="icon" type="image/x-icon" href="images/osee.ico" />

Back to the top