Download as
Browse Code »

Commit 289857af429678e45da70980e86533c335254229

Authored by AntonioTerceiro
1 parent acbf97a0
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

ActionItem21: checkpoint 



git-svn-id: https://svn.colivre.coop.br/svn/noosfero/trunk@965 3f533792-8f58-4932-b0fe-aaf55b0a4547
Showing 4 changed files with 12 additions and 4 deletions   Show diff stats
app/controllers/my_profile/cms/text_html.rb
  Diff comments   View file @289857a
@@ -2,7 +2,9 @@ class CmsController @@ -2,7 +2,9 @@ class CmsController
2 2
3 def text_html_new 3 def text_html_new
4 @article = Article.new(params[:article]) 4 @article = Article.new(params[:article])
5 - @article.parent = profile.articles.find(params[:parent_id]) 5 + if params[:parent_id]
  6 + @article.parent = profile.articles.find(params[:parent_id])
  7 + end
6 @article.profile = profile 8 @article.profile = profile
7 if request.post? 9 if request.post?
8 if @article.save 10 if @article.save
app/models/article.rb
  Diff comments   View file @289857a
@@ -36,7 +36,7 @@ class Article < ActiveRecord::Base @@ -36,7 +36,7 @@ class Article < ActiveRecord::Base
36 end 36 end
37 37
38 def mime_type_description 38 def mime_type_description
39 - _('Text document') 39 + _('HTML Text document')
40 end 40 end
41 41
42 def title 42 def title
app/views/cms/new.rhtml
  Diff comments   View file @289857a
  1 +<p>
  2 + <%= _('Choose the type of article:') %>
  3 +</p>
  4 +
  5 +<ul>
1 <% CmsController.available_types.each do |item| %> 6 <% CmsController.available_types.each do |item| %>
2 - <%= link_to_new_article(item) %> 7 + <li><%= link_to_new_article(item) %></li>
3 <% end %> 8 <% end %>
  9 +</ul>
app/views/cms/text_html_new.rhtml
  Diff comments   View file @289857a
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 <% labelled_form_for 'article', @article do |f| %> 3 <% labelled_form_for 'article', @article do |f| %>
4 4
5 - <%= hidden_field_tag 'parent_id', params[:parent_id] %> 5 + <%= hidden_field_tag('parent_id', params[:parent_id]) if params[:parent_id] %>
6 6
7 <%= f.text_field 'name' %> 7 <%= f.text_field 'name' %>
8 8