[llvm-commits] [LNT] r162537 - in /lnt/trunk/lnt/server: db/testsuite.py ui/templates/v4_global_status.html

[Michael Gottesman]

Author: mgottesman
Date: Fri Aug 24 00:25:43 2012
New Revision: 162537

URL: http://llvm.org/viewvc/llvm-project?rev=162537&view=rev
Log:
[LNT] Moved title computation for global status page into a property. *NOTE* I created a mixin field class
to handle this so this sort of computation can be performed on ALL fields.

Modified:
    lnt/trunk/lnt/server/db/testsuite.py
    lnt/trunk/lnt/server/ui/templates/v4_global_status.html

Modified: lnt/trunk/lnt/server/db/testsuite.py
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/db/testsuite.py?rev=162537&r1=162536&r2=162537&view=diff
==============================================================================
--- lnt/trunk/lnt/server/db/testsuite.py (original)
+++ lnt/trunk/lnt/server/db/testsuite.py Fri Aug 24 00:25:43 2012
@@ -81,7 +81,16 @@
         return '%s%r' % (self.__class__.__name__, (self.name, self.db_key_name,
                                                    self.version))
 
-class MachineField(Base):
+class FieldMixin(object):
+    
+    @property
+    def title(self):
+        """ Return a title for the given field by replacing all _ with
+            spaces and that has every word capitalized.
+        """
+        return self.name.replace("_", " ").title()
+
+class MachineField(FieldMixin, Base):
     __tablename__ = 'TestSuiteMachineFields'
 
     id = Column("ID", Integer, primary_key=True)
@@ -105,7 +114,7 @@
     def __repr__(self):
         return '%s%r' % (self.__class__.__name__, (self.name, self.info_key))
 
-class OrderField(Base):
+class OrderField(FieldMixin, Base):
     __tablename__ = 'TestSuiteOrderFields'
 
     id = Column("ID", Integer, primary_key=True)
@@ -137,7 +146,7 @@
         return '%s%r' % (self.__class__.__name__, (self.name, self.info_key,
                                                    self.ordinal))
 
-class RunField(Base):
+class RunField(FieldMixin, Base):
     __tablename__ = 'TestSuiteRunFields'
 
     id = Column("ID", Integer, primary_key=True)
@@ -161,7 +170,7 @@
     def __repr__(self):
         return '%s%r' % (self.__class__.__name__, (self.name, self.info_key))
 
-class SampleField(Base):
+class SampleField(FieldMixin, Base):
     __tablename__ = 'TestSuiteSampleFields'
 
     id = Column("ID", Integer, primary_key=True)

Modified: lnt/trunk/lnt/server/ui/templates/v4_global_status.html
URL: http://llvm.org/viewvc/llvm-project/lnt/trunk/lnt/server/ui/templates/v4_global_status.html?rev=162537&r1=162536&r2=162537&view=diff
==============================================================================
--- lnt/trunk/lnt/server/ui/templates/v4_global_status.html (original)
+++ lnt/trunk/lnt/server/ui/templates/v4_global_status.html Fri Aug 24 00:25:43 2012
@@ -49,9 +49,7 @@
         </style>
 {% endblock %}
 
-{% block title %}Global Status - {{
-        selected_field.name.replace("_", " ").title() }}
-{% endblock %}
+{% block title %}Global Status - {{ selected_field.title }}{% endblock %}
 
 {% block body %}
 {#