Merge branch 'main' into avm99963-monorail
Merged commit 34d8229ae2b51fb1a15bd208e6fe6185c94f6266
GitOrigin-RevId: 7ee0917f93a577e475f8e09526dd144d245593f4
diff --git a/framework/grid_view_helpers.py b/framework/grid_view_helpers.py
index 44af6b7..2ed4e70 100644
--- a/framework/grid_view_helpers.py
+++ b/framework/grid_view_helpers.py
@@ -1,7 +1,6 @@
-# Copyright 2016 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style
-# license that can be found in the LICENSE file or at
-# https://developers.google.com/open-source/licenses/bsd
+# Copyright 2016 The Chromium Authors
+# Use of this source code is governed by a BSD-style license that can be
+# found in the LICENSE file.
"""Classes and functions for displaying grids of project artifacts.
@@ -24,7 +23,7 @@
from framework import table_view_helpers
from framework import template_helpers
from framework import urls
-from proto import tracker_pb2
+from mrproto import tracker_pb2
from tracker import tracker_bizobj
from tracker import tracker_constants
from tracker import tracker_helpers
@@ -87,7 +86,7 @@
return sorting.MAX_STRING # Undefined values sort last.
try:
# well-known values sort by index
- return well_known_list.index(value)
+ return '%09d' % well_known_list.index(value)
except ValueError:
return value # odd-ball values lexicographically after all well-known ones