Merge branch 'master' of gitlab.c3sl.ufpr.br:portalmec/portalmec

app/helpers/learning_objects_helper.rb

@@ -4,9 +4,13 @@ module LearningObjectsHelper
     categories.to_s
   end
 
-  def learning_object_thumbnail(learning_object)
-    if learning_object.thumbnail == "thumbnai"
-      image_tag('learning-object-preview.png')
+  def learning_object_thumbnail(learning_object, size = "")
+    if learning_object.thumbnail.nil? || learning_object.thumbnail == "thumbnai" # TODO: remove "thumbnai" when possible
+      if size == "large"
+        image_tag('learning-object-preview-large.png')
+      else
+        image_tag('learning-object-preview.png')
+      end
     else
       image_tag learning_object.thumbnail, alt: learning_object_title(learning_object)
     end

app/repositories/orient_db/base.rb

@@ -20,7 +20,7 @@ class OrientDb::Base
   end
 
   def all_from_offset_to_limit(offset, limit)
-    objects_hash = connection.query "SELECT FROM #{odb_class} SKIP #{offset}", :limit => limit
+    objects_hash = connection.query "SELECT FROM #{odb_class} LIMIT #{limit} SKIP #{offset}", :limit => limit
     objects = build_objects(objects_hash) || []
   end
 

app/views/learning_objects/show.html.erb

@@ -25,13 +25,7 @@
 
 <div class="row learning-object">
   <div class="col-md-7">
-    <%=
-      if (@learning_object.thumbnail == "thumbnai")
-        image_tag 'learning-object-preview-large.png', class: "thumbnail"
-      else
-        image_tag @learning_object.thumbnail, class: "thumbnail"
-      end
-    %>
+    <%= learning_object_thumbnail @learning_object, "large" %>
     <div class="stats">
       <span class="glyphicon glyphicon-eye-open"><%= @learning_object.views %>&nbsp;</span>
       <span class="glyphicon glyphicon-star"><%= @learning_object.likes %>&nbsp;</span>

lib/tasks/thumbnail.rake

@@ -15,7 +15,7 @@ namespace :thumbnail do
 
       begin
         # Get items from dspace (from offset to offset+limit)
-        items = learning_object_repository.all_from_offset_to_limit(limit,offset)
+        items = learning_object_repository.all_from_offset_to_limit(offset,limit)
       rescue
         # Sleeps for a while to wait database's recovery
         sleep(30.seconds)