Remove date_format from profile and add it to environment

Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>

Remove date_format from profile and add it to environment
Signed-off-by: Fabio Teixeira <fabio1079@gmail.com>
Fabio Teixeira
1 parent 0cc53433
Showing 15 changed files with 79 additions and 116 deletions Show diff stats
app/controllers/my_profile/cms_controller.rb
app/helpers/content_viewer_helper.rb
app/models/environment.rb
app/models/profile.rb
app/views/admin_panel/_site_info.html.erb
app/views/cms/general_configuration.html.erb
app/views/cms/view.html.erb
db/migrate/20150529180110_add_date_format_to_environment.rb
db/migrate/20150529180110_add_date_format_to_profile.rb
db/schema.rb
public/stylesheets/application.css
test/functional/cms_controller_test.rb
test/unit/content_viewer_helper_test.rb
test/unit/environment_test.rb
test/unit/profile_test.rb
@@ -188,18 +188,6 @@ class CmsController &lt; MyProfileController
     render :action => 'edit'
   end
-  def general_configuration
-    @profile_data = profile
-    if request.post?
-      if @profile_data.update_attributes(params[:profile_data])
-        session[:notice] = _("Article date format updated successfully")
-      else
-        session[:notice] = _("Could not update article's date format")
-      end
-      redirect_to :action => 'index'
-    end
-  end
-
   post_only :set_home_page
   def set_home_page
     return render_access_denied unless user.can_change_homepage?
@@ -37,7 +37,7 @@ module ContentViewerHelper
   end
   def show_with_right_format_date article
-    date_format = article.profile.date_format
+    date_format = Environment.default.date_format
     use_numbers = false
     year = true
     left_time = false
@@ -3,7 +3,17 @@
 # domains.
 class Environment < ActiveRecord::Base
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist, :highlighted_news_amount, :portal_news_amount
+  attr_accessible :name, :is_default, :signup_welcome_text_subject,
+                  :signup_welcome_text_body, :terms_of_use,
+                  :message_for_disabled_enterprise, :news_amount_by_folder,
+                  :default_language, :languages, :description,
+                  :organization_approval_method, :enabled_plugins,
+                  :enabled_features, :redirection_after_login,
+                  :redirection_after_signup, :contact_email, :theme,
+                  :reports_lower_bound, :noreply_email,
+                  :signup_welcome_screen_body, :members_whitelist_enabled,
+                  :members_whitelist, :highlighted_news_amount,
+                  :portal_news_amount, :date_format
   has_many :users
@@ -14,6 +24,12 @@ class Environment &lt; ActiveRecord::Base
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
+  validates_inclusion_of :date_format,
+                         :in => [ 'numbers_with_year', 'numbers',
+                                  'month_name_with_year', 'month_name',
+                                  'past_time'],
+                         :if => :date_format
+
   def self.verify_filename(filename)
     filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
     filename
@@ -13,7 +13,7 @@ class Profile &lt; ActiveRecord::Base
                   :contact_email, :redirect_l10n,
                   :notification_time, :redirection_after_login,
                   :email_suggestions, :allow_members_to_invite,
-                  :invite_friends_only, :secret, :date_format
+                  :invite_friends_only, :secret
   # use for internationalizable human type names in search facets
   # reimplement on subclasses
@@ -191,12 +191,6 @@ class Profile &lt; ActiveRecord::Base
   validates_length_of :description, :maximum => 550, :allow_nil => true
-  validates_inclusion_of :date_format,
-                         :in => [ 'numbers_with_year', 'numbers',
-                                  'month_name_with_year', 'month_name',
-                                  'past_time'],
-                         :if => :date_format
-
   # Valid identifiers must match this format.
   IDENTIFIER_FORMAT = /^#{Noosfero.identifier_format}$/
@@ -3,6 +3,21 @@
 <%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
 <% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
 <%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
+
+<%= labelled_form_field(
+  _("Article's date format"),
+  select(:environment, :date_format,
+    options_for_select([
+      [ _('mm/dd/yyyy'), 'numbers_with_year'],
+      [ _('mm/dd'), 'numbers'],
+      [ _('Month dd, yyyy'), 'month_name_with_year'],
+      [ _('Month dd'), 'month_name'],
+      [ _('X minutes/hours/days/months/years ago'), 'past_time']
+      ], environment.date_format
+    )
+  )
+) %>
+
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
 <%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
 <%= label_tag :languages, _('Available languages') %>
@@ -1,25 +0,0 @@
-<div class="general-configuration">
-
-<h2> <%= _('General Configuration:') %> </h2>
-<%= labelled_form_for :profile_data do |f|%>
-  <h2><%= _("Article's date format") %> </h2>
-
-  <%= _("This option will define how article's date will be showed") %>
-  <br>
-  <br>
-  <%= select_tag('profile_data[date_format]',  options_for_select([
-      [ _('mm/dd/yyyy'), 'numbers_with_year'],
-      [ _('mm/dd'), 'numbers'],
-      [ _('Month dd, yyyy'), 'month_name_with_year'],
-      [ _('Month dd'), 'month_name'],
-      [ _('X minutes/hours/days/months/years ago'), 'past_time']
-    ], @profile_data.date_format)) %>
-
-  <br>
-  <br>
-
-  <%= submit_button('save', _('Save')) %>
-  <%= modal_close_button(_('Cancel')) %>
-<% end %>
-
-</div>
@@ -18,7 +18,6 @@
   <% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
   <%= modal_button('new', _('New content'), :action => 'new', :parent_id => parent_id, :cms => true) %>
-  <%= modal_button('edit', _('General Configuration'), :action => 'general_configuration', :parent_id => parent_id, :cms => true) %>
   <%= button(:back, _('Back to control panel'), :controller => 'profile_editor', :action => "index") %>
 <% end %>
@@ -0,0 +1,9 @@
+class AddDateFormatToEnvironment < ActiveRecord::Migration
+  def up
+    add_column :environments, :date_format, :string, :default => 'month_name_with_year'
+  end
+
+  def down
+    remove_column :environments, :date_format
+  end
+end
@@ -1,9 +0,0 @@
-class AddDateFormatToProfile < ActiveRecord::Migration
-  def up
-    add_column :profiles, :date_format, :string, :default => 'month_name_with_year'
-  end
-
-  def down
-    remove_column :profiles, :date_format
-  end
-end
@@ -331,6 +331,7 @@ ActiveRecord::Schema.define(:version =&gt; 20150602142030) do
     t.string   "default_language"
     t.string   "noreply_email"
     t.string   "redirection_after_signup",     :default => "keep_on_same_page"
+    t.string   "date_format",                  :default => "month_name_with_year"
   end
   create_table "external_feeds", :force => true do |t|
@@ -535,16 +536,15 @@ ActiveRecord::Schema.define(:version =&gt; 20150602142030) do
     t.boolean  "is_template",                           :default => false
     t.integer  "template_id"
     t.string   "redirection_after_login"
-    t.integer  "friends_count",                         :default => 0,                      :null => false
-    t.integer  "members_count",                         :default => 0,                      :null => false
-    t.integer  "activities_count",                      :default => 0,                      :null => false
+    t.integer  "friends_count",                         :default => 0, :null => false
+    t.integer  "members_count",                         :default => 0, :null => false
+    t.integer  "activities_count",                      :default => 0, :null => false
     t.string   "personal_website"
     t.string   "jabber_id"
     t.integer  "welcome_page_id"
     t.boolean  "allow_members_to_invite",               :default => true
     t.boolean  "invite_friends_only",                   :default => false
     t.boolean  "secret",                                :default => false
-    t.string   "date_format",                           :default => "month_name_with_year"
   end
   add_index "profiles", ["activities_count"], :name => "index_profiles_on_activities_count"
@@ -3462,11 +3462,6 @@ table.cms-articles .icon:hover {
   width: 455px;
 }
-.general-configuration {
-  padding: 5px 20px;
-  width: 455px;
-}
-
 .article-types {
   padding-left: 5px;
   margin-top: 20px;
@@ -1869,24 +1869,6 @@ class CmsControllerTest &lt; ActionController::TestCase
     assert_equal '[{"label":"linux","value":"linux"}]', @response.body
   end
-  should 'save general configuration when is passed a valid value' do
-    post :general_configuration, profile: profile.identifier, :profile_data => { date_format: "numbers_with_year" }
-    profile.reload
-
-    assert_equal profile.date_format, "numbers_with_year"
-  end
-
-  should 'not save general configuration when is not passed a valid value' do
-    profile.date_format = "month_name_with_year"
-    profile.save!
-
-    post :general_configuration, profile: profile.identifier, :profile_data => { date_format: "invalid_format" }
-    profile.reload
-
-    assert_equal profile.date_format, "month_name_with_year"
-  end
-
-
   protected
   # FIXME this is to avoid adding an extra dependency for a proper JSON parser.
@@ -113,37 +113,37 @@ class ContentViewerHelperTest &lt; ActionView::TestCase
   end
   should 'show date with mm/dd/yyyy' do
+    Environment.any_instance.stubs(:date_format).returns('numbers_with_year')
     article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
     article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
     article.save!
-    profile.date_format = "numbers_with_year"
     result = show_with_right_format_date article
     assert_match /2\/1\/2007/, result
   end
   should 'show date with mm/dd' do
+    Environment.any_instance.stubs(:date_format).returns('numbers')
     article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
     article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
     article.save!
-    profile.date_format = "numbers"
     result = show_with_right_format_date article
     assert_match /2\/1/, result
   end
   should 'show date with month name' do
+    Environment.any_instance.stubs(:date_format).returns('month_name')
     article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
     article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
     article.save!
-    profile.date_format = "month_name"
     result = show_with_right_format_date article
     assert_match /February 1/, result
   end
   should 'show date with month name and year' do
+    Environment.any_instance.stubs(:date_format).returns('month_name_with_year')
     article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
     article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
     article.save!
-    profile.date_format = "month_name_with_year"
     result = show_with_right_format_date article
     assert_match /February 1, 2007/, result
   end
@@ -1703,4 +1703,32 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert !e.has_license?
   end
+  should 'validates_inclusion_of date format' do
+    environment = fast_create(Environment)
+
+    environment.date_format = "invalid_format"
+    environment.valid?
+    assert environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "numbers_with_year"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "numbers"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "month_name_with_year"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "month_name"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "past_time"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+  end
+
 end
@@ -2176,33 +2176,4 @@ class ProfileTest &lt; ActiveSupport::TestCase
     assert_includes Profile.enabled, p2
     assert_not_includes Profile.enabled, p3
   end
-
-  should 'validates_inclusion_of date format' do
-    profile = fast_create(Profile)
-
-    profile.date_format = "invalid_format"
-    profile.valid?
-    assert profile.errors[:date_format.to_s].present?
-
-    profile.date_format = "numbers_with_year"
-    profile.valid?
-    assert !profile.errors[:date_format.to_s].present?
-
-    profile.date_format = "numbers"
-    profile.valid?
-    assert !profile.errors[:date_format.to_s].present?
-
-    profile.date_format = "month_name_with_year"
-    profile.valid?
-    assert !profile.errors[:date_format.to_s].present?
-
-    profile.date_format = "month_name"
-    profile.valid?
-    assert !profile.errors[:date_format.to_s].present?
-
-    profile.date_format = "past_time"
-    profile.valid?
-    assert !profile.errors[:date_format.to_s].present?
-
-  end
 end
	@@ -188,18 +188,6 @@ class CmsController < MyProfileController		@@ -188,18 +188,6 @@ class CmsController < MyProfileController
188	render :action => 'edit'	188	render :action => 'edit'
189	end	189	end
190		190
191	- def general_configuration
192	- @profile_data = profile
193	- if request.post?
194	- if @profile_data.update_attributes(params[:profile_data])
195	- session[:notice] = _("Article date format updated successfully")
196	- else
197	- session[:notice] = _("Could not update article's date format")
198	- end
199	- redirect_to :action => 'index'
200	- end
201	- end
202	-
203	post_only :set_home_page	191	post_only :set_home_page
204	def set_home_page	192	def set_home_page
205	return render_access_denied unless user.can_change_homepage?	193	return render_access_denied unless user.can_change_homepage?
	@@ -37,7 +37,7 @@ module ContentViewerHelper		@@ -37,7 +37,7 @@ module ContentViewerHelper
37	end	37	end
38		38
39	def show_with_right_format_date article	39	def show_with_right_format_date article
40	- date_format = article.profile.date_format	40	+ date_format = Environment.default.date_format
41	use_numbers = false	41	use_numbers = false
42	year = true	42	year = true
43	left_time = false	43	left_time = false
	@@ -3,7 +3,17 @@		@@ -3,7 +3,17 @@
3	# domains.	3	# domains.
4	class Environment < ActiveRecord::Base	4	class Environment < ActiveRecord::Base
5		5
6	- attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist, :highlighted_news_amount, :portal_news_amount	6	+ attr_accessible :name, :is_default, :signup_welcome_text_subject,
		7	+ :signup_welcome_text_body, :terms_of_use,
		8	+ :message_for_disabled_enterprise, :news_amount_by_folder,
		9	+ :default_language, :languages, :description,
		10	+ :organization_approval_method, :enabled_plugins,
		11	+ :enabled_features, :redirection_after_login,
		12	+ :redirection_after_signup, :contact_email, :theme,
		13	+ :reports_lower_bound, :noreply_email,
		14	+ :signup_welcome_screen_body, :members_whitelist_enabled,
		15	+ :members_whitelist, :highlighted_news_amount,
		16	+ :portal_news_amount, :date_format
7		17
8	has_many :users	18	has_many :users
9		19
	@@ -14,6 +24,12 @@ class Environment < ActiveRecord::Base		@@ -14,6 +24,12 @@ class Environment < ActiveRecord::Base
14		24
15	IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/	25	IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/
16		26
		27	+ validates_inclusion_of :date_format,
		28	+ :in => [ 'numbers_with_year', 'numbers',
		29	+ 'month_name_with_year', 'month_name',
		30	+ 'past_time'],
		31	+ :if => :date_format
		32	+
17	def self.verify_filename(filename)	33	def self.verify_filename(filename)
18	filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS	34	filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
19	filename	35	filename
	@@ -3,6 +3,21 @@		@@ -3,6 +3,21 @@
3	<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>	3	<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
4	<% themes_options = Theme.system_themes.map {\|theme\| [theme.name, theme.id] }.sort %>	4	<% themes_options = Theme.system_themes.map {\|theme\| [theme.name, theme.id] }.sort %>
5	<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>	5	<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
		6	+
		7	+<%= labelled_form_field(
		8	+ _("Article's date format"),
		9	+ select(:environment, :date_format,
		10	+ options_for_select([
		11	+ [ _('mm/dd/yyyy'), 'numbers_with_year'],
		12	+ [ _('mm/dd'), 'numbers'],
		13	+ [ _('Month dd, yyyy'), 'month_name_with_year'],
		14	+ [ _('Month dd'), 'month_name'],
		15	+ [ _('X minutes/hours/days/months/years ago'), 'past_time']
		16	+ ], environment.date_format
		17	+ )
		18	+ )
		19	+) %>
		20	+
6	<%= required f.text_field(:reports_lower_bound, :size => 3) %>	21	<%= required f.text_field(:reports_lower_bound, :size => 3) %>
7	<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>	22	<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
8	<%= label_tag :languages, _('Available languages') %>	23	<%= label_tag :languages, _('Available languages') %>
	@@ -1,25 +0,0 @@	@@ -1,25 +0,0 @@
1	-<div class="general-configuration">
2	-
3	-<h2> <%= _('General Configuration:') %> </h2>
4	-<%= labelled_form_for :profile_data do \|f\|%>
5	- <h2><%= _("Article's date format") %> </h2>
6	-
7	- <%= _("This option will define how article's date will be showed") %>
8	- <br>
9	- <br>
10	- <%= select_tag('profile_data[date_format]', options_for_select([
11	- [ _('mm/dd/yyyy'), 'numbers_with_year'],
12	- [ _('mm/dd'), 'numbers'],
13	- [ _('Month dd, yyyy'), 'month_name_with_year'],
14	- [ _('Month dd'), 'month_name'],
15	- [ _('X minutes/hours/days/months/years ago'), 'past_time']
16	- ], @profile_data.date_format)) %>
17	-
18	- <br>
19	- <br>
20	-
21	- <%= submit_button('save', _('Save')) %>
22	- <%= modal_close_button(_('Cancel')) %>
23	-<% end %>
24	-
25	-</div>
	@@ -18,7 +18,6 @@		@@ -18,7 +18,6 @@
18	<% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>	18	<% parent_id = ((@article && @article.allow_children?) ? @article : nil) %>
19		19
20	<%= modal_button('new', _('New content'), :action => 'new', :parent_id => parent_id, :cms => true) %>	20	<%= modal_button('new', _('New content'), :action => 'new', :parent_id => parent_id, :cms => true) %>
21	- <%= modal_button('edit', _('General Configuration'), :action => 'general_configuration', :parent_id => parent_id, :cms => true) %>
22	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor', :action => "index") %>	21	<%= button(:back, _('Back to control panel'), :controller => 'profile_editor', :action => "index") %>
23	<% end %>	22	<% end %>
24		23
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class AddDateFormatToEnvironment < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :environments, :date_format, :string, :default => 'month_name_with_year'
	4	+ end
	5	+
	6	+ def down
	7	+ remove_column :environments, :date_format
	8	+ end
	9	+end
	@@ -1,9 +0,0 @@	@@ -1,9 +0,0 @@
1	-class AddDateFormatToProfile < ActiveRecord::Migration
2	- def up
3	- add_column :profiles, :date_format, :string, :default => 'month_name_with_year'
4	- end
5	-
6	- def down
7	- remove_column :profiles, :date_format
8	- end
9	-end
	@@ -1869,24 +1869,6 @@ class CmsControllerTest < ActionController::TestCase		@@ -1869,24 +1869,6 @@ class CmsControllerTest < ActionController::TestCase
1869	assert_equal '[{"label":"linux","value":"linux"}]', @response.body	1869	assert_equal '[{"label":"linux","value":"linux"}]', @response.body
1870	end	1870	end
1871		1871
1872	- should 'save general configuration when is passed a valid value' do
1873	- post :general_configuration, profile: profile.identifier, :profile_data => { date_format: "numbers_with_year" }
1874	- profile.reload
1875	-
1876	- assert_equal profile.date_format, "numbers_with_year"
1877	- end
1878	-
1879	- should 'not save general configuration when is not passed a valid value' do
1880	- profile.date_format = "month_name_with_year"
1881	- profile.save!
1882	-
1883	- post :general_configuration, profile: profile.identifier, :profile_data => { date_format: "invalid_format" }
1884	- profile.reload
1885	-
1886	- assert_equal profile.date_format, "month_name_with_year"
1887	- end
1888	-
1889	-
1890	protected	1872	protected
1891		1873
1892	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.	1874	# FIXME this is to avoid adding an extra dependency for a proper JSON parser.
	@@ -1703,4 +1703,32 @@ class EnvironmentTest < ActiveSupport::TestCase		@@ -1703,4 +1703,32 @@ class EnvironmentTest < ActiveSupport::TestCase
1703	assert !e.has_license?	1703	assert !e.has_license?
1704	end	1704	end
1705		1705
		1706	+ should 'validates_inclusion_of date format' do
		1707	+ environment = fast_create(Environment)
		1708	+
		1709	+ environment.date_format = "invalid_format"
		1710	+ environment.valid?
		1711	+ assert environment.errors[:date_format.to_s].present?
		1712	+
		1713	+ environment.date_format = "numbers_with_year"
		1714	+ environment.valid?
		1715	+ assert !environment.errors[:date_format.to_s].present?
		1716	+
		1717	+ environment.date_format = "numbers"
		1718	+ environment.valid?
		1719	+ assert !environment.errors[:date_format.to_s].present?
		1720	+
		1721	+ environment.date_format = "month_name_with_year"
		1722	+ environment.valid?
		1723	+ assert !environment.errors[:date_format.to_s].present?
		1724	+
		1725	+ environment.date_format = "month_name"
		1726	+ environment.valid?
		1727	+ assert !environment.errors[:date_format.to_s].present?
		1728	+
		1729	+ environment.date_format = "past_time"
		1730	+ environment.valid?
		1731	+ assert !environment.errors[:date_format.to_s].present?
		1732	+ end
		1733	+
1706	end	1734	end