Skip to content
Snippets Groups Projects
Unverified Commit 8f0397aa authored by Sébastien Gaya's avatar Sébastien Gaya
Browse files

Merge branch 'master' of github.com:noesya/osuny

parents c57ee2e6 bc83a860
No related branches found
No related tags found
No related merge requests found
......@@ -20,12 +20,12 @@
ability: can?(:read, Communication::Website::Post)
},
{
title: Communication::Website::Category.model_name.human(count: 2),
title: "  - #{Communication::Website::Category.model_name.human(count: 2)}",
path: admin_communication_website_categories_path(website_id: @website),
ability: can?(:read, Communication::Website::Category)
},
{
title: t('communication.authors', count: 2),
title: "  - #{t('communication.authors', count: 2)}",
path: admin_communication_website_authors_path(website_id: @website),
ability: can?(:read, University::Person)
},
......@@ -39,7 +39,7 @@
active = object[:path].in? request.path
%>
<a class="list-group-item list-group-item-action<%= ' active' if active %>" href="<%= object[:path] %>">
<%= object[:title] %>
<%= object[:title].html_safe %>
</a>
<% end %>
</div>
......
......@@ -78,7 +78,7 @@
label: false,
input_html: { accept: '.jpg,.jpeg,.png,.svg' },
preview: 200,
resize: 1,
resize: false,
direct_upload: true %>
</div>
</div>
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment