rebaseline_server: generate JSON that can be viewed without a live server

BUG=skia:1919
NOTREECHECKS=True
NOTRY=True
R=rmistry@google.com

Author: epoger@google.com

Review URL: https://codereview.chromium.org/195943004

git-svn-id: http://skia.googlecode.com/svn/trunk@13783 2bbb7eff-a529-9590-31e7-b0007b416f81

3 files changed, 13 insertions, 13 deletions

diff --git a/gm/rebaseline_server/static/constants.js b/gm/rebaseline_server/static/constants.js
index 00c1852458..f795b6f4d6 100644
--- a/gm/rebaseline_server/static/constants.js
+++ b/gm/rebaseline_server/static/constants.js
@@ -45,8 +45,16 @@ module.constant('constants', (function() {
     KEY__EXTRACOLUMN__CONFIG: 'config',
     KEY__EXTRACOLUMN__RESULT_TYPE: 'resultType',
     KEY__EXTRACOLUMN__TEST: 'test',
+    KEY__HEADER: 'header',
+    KEY__HEADER__DATAHASH: 'dataHash',
+    KEY__HEADER__IS_EDITABLE: 'isEditable',
+    KEY__HEADER__IS_EXPORTED: 'isExported',
+    KEY__HEADER__IS_STILL_LOADING: 'resultsStillLoading',
     KEY__HEADER__RESULTS_ALL: 'all',
     KEY__HEADER__RESULTS_FAILURES: 'failures',
+    KEY__HEADER__TIME_NEXT_UPDATE_AVAILABLE: 'timeNextUpdateAvailable',
+    KEY__HEADER__TIME_UPDATED: 'timeUpdated',
+    KEY__HEADER__TYPE: 'type',
     KEY__NEW_IMAGE_URL: 'newImageUrl',
     KEY__RESULT_TYPE__FAILED: 'failed',
     KEY__RESULT_TYPE__FAILUREIGNORED: 'failure-ignored',
@@ -57,13 +65,5 @@ module.constant('constants', (function() {
     KEY__EDITS__MODIFICATIONS: 'modifications',
     KEY__EDITS__OLD_RESULTS_HASH: 'oldResultsHash',
     KEY__EDITS__OLD_RESULTS_TYPE: 'oldResultsType',
-    KEY__HEADER: 'header',
-    KEY__HEADER__DATAHASH: 'dataHash',
-    KEY__HEADER__IS_EDITABLE: 'isEditable',
-    KEY__HEADER__IS_EXPORTED: 'isExported',
-    KEY__HEADER__IS_STILL_LOADING: 'resultsStillLoading',
-    KEY__HEADER__TIME_NEXT_UPDATE_AVAILABLE: 'timeNextUpdateAvailable',
-    KEY__HEADER__TIME_UPDATED: 'timeUpdated',
-    KEY__HEADER__TYPE: 'type',
   }
 })())
diff --git a/gm/rebaseline_server/static/index.html b/gm/rebaseline_server/static/index.html
index 39991e0888..df9bb0e757 100644
--- a/gm/rebaseline_server/static/index.html
+++ b/gm/rebaseline_server/static/index.html
@@ -9,13 +9,13 @@
     Here are links to the result pages:
     <ul>
       <li>
-        <a href="/static/view.html#/view.html?resultsToLoad=failures">
+        <a href="/static/view.html#/view.html?resultsToLoad=/results/failures">
           failures only
         </a>
         (loads faster)
       </li>
       <li>
-        <a href="/static/view.html#/view.html?resultsToLoad=all">
+        <a href="/static/view.html#/view.html?resultsToLoad=/results/all">
           all results
         </a>
         (includes successful test results)
diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js
index bd3be2d408..645724c194 100644
--- a/gm/rebaseline_server/static/loader.js
+++ b/gm/rebaseline_server/static/loader.js
@@ -63,7 +63,7 @@ Loader.controller(
     $scope.constants = constants;
     $scope.windowTitle = "Loading GM Results...";
     $scope.resultsToLoad = $location.search().resultsToLoad;
-    $scope.loadingMessage = "Loading results of type '" + $scope.resultsToLoad +
+    $scope.loadingMessage = "Loading results from '" + $scope.resultsToLoad +
         "', please wait...";
 
     /**
@@ -71,7 +71,7 @@ Loader.controller(
      * Once the dictionary is loaded, unhide the page elements so they can
      * render the data.
      */
-    $http.get("/results/" + $scope.resultsToLoad).success(
+    $http.get($scope.resultsToLoad).success(
       function(data, status, header, config) {
         var dataHeader = data[constants.KEY__HEADER];
         if (dataHeader[constants.KEY__HEADER__IS_STILL_LOADING]) {
@@ -166,7 +166,7 @@ Loader.controller(
       }
     ).error(
       function(data, status, header, config) {
-        $scope.loadingMessage = "Failed to load results of type '"
+        $scope.loadingMessage = "Failed to load results from '"
             + $scope.resultsToLoad + "'";
         $scope.windowTitle = "Failed to Load GM Results";
       }