Download as
Browse Code »

Commit 03a34c2c358064e8942958a7e66eebcf51ed28a6

Authored by Daniela Feitosa
1 parent c729594d
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

Fixed tests

Showing 3 changed files with 3 additions and 3 deletions   Show diff stats
app/views/box_organizer/edit.rhtml
  Diff comments   View file @03a34c2
@@ -22,7 +22,7 @@ @@ -22,7 +22,7 @@
22 <%= label_tag('block_display_never', _("Don't display")) %> 22 <%= label_tag('block_display_never', _("Don't display")) %>
23 </div> 23 </div>
24 24
25 - <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %> 25 + <%= labelled_form_field(_('Show for:'), select(:block, :language, [ [ _('all languages'), 'all']] + environment.locales.map {|key, value| [value, key]} )) %>
26 26
27 <% button_bar do %> 27 <% button_bar do %>
28 <%= submit_button(:save, _('Save')) %> 28 <%= submit_button(:save, _('Save')) %>
app/views/tasks/_approve_article_accept_details.rhtml
  Diff comments   View file @03a34c2
1 <%= render :file => 'shared/tiny_mce' %> 1 <%= render :file => 'shared/tiny_mce' %>
2 2
3 <%= labelled_form_field(_('Name for publishing'), f.text_field(:name)) %> 3 <%= labelled_form_field(_('Name for publishing'), f.text_field(:name)) %>
4 -<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %> 4 +<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
5 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %> 5 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
6 6
7 <% tiny = task.article && task.article.tiny_mce? ? {:tiny_mce => true} : {} %> 7 <% tiny = task.article && task.article.tiny_mce? ? {:tiny_mce => true} : {} %>
app/views/tasks/_suggest_article_accept_details.rhtml
  Diff comments   View file @03a34c2
@@ -6,7 +6,7 @@ @@ -6,7 +6,7 @@
6 <%= labelled_form_field(_('Source'), f.text_field(:source_name)) %> 6 <%= labelled_form_field(_('Source'), f.text_field(:source_name)) %>
7 <%= labelled_form_field(_("Source URL"), f.text_field(:source)) %> 7 <%= labelled_form_field(_("Source URL"), f.text_field(:source)) %>
8 8
9 -<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task]", 'article_parent_id', task.target) %> 9 +<%= select_profile_folder(_('Select the folder where the article must be published'), "tasks[#{task.id}][task][article_parent_id]", task.target) %>
10 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %> 10 <%= labelled_form_field(_('Highlight this article'), f.check_box(:highlighted)) %>
11 11
12 <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %> 12 <%= render :partial => 'shared/lead_and_body', :locals => {:tiny_mce => true, :f => f, :abstract_method => 'article_abstract', :body_method => 'article_body', :lead_id => task.id} %>