Workaround for showing submissions without language

moschlar · Nov 14, 2013 · cdcfc4e · cdcfc4e
1 parent 185183b
commit cdcfc4e
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/sauce/controllers/submissions.py b/sauce/controllers/submissions.py
@@ -97,6 +97,7 @@ def index(self, *args, **kwargs):
     @expose('sauce.templates.submission_show')
     def show(self, *args, **kwargs):
         c.pygmentize = Pygmentize(
+            lexer_name=self.submission.language.lexer_name if self.submission.language else '',
             formatter_args=dict(
                 linenos='table',
                 lineanchors='line',
@@ -183,6 +184,7 @@ def judge(self, *args, **kwargs):
 
         c.judgement_form = JudgementForm(action=url('./judge_'))
         c.pygmentize = Pygmentize(
+            lexer_name=self.submission.language.lexer_name if self.submission.language else '',
             formatter_args=dict(
                 linenos='table',
                 lineanchors='line',
@@ -365,6 +367,7 @@ def source(self, what=None, style='default', linenos=True, *args, **kwargs):
             src = self.submission.source
 
         pyg = Pygmentize(
+            lexer_name=self.submission.language.lexer_name if self.submission.language else '',
             formatter_args=dict(
                 full=True,
                 title='Submission %d' % (self.submission.id),
@@ -374,8 +377,7 @@ def source(self, what=None, style='default', linenos=True, *args, **kwargs):
             )
         )
 
-        return pyg.display(lexer_name=self.submission.language.lexer_name,
-                           source=src)
+        return pyg.display(source=src)
 
 
 class SubmissionsController(TGController):

diff --git a/sauce/templates/submission.mak b/sauce/templates/submission.mak
@@ -189,7 +189,7 @@ ${next.body()}
     </p>
 
   <div>
-    ${c.pygmentize.display(id="source_container", lexer_name=submission.language.lexer_name, source=submission.source) | n}
+    ${c.pygmentize.display(id="source_container", source=submission.source) | n}
   </div>
 
   % else:
@@ -225,7 +225,7 @@ ${next.body()}
       <a href="${judgement.submission.url}/source/judgement" class="btn btn-mini"><i class="icon-file"></i>&nbsp;Full page</a>
       <a href="${judgement.submission.url}/download/judgement" class="btn btn-mini"><i class="icon-download-alt"></i>&nbsp;Download</a>
     </p>
-    ${c.pygmentize.display(lexer_name=judgement.submission.language.lexer_name, source=judgement.corrected_source) | n}
+    ${c.pygmentize.display(source=judgement.corrected_source) | n}
 
     <h4>Diff</h4>
     ${c.pygmentize.display(lexer_name='diff', source=judgement.diff) | n}