From 43dc8e6a07b27fab5d9436deb4f3fd393df74581 Mon Sep 17 00:00:00 2001
From: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
Date: Fri, 4 Dec 2015 09:49:20 -0200
Subject: [PATCH] Fixed CollectionBuilder
Signed-off-by: Israel Barreto Sant'Anna <ibsa14@inf.ufpr.br>
---
app/builders/collection_builder.rb | 23 ++---------------------
1 file changed, 2 insertions(+), 21 deletions(-)
diff --git a/app/builders/collection_builder.rb b/app/builders/collection_builder.rb
index 7c1b3d0c..16513532 100644
--- a/app/builders/collection_builder.rb
+++ b/app/builders/collection_builder.rb
@@ -14,29 +14,11 @@ class CollectionBuilder < Builder
end
def self.build_from_orientdb(args = {})
-<<<<<<< HEAD
- lo = nil
- unless args.nil?
- # cache object when build
- lo = Rails.cache.fetch(cache_key(args['@rid'], args['last_modified']), expires_in: 12.hours) do
- type = (args['name'] == 'Bookmarks') ? Bookmarks : Collection
- learning_objects = args['learning_objects'].nil? ? [] : LearningObjectBuilder.build(map_rid_to_object(args['learning_objects']))
- obj = type.new(
- learning_objects: learning_objects,
- privacy: args['privacy'],
- 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?
- obj
- end
-=======
super(args) do
type = (args['name'] == 'Bookmarks') ? Bookmarks : Collection
+ learning_objects = args['learning_objects'].nil? ? [] : LearningObjectBuilder.build(map_rid_to_object(args['learning_objects']))
obj = type.new(
- learning_objects: LearningObjectBuilder.build(map_rid_to_object(args['learning_objects']) || []),
+ learning_objects: learning_objects,
privacy: args['privacy'],
id: args['@rid']
)
@@ -45,7 +27,6 @@ class CollectionBuilder < Builder
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?
obj
->>>>>>> master
end
end
--
GitLab