Download as
Browse Code »

Commit 22745db92b7e1cf5f706206754706b4d6933b7a8

Authored by Rodrigo Souto
2 parents 6b1838f7 56b00143
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'stable'

Showing 2 changed files with 5 additions and 5 deletions   Show diff stats
plugins/work_assignment/lib/work_assignment_plugin/helper.rb
  Diff comments   View file @22745db
@@ -7,8 +7,8 @@ module WorkAssignmentPlugin::Helper @@ -7,8 +7,8 @@ module WorkAssignmentPlugin::Helper
7 content_tag('th', _('Submission date')) + 7 content_tag('th', _('Submission date')) +
8 content_tag('th', _('Versions'), :style => 'text-align: center') + 8 content_tag('th', _('Versions'), :style => 'text-align: center') +
9 content_tag('th', '') 9 content_tag('th', '')
10 - ) +  
11 - work_assignment.children.map {|author_folder| display_author_folder(author_folder, user)}.join("\n") 10 + ).html_safe +
  11 + work_assignment.children.map {|author_folder| display_author_folder(author_folder, user)}.join("\n").html_safe
12 ) 12 )
13 end 13 end
14 14
@@ -19,8 +19,8 @@ module WorkAssignmentPlugin::Helper @@ -19,8 +19,8 @@ module WorkAssignmentPlugin::Helper
19 content_tag('td', time_format(author_folder.children.last.created_at)) + 19 content_tag('td', time_format(author_folder.children.last.created_at)) +
20 content_tag('td', author_folder.children.count, :style => 'text-align: center') + 20 content_tag('td', author_folder.children.count, :style => 'text-align: center') +
21 content_tag('td', content_tag('button', _('View all versions'), :class => 'view-author-versions', 'data-folder-id' => author_folder.id)) 21 content_tag('td', content_tag('button', _('View all versions'), :class => 'view-author-versions', 'data-folder-id' => author_folder.id))
22 - ) +  
23 - author_folder.children.map {|submission| display_submission(submission, user)}.join("\n") 22 + ).html_safe +
  23 + author_folder.children.map {|submission| display_submission(submission, user)}.join("\n").html_safe
24 end 24 end
25 25
26 def display_submission(submission, user) 26 def display_submission(submission, user)
script/noosfero-plugins
  Diff comments   View file @22745db
@@ -96,7 +96,7 @@ _enable(){ @@ -96,7 +96,7 @@ _enable(){
96 plugins_public_dir="$NOOSFERO_DIR/public/plugins" 96 plugins_public_dir="$NOOSFERO_DIR/public/plugins"
97 plugins_features_dir="$NOOSFERO_DIR/features/plugins" 97 plugins_features_dir="$NOOSFERO_DIR/features/plugins"
98 test -d "$target/public/" && ln -s "$target/public" "$plugins_public_dir/$plugin" 98 test -d "$target/public/" && ln -s "$target/public" "$plugins_public_dir/$plugin"
99 - test -d "$target/features" && ln -s "$target/features" "$plugins_features_dir/$plugin" 99 + test -d "$NOOSFERO_DIR/features" && test -d "$target/features" && ln -s "$target/features" "$plugins_features_dir/$plugin"
100 _say "$plugin enabled" 100 _say "$plugin enabled"
101 run "$source/after_enable.rb" 101 run "$source/after_enable.rb"
102 needs_migrate=true 102 needs_migrate=true