Merge branch 'release/0.6.18.1'

ulmic · May 18, 2016 · 7133a57 · 7133a57
2 parents e4641ff + 4a6b96e
commit 7133a57
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/app/views/layouts/web/admin/_navbar.html.haml b/app/views/layouts/web/admin/_navbar.html.haml
@@ -45,7 +45,7 @@
         = admin_menu_item Article, admin_articles_path
         = admin_menu_item Category, admin_categories_path
         = admin_menu_item Letter, admin_letters_path, :envelope
-    - if current_user.role.admin?
+    - if current_user.role.in? ['admin', 'tech_admin']
       %ul.nav.navbar-nav.navbar-right
         = admin_menu_item '', admin_path, :home
         = admin_menu_item @notification_count, admin_unviewed_index_path, 'info-sign'

diff --git a/app/views/web/admin/images/_list.html.haml b/app/views/web/admin/images/_list.html.haml
@@ -16,7 +16,7 @@
       %tr.link{ class: state_color(image), data: { href: edit_admin_image_path(image) } }
         %td= image.id
         %td= image_tag image.file.small
-        %td=l image.date, format: '%d.%m.%Y'
+        %td= l(image.date, format: '%d.%m.%Y') if image.date.present?
         %td= image.present_author
         %td= enumerize_locales_value image, :image_type
         - if searching?