diff options
| -rwxr-xr-x | gm/rebaseline_server/server.py | 10 | ||||
| -rw-r--r-- | gm/rebaseline_server/static/constants.js | 7 | ||||
| -rw-r--r-- | gm/rebaseline_server/static/loader.js | 12 |
3 files changed, 8 insertions, 21 deletions
diff --git a/gm/rebaseline_server/server.py b/gm/rebaseline_server/server.py index a10bc8c213..ee4d299a3d 100755 --- a/gm/rebaseline_server/server.py +++ b/gm/rebaseline_server/server.py @@ -65,11 +65,6 @@ MIME_TYPE_MAP = {'': 'application/octet-stream', KEY__EDITS__MODIFICATIONS = 'modifications' KEY__EDITS__OLD_RESULTS_HASH = 'oldResultsHash' KEY__EDITS__OLD_RESULTS_TYPE = 'oldResultsType' -URL_KEY__SCHEMA_VERSION = 'urlSchemaVersion' -URL_VALUE__SCHEMA_VERSION__CURRENT = 0 -# always interpret as then-current schema version; -# used for toplevel links on index page -URL_VALUE__SCHEMA_VERSION__ALWAYS_CURRENT = 'current' DEFAULT_ACTUALS_DIR = results_mod.DEFAULT_ACTUALS_DIR DEFAULT_GM_SUMMARIES_BUCKET = download_actuals.GM_SUMMARIES_BUCKET @@ -169,14 +164,11 @@ def _create_index(file_path, config_pairs): for summary_type in SUMMARY_TYPES: file_handle.write( '<li><a href="/{static_subdir}/view.html#/view.html?' - '{version_key}={version_value}&' 'resultsToLoad=/{results_subdir}/{summary_type}">' '{summary_type}</a></li>'.format( results_subdir=RESULTS_SUBDIR, static_subdir=STATIC_CONTENTS_SUBDIR, - summary_type=summary_type, - version_key=URL_KEY__SCHEMA_VERSION, - version_value=URL_VALUE__SCHEMA_VERSION__ALWAYS_CURRENT)) + summary_type=summary_type)) file_handle.write('</ul>') if config_pairs: file_handle.write('<li>Comparing configs within actual results</li><ul>') diff --git a/gm/rebaseline_server/static/constants.js b/gm/rebaseline_server/static/constants.js index 55751d1e21..900bac59c4 100644 --- a/gm/rebaseline_server/static/constants.js +++ b/gm/rebaseline_server/static/constants.js @@ -73,13 +73,10 @@ module.constant('constants', (function() { KEY__EDITS__MODIFICATIONS: 'modifications', KEY__EDITS__OLD_RESULTS_HASH: 'oldResultsHash', KEY__EDITS__OLD_RESULTS_TYPE: 'oldResultsType', - URL_KEY__SCHEMA_VERSION: 'urlSchemaVersion', - URL_VALUE__SCHEMA_VERSION__CURRENT: 0, - // always interpret as then-current schema version; - // used for toplevel links on index page - URL_VALUE__SCHEMA_VERSION__ALWAYS_CURRENT: 'current', // These are just used on the client side, no need to sync with server code. KEY__IMAGEPAIRS__ROWSPAN: 'rowspan', + URL_KEY__SCHEMA_VERSION: 'urlSchemaVersion', + URL_VALUE__SCHEMA_VERSION__CURRENT: 0, } })()) diff --git a/gm/rebaseline_server/static/loader.js b/gm/rebaseline_server/static/loader.js index dbded05f25..8df00e3567 100644 --- a/gm/rebaseline_server/static/loader.js +++ b/gm/rebaseline_server/static/loader.js @@ -427,14 +427,12 @@ Loader.controller( $scope.queryParameters.load = function() { var nameValuePairs = $location.search(); - var urlSchemaVersion = nameValuePairs[constants.URL_KEY__SCHEMA_VERSION]; - if (!urlSchemaVersion) { - $scope.urlSchemaVersionLoaded = 0; - } else if (urlSchemaVersion == constants.URL_VALUE__SCHEMA_VERSION__ALWAYS_CURRENT) { - $scope.urlSchemaVersionLoaded = constants.URL_VALUE__SCHEMA_VERSION__CURRENT; - } else { - $scope.urlSchemaVersionLoaded = urlSchemaVersion; + // If urlSchemaVersion is not specified, we assume the current version. + var urlSchemaVersion = constants.URL_VALUE__SCHEMA_VERSION__CURRENT; + if (constants.URL_KEY__SCHEMA_VERSION in nameValuePairs) { + urlSchemaVersion = nameValuePairs[constants.URL_KEY__SCHEMA_VERSION]; } + $scope.urlSchemaVersionLoaded = urlSchemaVersion; angular.forEach($scope.queryParameters.map, function(copier, paramName) { |