Download as
Browse Code »

Commit 21153d137c8b6adb78a88bd3dea86860e8e8e1be

Authored by Victor Costa
1 parent ba1e746f
Exists in staging and in 42 other branches all_pending_tasks_api, api-articles-period, api_roles, caching-rails4, captcha_serpro_plugin, comments_permissions, content-manager-hostspot, elasticsearch, elasticsearch_api, elasticsearch_categories, elasticsearch_filter, elasticsearch_sort, elasticsearch_to_merge, elasticsearch_view, environment-exposes-api, export-comment-api, export-comment-paragraph, export_data, external_followers, federation-webfinger, federation_followers, federation_followers_backend, federation_oauth_provider, federation_webfinger, fix_event_date_issue, fix_notification_email, fix_string_downcase_and_upcase, follower_permition, json_cookie_serializer, login-captcha, master, master_profile_followers, oauth_external_login, oauth_login, private-scraps, private-scraps-rebase, production, production-vendorized, profile_api_improvements, tasks_keep_filter_params, user_mention, webfinger_server

rails3: fix change image from profile

Showing 4 changed files with 13 additions and 10 deletions   Show diff stats
app/models/person.rb
  Diff comments   View file @21153d1
1 # A person is the profile of an user holding all relationships with the rest of the system 1 # A person is the profile of an user holding all relationships with the rest of the system
2 class Person < Profile 2 class Person < Profile
3 3
4 - attr_accessible :organization, :contact_information, :sex, :birth_date 4 + attr_accessible :organization, :contact_information, :sex, :birth_date, :professional_activity
5 5
6 SEARCH_FILTERS += %w[ 6 SEARCH_FILTERS += %w[
7 more_popular 7 more_popular
app/views/shared/_change_image.html.erb
  Diff comments   View file @21153d1
1 <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %> 1 <%= i.file_field( :uploaded_data, { :onchange => 'updateImg(this.value)' } ) %>
2 - <%= link_to_function(_('Cancel'), nil, :id => 'cancel-change-image-link', :class => 'button icon-cancel with-text', :style => 'display: none') do |page|  
3 - page['change-image-link'].show  
4 - page['change-image'].replace_html ''  
5 - end %> 2 + <%= link_to_function(_('Cancel'), "jQuery('#change-image-link').show(); jQuery('#change-image').html('')", :id => 'cancel-change-image-link', :class => 'button icon-cancel with-text', :style => 'display: none') %>
app/views/shared/_show_thumbnail.html.erb
  Diff comments   View file @21153d1
@@ -2,10 +2,15 @@ @@ -2,10 +2,15 @@
2 2
3 <br/> 3 <br/>
4 4
5 - <%= link_to_function(_('Change image'), nil, :id => 'change-image-link', :class => 'button icon-photos with-text') do |page|  
6 - page['change-image'].replace_html :partial => 'shared/change_image', :locals => { :i => i, :image => image }  
7 - page['change-image-link'].hide  
8 - page['cancel-change-image-link'].show  
9 - end %> 5 + <%= link_to_function(_('Change image'), 'display_change_image()', :id => 'change-image-link', :class => 'button icon-photos with-text') %>
  6 +
  7 + <script>
  8 + function display_change_image() {
  9 + var content = "<%= j(render :partial => 'shared/change_image', :locals => { :i => i, :image => image }) %>";
  10 + jQuery('#change-image').html(content);
  11 + jQuery('#change-image-link').hide();
  12 + jQuery('#cancel-change-image-link').show();
  13 + }
  14 + </script>
10 15
11 <div id='change-image'> </div> <br/> 16 <div id='change-image'> </div> <br/>
plugins/require_auth_to_comment/lib/ext/profile.rb
  Diff comments   View file @21153d1
@@ -2,4 +2,5 @@ require_dependency &#39;profile&#39; @@ -2,4 +2,5 @@ require_dependency &#39;profile&#39;
2 2
3 class Profile 3 class Profile
4 settings_items :allow_unauthenticated_comments, :type => :boolean 4 settings_items :allow_unauthenticated_comments, :type => :boolean
  5 + attr_accessible :allow_unauthenticated_comments
5 end 6 end