From ce95488df93ad79ab5f73a94d3ff1bc30913484e Mon Sep 17 00:00:00 2001 From: Mateus Rambo Strey <mars11@inf.ufpr.br> Date: Tue, 10 Nov 2015 18:10:06 -0200 Subject: [PATCH] build bookmarks with bookmark class --- app/builders/collection_builder.rb | 5 +++-- app/views/collections/show.html.erb | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/builders/collection_builder.rb b/app/builders/collection_builder.rb index 4613056cc..0efe568de 100644 --- a/app/builders/collection_builder.rb +++ b/app/builders/collection_builder.rb @@ -20,12 +20,13 @@ class CollectionBuilder unless args.nil? # cache object when build lo = Rails.cache.fetch(cache_key(args['@rid'], args['last_modified']), expires_in: 12.hours) do - obj = Collection.new( + type = (args['name'] == 'Bookmarks') ? Bookmarks : Collection + obj = type.new( learning_objects: LearningObjectBuilder.build(map_rid_to_object(args['learning_objects']) || []), privacy: args['privacy'], - name: args['name'], id: args['@rid'] ) + obj.name = args['name'] unless type == Bookmarks obj.owner = collection_repository.owner(args['@rid']) obj.created_at = DateTime.strptime(args['created_at'], "%Y-%m-%d %H:%M:%S") unless args['created_at'].nil? obj.last_modified = DateTime.strptime(args['last_modified'], "%Y-%m-%d %H:%M:%S") unless args['last_modified'].nil? diff --git a/app/views/collections/show.html.erb b/app/views/collections/show.html.erb index c3c29d3c4..be1ab078e 100644 --- a/app/views/collections/show.html.erb +++ b/app/views/collections/show.html.erb @@ -1,7 +1,7 @@ <nav class="navigation navbar-default "><br/> <div class="container-fluid"> - <% if @own %> + <% if @own && @collection.class != Bookmarks %> <div class="navbar-right" style="text-align:right"> <%= link_to '#' do %> <%= link_to 'APAGAR', collection_path(@collection.id), method: :delete, class: 'btn btn-danger btn-remove', style:'margin-right: 30px', data: { confirm: 'Não será possÃvel recuperá-la, você tem certeza?' } %></span> -- GitLab