Download as
Browse Code »

Commit 90af49b90a80306b8a14682be0033c3005832d15

Authored by Rodrigo Souto
2 parents b3806ad2 277adf7d
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

Merge commit 'refs/merge-requests/323' of git://gitorious.org/noosfero/noosfero … 

…into merge-requests/323
Showing 2 changed files with 4 additions and 2 deletions   Show diff stats
app/controllers/public/profile_controller.rb
  Diff comments   View file @90af49b
... ... @@ -278,7 +278,7 @@ class ProfileController < PublicController
278 278 end
279 279  
280 280 def register_report
281   - if !verify_recaptcha
  281 + unless user.is_admin? || verify_recaptcha
282 282 render :text => {
283 283 :ok => false,
284 284 :error => {
... ...
app/views/profile/report_abuse.html.erb
  Diff comments   View file @90af49b
... ... @@ -4,7 +4,9 @@
4 4 <%= hidden_field_tag(:content_type, params[:content_type]) %>
5 5 <%= hidden_field_tag(:content_id, params[:content_id]) %>
6 6  
7   - <p><%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} %> </p>
  7 + <% unless user.is_admin? %>
  8 + <p><%= recaptcha_tags :ajax => true, :display => {:theme => 'clean'} %> </p>
  9 + <% end %>
8 10  
9 11 <%= submit_button(:send, _('Report profile'), :style => 'float: left; cursor: pointer;', :id => 'report-abuse-submit-button', :onclick => "jQuery('#form-submit-loading').show()") %>
10 12 <%= button(:cancel, _('Cancel'), {}, :style => 'float: left; padding-top: 0px; padding-bottom: 0px;', :onclick => 'jQuery.colorbox.close(); return false;')%>
... ...