[Git][noosfero/noosfero][master] 2 commits: work_assignment: order folder and versions

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
24a897bc by Braulio Bhavamitra at 2015-06-30T14:25:10Z
work_assignment: order folder and versions

- - - - -
e46033bd by Braulio Bhavamitra at 2015-08-10T18:40:25Z
Merge branch 'work-assignment-order' into noosfero

- - - - -


1 changed file:

- plugins/work_assignment/lib/work_assignment_plugin/helper.rb


Changes:

=====================================
plugins/work_assignment/lib/work_assignment_plugin/helper.rb
=====================================
--- a/plugins/work_assignment/lib/work_assignment_plugin/helper.rb
+++ b/plugins/work_assignment/lib/work_assignment_plugin/helper.rb
@@ -1,6 +1,6 @@
 module WorkAssignmentPlugin::Helper
   include CmsHelper
-  
+
   def display_submissions(work_assignment, user)
     return if work_assignment.submissions.empty?
     content_tag('table',
@@ -11,7 +11,7 @@ module WorkAssignmentPlugin::Helper
         content_tag('th', '') +
         content_tag('th', '')
       ).html_safe +
-      work_assignment.children.map {|author_folder| display_author_folder(author_folder, user)}.join("\n").html_safe
+      work_assignment.children.order('name ASC').map {|author_folder| display_author_folder(author_folder, user)}.join("\n").html_safe
     )
   end
 
@@ -24,7 +24,7 @@ module WorkAssignmentPlugin::Helper
       content_tag('td', content_tag('button', _('View all versions'), :class => 'view-author-versions', 'data-folder-id' => author_folder.id)) +
       content_tag('td', display_privacy_button(author_folder, user))
     ).html_safe +
-    author_folder.children.map {|submission| display_submission(submission, user)}.join("\n").html_safe
+    author_folder.children.order('created_at DESC').map {|submission| display_submission(submission, user)}.join("\n").html_safe
   end
 
   def display_submission(submission, user)
@@ -32,7 +32,7 @@ module WorkAssignmentPlugin::Helper
       content_tag('td', link_to_submission(submission, user)) +
       content_tag('td', time_format(submission.created_at))+
       content_tag('td', '') +
-      content_tag('td', 
+      content_tag('td',
         if submission.parent.parent.allow_post_content?(user)
           display_delete_button(submission)
         end
@@ -67,7 +67,7 @@ module WorkAssignmentPlugin::Helper
   end
 
   def display_delete_button(article)
-    expirable_button article, :delete, _('Delete'), 
+    expirable_button article, :delete, _('Delete'),
     {:controller =>'cms', :action => 'destroy', :id => article.id },
     :method => :post, :confirm => delete_article_message(article)
   end



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/b9225f6a67f16b98f419cba8adee1ae8d53ca1b0...e46033bd5016beca5f189527091e1a35a66ef565
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150810/51db161b/attachment-0001.html>