Download as
Browse Code »

Commit 22745db92b7e1cf5f706206754706b4d6933b7a8

Authored by Rodrigo Souto
2 parents 6b1838f7 56b00143
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

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 7 content_tag('th', _('Submission date')) +
8 8 content_tag('th', _('Versions'), :style => 'text-align: center') +
9 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 13 end
14 14  
... ... @@ -19,8 +19,8 @@ module WorkAssignmentPlugin::Helper
19 19 content_tag('td', time_format(author_folder.children.last.created_at)) +
20 20 content_tag('td', author_folder.children.count, :style => 'text-align: center') +
21 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 24 end
25 25  
26 26 def display_submission(submission, user)
... ...
script/noosfero-plugins
  Diff comments   View file @22745db
... ... @@ -96,7 +96,7 @@ _enable(){
96 96 plugins_public_dir="$NOOSFERO_DIR/public/plugins"
97 97 plugins_features_dir="$NOOSFERO_DIR/features/plugins"
98 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 100 _say "$plugin enabled"
101 101 run "$source/after_enable.rb"
102 102 needs_migrate=true
... ...