Skip to content
Snippets Groups Projects
Commit dde4d3d2 authored by Mauricio Giacomini Girardello's avatar Mauricio Giacomini Girardello
Browse files

Merge branch 'hotfix-add-button-to-delete-learning-object' into 'master' 

Hotfix add button to delete learning object



See merge request !214
parents 2790d9de 9fccf980
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
app/controllers/chunks_controller.rb
+ 3
− 1
View file @ dde4d3d2
......@@ -113,7 +113,9 @@ class ChunksController < ApplicationController
end
def valid_mime_type?
@learning_object.object_type.mime_types.map(&:extension).include? resumable_file_extension
mime_types = @learning_object.object_type.mime_types.map(&:extension)
return true if mime_types.empty?
mime_types.include? resumable_file_extension
end
# Never trust parameters from the scary internet, only allow the white list through.
def chunks_params
......
app/controllers/learning_objects_controller.rb
+ 1
− 1
View file @ dde4d3d2
......@@ -64,7 +64,7 @@ class LearningObjectsController < ApplicationController
LearningObject.destroy @learning_object
respond_to do |format|
format.html { redirect_to learning_objects_url, notice: t('activerecord.attributes.learning_object.destroy.notice.successfully_destroy') }
format.html { redirect_to user_path(current_user), notice: t('activerecord.attributes.learning_object.destroy.notice.successfully_destroy') }
end
end
......
app/views/learning_objects/show.html.erb
+ 91
− 84
View file @ dde4d3d2
<% content_for(:body_attributes) do %>data-no-turbolink="true"<% end %>
<% if @learning_object.state == 'suspended' %>
<h2> Este conteúdo está suspenso! </h2>
<h2> Este conteúdo está suspenso! </h2>
<% end %>
<div class="row learning-object">
......@@ -16,7 +16,7 @@
<br/><br/>
<h2 class="title"><%= learning_object_title(@learning_object) %></h2>
<% unless @learning_object.description.nil? %>
<p class="description"><%= @learning_object.description %></p>
<p class="description"><%= @learning_object.description %></p>
<% end %>
<span class="category"><%= ("Em " + show_categories(@learning_object.categories)) unless @learning_object.categories.nil? %></span>
</div>
......@@ -25,27 +25,26 @@
<div class="col-md-5">
<div class="rightbar">
<% unless @learning_object.author.blank? %>
<div class="media">
<div class="media-left">
<a href="#"><img class="user-image-small" src="<%#= current_user.avatar.url(:thumb) %><%= asset_path('user-anon.png')%>" alt="Foto do usuário"/></a>
</div>
<div class="media-body">
<h5>Autor</h5>
<h3><%= @learning_object.author %></h3>
</div>
</div>
<div class="media">
<div class="media-left">
<a href="#"><img class="user-image-small" src="<%#= current_user.avatar.url(:thumb) %><%= asset_path('user-anon.png')%>" alt="Foto do usuário"/></a>
</div>
<div class="media-body">
<h5>Autor</h5>
<h3><%= @learning_object.author %></h3>
</div>
<% end %>
<% unless @learning_object.publisher.nil? %>
<div class="media">
<div class="media-left">
<a href="#"><img class="user-image-small" src="<%#= current_user.avatar.url(:thumb) %><%= asset_path('user-anon.png')%>" alt="Foto do usuário"/></a>
</div>
<div class="media-body">
<% publisher_type = @learning_object.publisher.class %>
<h5><%= publisher_type == User ? 'Adicionado por' : 'Origem'%></h5>
<h3 class="media-heading"><%= @learning_object.publisher.name %></h3>
<div class="media">
<div class="media-left">
<a href="#"><img class="user-image-small" src="<%#= current_user.avatar.url(:thumb) %><%= asset_path('user-anon.png')%>" alt="Foto do usuário"/></a>
</div>
<div class="media-body">
<% publisher_type = @learning_object.publisher.class %>
<h5><%= publisher_type == User ? 'Adicionado por' : 'Origem'%></h5>
<h3 class="media-heading"><%= @learning_object.publisher.name %></h3>
</div>
</div>
</div>
<% end %>
<div class="panel panel-default">
<h3>Detalhes do Objeto</h3>
......@@ -58,58 +57,67 @@
</div>
<div class="rating-panel">
<% if user_signed_in? %>
<div class="actions">
<div class="action download">
<div class="actions">
<div class="action download">
<%= link_to download_learning_object_path, class: 'download btn btn-success', target: "_blank" do %>
<i class="fa fa-download"></i>FAZER DOWNLOAD
<i class="fa fa-download"></i>FAZER DOWNLOAD
<%end%>
</div>
<div class="action">
<%= link_to like_learning_object_path(id: @learning_object.id), class: 'vote btn btn-primary',method: :post, remote: true do %>
<% if @liked %>
<%= image_tag "icons/btn_like_down.png", alt: "Descurtir" %>
<% else %>
<%= image_tag "icons/btn_like_up.png", alt: "Curtir" %>
<% end %>
</div>
<div class="action">
<%= link_to like_learning_object_path(id: @learning_object.id), class: 'vote btn btn-primary',method: :post, remote: true do %>
<% if @liked %>
<%= image_tag "icons/btn_like_down.png", alt: "Descurtir" %>
<% else %>
<%= image_tag "icons/btn_like_up.png", alt: "Curtir" %>
<% end %>
<% end %>
</div>
<div class="action">
<a tabindex="0" class="add-to-collection btn btn-primary" role="button" title="Adicionar as coleções" data-loid="<%= @learning_object.id %>">
<%= image_tag "icons/btn_add.png", alt: "Adicionar à coleção" %>
</a>
</div>
<div class="action">
<%= link_to bookmark_add_path(id: @learning_object.id, type: @learning_object.class.to_s), class:"btn btn-primary bookmark", title: "Adicionar aos favoritos", method: :post, remote: true do %>
<i class="fa fa-bookmark"></i>
<%end%>
</div>
<div class="action">
<%= render 'complaints/complaints_button' %>
</div>
<div class="action">
<a tabindex="1" class="btn btn-primary share" role="button" title="Compartilhar" data-toggle="modal" data-target="#share_modal">
<i class="fa fa-share"></i>
<%#= image_tag "icons/collection-add.png", alt: "Compartilhar" %>
</a>
<%= render 'share_modal' %>
</div>
<% if policy(@learning_object).update? %>
<div class="action">
<a tabindex="1" class="btn btn-primary share" role="button" title="Editar conteúdo" href="<%= edit_learning_object_path(@learning_object) %>">
<i class="fa fa-pencil"></i>
</a>
</div>
<% end %>
</div>
<div class="action">
<a tabindex="0" class="add-to-collection btn btn-primary" role="button" title="Adicionar as coleções" data-loid="<%= @learning_object.id %>">
<%= image_tag "icons/btn_add.png", alt: "Adicionar à coleção" %>
</a>
</div>
<div class="action">
<%= link_to bookmark_add_path(id: @learning_object.id, type: @learning_object.class.to_s), class:"btn btn-primary bookmark", title: "Adicionar aos favoritos", method: :post, remote: true do %>
<i class="fa fa-bookmark"></i>
<%end%>
</div>
<div class="action">
<%= render 'complaints/complaints_button' %>
</div>
<div class="action">
<a tabindex="1" class="btn btn-primary share" role="button" title="Compartilhar" data-toggle="modal" data-target="#share_modal">
<i class="fa fa-share"></i>
<%#= image_tag "icons/collection-add.png", alt: "Compartilhar" %>
</a>
<%= render 'share_modal' %>
</div>
<% if policy(@learning_object).update? %>
<div class="action">
<a tabindex="1" class="btn btn-primary share" role="button" title="Editar conteúdo" href="<%= edit_learning_object_path(@learning_object) %>">
<i class="fa fa-pencil"></i>
</a>
</div>
<% end %>
<% if policy(@learning_object).destroy? %>
<div class="action">
<a tabindex="1" data-method='delete' class="btn btn-primary share" role="button" title="Deletar conteúdo" href="<%= learning_object_path(@learning_object) %>" data-confirm="Você tem certeza que quer deletar esse objeto?">
<i class="fa fa-trash"></i>
</a>
</div>
<% end %>
</div>
</div>
<% else %>
<div class="login-info">
<%= image_tag "icons/i_estilizado.png"%>
<h4>Logue-se para poder curtir, adicionar o objeto em uma coleção, baixar o counteúdo ou denunciar.</h4>
</div>
<div class="login-info">
<%= image_tag "icons/i_estilizado.png"%>
<h4>Logue-se para poder curtir, adicionar o objeto em uma coleção, baixar o counteúdo ou denunciar.</h4>
</div>
<% end %>
</div>
</div>
</div>
</div>
</div>
......@@ -123,33 +131,32 @@
<button type="button" class="close" data-dismiss="modal" aria-label="Fechar"><span aria-hidden="true">&times;</span></button>
<h4 class="modal-title" id="extra_metadata_modal_label">Metadados Adicionais</h4>
</div>
<div class="modal-body" style="text-align:justify">
<div class="container-fluid">
<div class="row">
<div class="col-sm-12">
<ul>
<li><b>Autor:</b> <%= @learning_object.author %></li>
<li><b>Tipo:</b> <%= @learning_object.get_metadata_value_of("dc.type") %></li>
<li><b>Data:</b> <%= @learning_object.get_metadata_value_of("dc.date.available") %></li>
<li><b>Linguagem:</b> <%= @learning_object.get_metadata_value_of("dc.language") %></li>
</ul>
<table class="table table-striped">
<% @learning_object.metadata.each do |m| %>
<div class="modal-body" style="text-align:justify">
<div class="container-fluid">
<div class="row">
<div class="col-sm-12">
<ul>
<li><b>Autor:</b> <%= @learning_object.author %></li>
<li><b>Tipo:</b> <%= @learning_object.get_metadata_value_of("dc.type") %></li>
<li><b>Data:</b> <%= @learning_object.get_metadata_value_of("dc.date.available") %></li>
<li><b>Linguagem:</b> <%= @learning_object.get_metadata_value_of("dc.language") %></li>
</ul>
<table class="table table-striped">
<% @learning_object.metadata.each do |m| %>
<tr>
<th><span><%= "#{m["key"]}:" %></span></th>
<td><%= "#{m["value"]}" %></td>
</tr>
<% end %>
</table>
</div>
<% end %>
</table>
</div>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Fechar</button>
</div>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Fechar</button>
</div>
</div>
</div>
</div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment