From f4f9cb5e6382a23f211c4cd7cc3ee68889acbc9e Mon Sep 17 00:00:00 2001
From: tr4ck3ur <tr4ck3ur@style-python.fr>
Date: Thu, 9 Apr 2015 15:58:56 +0200
Subject: [PATCH] Fix Error 500 when try to get ressource that don't exist

---
 jm2l/templates/list_tiers.mako | 6 +++++-
 jm2l/upload.py                 | 9 ++++-----
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/jm2l/templates/list_tiers.mako b/jm2l/templates/list_tiers.mako
index baa4f7d..b11c81b 100644
--- a/jm2l/templates/list_tiers.mako
+++ b/jm2l/templates/list_tiers.mako
@@ -3,7 +3,11 @@
 <div class="row-fluid">
   <div class="span10 offset1">
 
-<a class="pull-right" href="/categorie/entity">Editer les catégories</a>
+
+<span class="pull-right">
+<a href="/entity">Ajouter une entitée</a> -
+<a href="/categorie/entity">Editer les catégories</a>
+</span>
 <br>
 <div class="tabbable" id="main_tab">
     <ul class="nav nav-tabs" style="margin-bottom: 5px;">
diff --git a/jm2l/upload.py b/jm2l/upload.py
index 063d804..9bf9144 100644
--- a/jm2l/upload.py
+++ b/jm2l/upload.py
@@ -422,7 +422,7 @@ class MediaView(MediaPath):
     def mediapath(self,name):
         return self.get_mediapath(self.media_table, self.linked_id, name)
         
-    @view_config(request_method='GET') #, http_cache = (EXPIRATION_TIME, {'public':True}))
+    @view_config(request_method='GET', http_cache = (EXPIRATION_TIME, {'public':True}))
     def get(self):
         name = self.request.matchdict.get('name')
         try:
@@ -431,10 +431,9 @@ class MediaView(MediaPath):
                 self.request.response.content_type = test
         except IOError:
             pass
-        #try:
-        if 1:
+        try:
             self.request.response.body_file = open( self.mediapath(name), 'rb', 10000)
-        #except IOError:
-        #    raise NotFound
+        except IOError:
+            raise NotFound
         return self.request.response
     ##return Response(app_iter=ImgHandle, content_type = 'image/png')