Download as
Browse Code »

Commit 6ae8903826d6cc279d6b7b98348f590f970e7f09

Authored by Rodrigo Souto
Committed by Daniela Feitosa
1 parent 8f1fdd18
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

Email request 

* Features:
    - Extension of ActionMailer::Base so that it can append or prepend
      new paths to view_paths and each instance of it has it's own view
      paths. So if I define Mailer < ActionMailer::Base, my new class
      Mailer will have an independent view_path from ActionMailer,
      despite having a default value equal to it.
    - Adding new method root_path for Plugins.
  * Fixes:
    - select_country helper receive options too.
    - Passing request form through ajax serialize instead of hardcoded.
Showing 4 changed files with 34 additions and 2 deletions   Show diff stats
app/helpers/profile_editor_helper.rb
  Diff comments   View file @6ae8903
... ... @@ -104,8 +104,8 @@ module ProfileEditorHelper
104 104 @country_helper ||= CountriesHelper.instance
105 105 end
106 106  
107   - def select_country(title, object, method, options)
108   - labelled_form_field(title, select(object, method, [[_('[Select ...]'), nil]] + country_helper.countries, {}, options))
  107 + def select_country(title, object, method, html_options = {}, options = {})
  108 + labelled_form_field(title, select(object, method, [[_('[Select ...]'), nil]] + country_helper.countries, options, html_options))
109 109 end
110 110  
111 111 def select_schooling(object, method, options)
... ...
config/initializers/action_mailer_extensions.rb 0 → 100644
  Diff comments   View file @6ae8903
... ... @@ -0,0 +1,28 @@
  1 +module ActionMailer
  2 + class Base
  3 + class_inheritable_accessor :view_paths
  4 +
  5 + def self.prepend_view_path(path)
  6 + view_paths.unshift(*path)
  7 + ActionView::TemplateFinder.process_view_paths(path)
  8 + end
  9 +
  10 + def self.append_view_path(path)
  11 + view_paths.push(*path)
  12 + ActionView::TemplateFinder.process_view_paths(path)
  13 + end
  14 +
  15 + def self.view_paths
  16 + @view_paths ||= [template_root]
  17 + end
  18 +
  19 + def view_paths
  20 + self.class.view_paths
  21 + end
  22 +
  23 + def initialize_template_class(assigns)
  24 + ActionView::Base.new(view_paths, assigns, self)
  25 + end
  26 +
  27 + end
  28 +end
... ...
lib/noosfero/plugin.rb
  Diff comments   View file @6ae8903
... ... @@ -39,6 +39,9 @@ class Noosfero::Plugin
39 39 compute_public_path((public_name + '/' + file), 'plugins')
40 40 end
41 41  
  42 + def root_path
  43 + Rails.root+'/plugins/'+public_name
  44 + end
42 45  
43 46 # Here the developer should specify the meta-informations that the plugin can
44 47 # inform.
... ...
public/stylesheets/application.css
  Diff comments   View file @6ae8903
... ... @@ -2979,6 +2979,7 @@ div#activation_enterprise div {
2979 2979 border: 1px solid #888;
2980 2980 margin-bottom: 10px;
2981 2981 padding: 5px 10px;
  2982 + position: relative;
2982 2983 }
2983 2984  
2984 2985 #product_list .product-pic {
... ...