Download as
Browse Code »

Commit ae1c68f2d0aa014d79d19458283a4f8bf0ac9317

Authored by Joenio Costa
Committed by Daniela Feitosa
1 parent 5e3082d6
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

Enabling tiny mce editor for Events 

(ActionItem1868)
Showing 6 changed files with 23 additions and 1 deletions   Show diff stats
app/models/event.rb
  Diff comments   View file @ae1c68f
@@ -116,6 +116,10 @@ class Event < Article @@ -116,6 +116,10 @@ class Event < Article
116 true 116 true
117 end 117 end
118 118
  119 + def tiny_mce?
  120 + true
  121 + end
  122 +
119 include Noosfero::TranslatableContent 123 include Noosfero::TranslatableContent
120 include MaybeAddHttp 124 include MaybeAddHttp
121 125
app/views/cms/_event.rhtml
  Diff comments   View file @ae1c68f
@@ -15,5 +15,5 @@ @@ -15,5 +15,5 @@
15 15
16 <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %> 16 <%= labelled_form_field(_('Address:'), text_field(:article, :address)) %>
17 17
18 -<%= labelled_form_field(_('Information about the event:'), text_area(:article, :body, :cols => 64)) %> 18 +<%= labelled_form_field(_('Information about the event:'), text_area(:article, :body, :cols => 64, :class => 'mceEditor')) %>
19 19
test/functional/cms_controller_test.rb
  Diff comments   View file @ae1c68f
@@ -1576,4 +1576,9 @@ class CmsControllerTest &lt; Test::Unit::TestCase @@ -1576,4 +1576,9 @@ class CmsControllerTest &lt; Test::Unit::TestCase
1576 assert_redirected_to :action => 'view', :id => f 1576 assert_redirected_to :action => 'view', :id => f
1577 end 1577 end
1578 1578
  1579 + should 'render TinyMce Editor for events' do
  1580 + get :new, :profile => @profile.identifier, :type => 'Event'
  1581 + assert_tag :tag => 'textarea', :attributes => { :class => 'mceEditor' }
  1582 + end
  1583 +
1579 end 1584 end
test/unit/article_test.rb
  Diff comments   View file @ae1c68f
@@ -1440,4 +1440,8 @@ class ArticleTest &lt; Test::Unit::TestCase @@ -1440,4 +1440,8 @@ class ArticleTest &lt; Test::Unit::TestCase
1440 assert_nil post.info_from_last_update[:author_url] 1440 assert_nil post.info_from_last_update[:author_url]
1441 end 1441 end
1442 1442
  1443 + should 'tiny mce editor is disabled by default' do
  1444 + assert !Article.new.tiny_mce?
  1445 + end
  1446 +
1443 end 1447 end
test/unit/event_test.rb
  Diff comments   View file @ae1c68f
@@ -270,4 +270,8 @@ class EventTest &lt; ActiveSupport::TestCase @@ -270,4 +270,8 @@ class EventTest &lt; ActiveSupport::TestCase
270 assert_kind_of Noosfero::TranslatableContent, Event.new 270 assert_kind_of Noosfero::TranslatableContent, Event.new
271 end 271 end
272 272
  273 + should 'tiny mce editor is enabled' do
  274 + assert Event.new.tiny_mce?
  275 + end
  276 +
273 end 277 end
test/unit/tiny_mce_article_test.rb
  Diff comments   View file @ae1c68f
@@ -236,4 +236,9 @@ class TinyMceArticleTest &lt; Test::Unit::TestCase @@ -236,4 +236,9 @@ class TinyMceArticleTest &lt; Test::Unit::TestCase
236 assert_equal false, a.advertise? 236 assert_equal false, a.advertise?
237 assert_equal false, a.is_trackable? 237 assert_equal false, a.is_trackable?
238 end 238 end
  239 +
  240 + should 'tiny mce editor is enabled' do
  241 + assert TinyMceArticle.new.tiny_mce?
  242 + end
  243 +
239 end 244 end