Download as
Browse Code »

Commit cbbdba89c6c44bebe6011c4c247c49b823f16f6b

Authored by Rodrigo Souto
2 parents 90c77cdb b9f2172d
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 commit 'refs/merge-requests/315' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/315
Showing 4 changed files with 20 additions and 9 deletions   Show diff stats
plugins/send_email/doc/send_email.textile
  Diff comments   View file @cbbdba8
@@ -14,7 +14,7 @@ h3. Form action @@ -14,7 +14,7 @@ h3. Form action
14 14
15 You should use {sendemail} macro as form action, it will be expanded as: 15 You should use {sendemail} macro as form action, it will be expanded as:
16 16
17 -* */profile/<identifier>/plugins/send_email/deliver* in profile context 17 +* */profile/<identifier>/plugin/send_email/deliver* in profile context
18 * */plugin/send_email/deliver* in environment context 18 * */plugin/send_email/deliver* in environment context
19 19
20 h3. 'Subject' field 20 h3. 'Subject' field
@@ -39,6 +39,17 @@ h3. extra fields @@ -39,6 +39,17 @@ h3. extra fields
39 39
40 Each other params in HTML form will compose message body in a format "key: value" 40 Each other params in HTML form will compose message body in a format "key: value"
41 41
  42 +h3. Example
  43 +
  44 +<pre>
  45 +<form action='{sendemail}' method='post'>
  46 + To: <input type='text' name='to'/>
  47 + Subject: <input type='text' name='subject'/>
  48 + Message: <input type='text' name='message'/>
  49 + <input type='submit'/>
  50 +</form>
  51 +</pre>
  52 +
42 h2. Options 53 h2. Options
43 54
44 h3. Using ajax 55 h3. Using ajax
@@ -49,10 +60,10 @@ Example: @@ -49,10 +60,10 @@ Example:
49 60
50 <pre> 61 <pre>
51 <form action='{sendemail}' id='ajax-form'> 62 <form action='{sendemail}' id='ajax-form'>
52 - <input type='text' name='to'/>  
53 - <input type='text' name='subject'/>  
54 - <input type='text' name='message'/>  
55 - <input type='subject'/> 63 + To: <input type='text' name='to'/>
  64 + Subject: <input type='text' name='subject'/>
  65 + Message: <input type='text' name='message'/>
  66 + <input type='submit'/>
56 </form> 67 </form>
57 </pre> 68 </pre>
58 69
plugins/send_email/features/send_email_plugin.feature
  Diff comments   View file @cbbdba8
@@ -12,7 +12,7 @@ Feature: send_email_plugin @@ -12,7 +12,7 @@ Feature: send_email_plugin
12 | owner | name | body | 12 | owner | name | body |
13 | joaosilva | sample-article | URL path to {sendemail} action | 13 | joaosilva | sample-article | URL path to {sendemail} action |
14 When I go to /joaosilva/sample-article 14 When I go to /joaosilva/sample-article
15 - Then I should see "URL path to /profile/joaosilva/plugins/send_email/deliver action" 15 + Then I should see "URL path to /profile/joaosilva/plugin/send_email/deliver action"
16 16
17 Scenario: expand macro in block content 17 Scenario: expand macro in block content
18 Given plugin SendEmailPlugin is enabled on environment 18 Given plugin SendEmailPlugin is enabled on environment
@@ -20,7 +20,7 @@ Feature: send_email_plugin @@ -20,7 +20,7 @@ Feature: send_email_plugin
20 | owner | type | html | 20 | owner | type | html |
21 | joaosilva | RawHTMLBlock | URL path to {sendemail} action | 21 | joaosilva | RawHTMLBlock | URL path to {sendemail} action |
22 When I go to Joao Silva's homepage 22 When I go to Joao Silva's homepage
23 - Then I should see "URL path to /profile/joaosilva/plugins/send_email/deliver action" 23 + Then I should see "URL path to /profile/joaosilva/plugin/send_email/deliver action"
24 24
25 Scenario: as admin I can configure plugin 25 Scenario: as admin I can configure plugin
26 Given I am logged in as admin 26 Given I am logged in as admin
plugins/send_email/lib/send_email_plugin.rb
  Diff comments   View file @cbbdba8
@@ -14,7 +14,7 @@ class SendEmailPlugin &lt; Noosfero::Plugin @@ -14,7 +14,7 @@ class SendEmailPlugin &lt; Noosfero::Plugin
14 14
15 def parse_content(raw_content) 15 def parse_content(raw_content)
16 if context.profile 16 if context.profile
17 - raw_content.gsub(/\{sendemail\}/, "/profile/#{context.profile.identifier}/plugins/send_email/deliver") 17 + raw_content.gsub(/\{sendemail\}/, "/profile/#{context.profile.identifier}/plugin/send_email/deliver")
18 else 18 else
19 raw_content.gsub(/\{sendemail\}/, '/plugin/send_email/deliver') 19 raw_content.gsub(/\{sendemail\}/, '/plugin/send_email/deliver')
20 end 20 end
plugins/send_email/test/unit/send_email_plugin_test.rb
  Diff comments   View file @cbbdba8
@@ -23,7 +23,7 @@ class SendEmailPluginTest &lt; ActiveSupport::TestCase @@ -23,7 +23,7 @@ class SendEmailPluginTest &lt; ActiveSupport::TestCase
23 23
24 should 'expand macro in parse_content event on profile context' do 24 should 'expand macro in parse_content event on profile context' do
25 @plugin.context.stubs(:profile).returns(fast_create(Community)) 25 @plugin.context.stubs(:profile).returns(fast_create(Community))
26 - assert_match /profile\/#{@plugin.context.profile.identifier}\/plugins\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}") 26 + assert_match /profile\/#{@plugin.context.profile.identifier}\/plugin\/send_email\/deliver/, @plugin.parse_content("expand this macro {sendemail}")
27 end 27 end
28 28
29 end 29 end