Merge branch 'stable'

Rodrigo Souto
2 parents 96a2e91e 32b977e3
Showing 24 changed files with 135 additions and 46 deletions Show diff stats
INSTALL.chat
app/helpers/forms_helper.rb
app/helpers/layout_helper.rb
app/models/article.rb
app/models/event.rb
app/models/user.rb
app/views/content_viewer/view_page.rhtml
app/views/layouts/application-ng.rhtml
app/views/shared/logged_in/xmpp_chat.rhtml
db/migrate/20130605135210_change_article_published_at_from_date_to_datetime.rb
db/migrate/20130606110602_change_article_versions_published_at_from_date_to_datetime.rb
db/schema.rb
plugins/custom_forms/controllers/custom_forms_plugin_profile_controller.rb
plugins/custom_forms/lib/custom_forms_plugin/helper.rb
plugins/custom_forms/public/field.js
plugins/custom_forms/public/style.css
plugins/custom_forms/test/functional/custom_forms_plugin_profile_controller_test.rb
plugins/custom_forms/views/custom_forms_plugin_myprofile/_empty_option.html.erb
public/javascripts/application.js
public/javascripts/chat.js
@@ -6,15 +6,13 @@ To configure XMPP/BOSH in Noosfero you need:
 * SystemTimer - http://ph7spot.com/musings/system-timer
 * Pidgin data files - http://www.pidgin.im/
-If you use Debian Lenny:
+If you use Debian Wheezy:
-# apt-get install librestclient-ruby (from backports)
-# apt-get install pidgin-data
-# apt-get install ruby1.8-dev
+# apt-get install librestclient-ruby pidgin-data ruby1.8-dev
 # gem install SystemTimer
-Take a look at util/chat directory to see samples of config file to configure a
-XMPP/BOSH server with ejabberd, postgresql and apache2.
+The samples of config file to configure a XMPP/BOSH server with
+ejabberd, postgresql and apache2 can be found at util/chat directory.
 == XMPP/Chat Server Setup
@@ -22,8 +20,7 @@ This is a step-by-step guide to get a XMPP service working, in a Debian system.
 1. Install the required packages
-# apt-get -t lenny-backports install ejabberd
-# apt-get install odbc-postgresql
+# apt-get install ejabberd odbc-postgresql
 2. Ejabberd configuration
@@ -108,7 +105,7 @@ Unused modules can be disabled, for example:
  * web_admin
  * mod_pubsub
  * mod_irc
- * mod_offine
+ * mod_offline
  * mod_admin_extra
  * mod_register
@@ -132,7 +129,7 @@ This will create a new schema inside the noosfero database, called &#39;ejabberd&#39;.
 Note 'noosfero' user should have permission to create Postgresql schemas. Also,
 there should be at least one domain with 'is_default = true' in 'domains'
-table, otherwise people couldn't see your friends online.
+table, otherwise people won't be able to see their friends online.
 4. ODBC configuration
@@ -168,9 +165,12 @@ Debug       = 0
 CommLog     = 1
 UsageCount  = 3
- * testing all:
+ 4.1 testing all:
-# isql 'PostgreSQLEjabberdNoosfero' DBUSER
+# isql 'PostgreSQLEjabberdNoosfero'
+
+If the configuration was done right, the message "Connected!"
+will be displayed.
 5. Enabling kernel polling and SMP in /etc/default/ejabberd
@@ -244,7 +244,7 @@ module FormsHelper
         yearSuffix: #{datepicker_options[:year_suffix].to_json}
       })
     </script>
-    "
+    ".html_safe
     result
   end
@@ -84,5 +84,11 @@ module LayoutHelper
     theme_path + '/style.css'
   end
+  def addthis_javascript
+    if NOOSFERO_CONF['addthis_enabled']
+      '<script src="http://s7.addthis.com/js/152/addthis_widget.js"></script>'
+    end
+  end
+
 end
@@ -595,7 +595,7 @@ class Article &lt; ActiveRecord::Base
   end
   def lead
-    abstract.blank? ? first_paragraph : abstract
+    abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
   end
   def short_lead
@@ -14,7 +14,6 @@ class Event &lt; Article
     maybe_add_http(self.setting[:link])
   end
-  xss_terminate :only => [ :link ], :on => 'validation'
   xss_terminate :only => [ :body, :link, :address ], :with => 'white_list', :on => 'validation'
   def initialize(*args)
@@ -294,7 +294,8 @@ class User &lt; ActiveRecord::Base
       'email_domain' => self.enable_email ? self.email_domain : nil,
       'friends_list' => friends_list,
       'enterprises' => enterprises,
-      'amount_of_friends' => friends_list.count
+      'amount_of_friends' => friends_list.count,
+      'chat_enabled' => person.environment.enabled?('xmpp_chat')
     }
   end
@@ -60,7 +60,6 @@
   addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
 </script>
 <a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
-<script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
 </div>
 <% end %>
@@ -56,5 +56,6 @@
     </div><!-- end id="theme-footer" -->
     <%= noosfero_layout_features %>
     <%= theme_javascript_ng %>
+    <%= addthis_javascript %>
   </body>
 </html>
@@ -6,6 +6,6 @@
     </div>
   </div>
   <a href='#' id='chat-online-users-title' onclick='return false;'>
-    <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat <span class='amount_of_friends'>(%{amount})</span>") %></span></div>
+    <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat (<span class='amount_of_friends'>%{amount}</span>)") %></span></div>
   </a>
 </div>
@@ -0,0 +1,9 @@
+class ChangeArticlePublishedAtFromDateToDatetime < ActiveRecord::Migration
+  def self.up
+    change_column :articles, :published_at, :datetime
+  end
+
+  def self.down
+    change_column :articles, :published_at, :date
+  end
+end
@@ -0,0 +1,9 @@
+class ChangeArticleVersionsPublishedAtFromDateToDatetime < ActiveRecord::Migration
+  def self.up
+    change_column :article_versions, :published_at, :datetime
+  end
+
+  def self.down
+    change_column :article_versions, :published_at, :date
+  end
+end
@@ -9,7 +9,7 @@
 #
 # It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20130429214630) do
+ActiveRecord::Schema.define(:version => 20130606110602) do
   create_table "abuse_reports", :force => true do |t|
     t.integer  "reporter_id"
@@ -76,7 +76,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130429214630) do
     t.text     "setting"
     t.boolean  "notify_comments",      :default => false
     t.integer  "hits",                 :default => 0
-    t.date     "published_at"
+    t.datetime "published_at"
     t.string   "source"
     t.boolean  "highlighted",          :default => false
     t.string   "external_link"
@@ -119,7 +119,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130429214630) do
     t.text     "setting"
     t.boolean  "notify_comments",      :default => true
     t.integer  "hits",                 :default => 0
-    t.date     "published_at"
+    t.datetime "published_at"
     t.string   "source"
     t.boolean  "highlighted",          :default => false
     t.string   "external_link"
@@ -264,11 +264,11 @@ ActiveRecord::Schema.define(:version =&gt; 20130429214630) do
     t.text     "design_data"
     t.text     "custom_header"
     t.text     "custom_footer"
-    t.string   "theme",                        :default => "default", :null => false
+    t.string   "theme",                        :default => "default",           :null => false
     t.text     "terms_of_use_acceptance_text"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "reports_lower_bound",          :default => 0,         :null => false
+    t.integer  "reports_lower_bound",          :default => 0,                   :null => false
     t.string   "redirection_after_login",      :default => "keep_on_same_page"
     t.text     "signup_welcome_text"
     t.string   "languages"
@@ -428,7 +428,7 @@ ActiveRecord::Schema.define(:version =&gt; 20130429214630) do
     t.string   "type"
     t.string   "identifier"
     t.integer  "environment_id"
-    t.boolean  "active",                             :default => true
+    t.boolean  "active",                                :default => true
     t.string   "address"
     t.string   "contact_phone"
     t.integer  "home_page_id"
@@ -439,21 +439,21 @@ ActiveRecord::Schema.define(:version =&gt; 20130429214630) do
     t.float    "lat"
     t.float    "lng"
     t.integer  "geocode_precision"
-    t.boolean  "enabled",                            :default => true
-    t.string   "nickname",             :limit => 16
+    t.boolean  "enabled",                               :default => true
+    t.string   "nickname",                :limit => 16
     t.text     "custom_header"
     t.text     "custom_footer"
     t.string   "theme"
-    t.boolean  "public_profile",                     :default => true
+    t.boolean  "public_profile",                        :default => true
     t.date     "birth_date"
     t.integer  "preferred_domain_id"
     t.datetime "updated_at"
-    t.boolean  "visible",                            :default => true
+    t.boolean  "visible",                               :default => true
     t.integer  "image_id"
-    t.boolean  "validated",                          :default => true
+    t.boolean  "validated",                             :default => true
     t.string   "cnpj"
     t.string   "national_region_code"
-    t.boolean  "is_template",                        :default => false
+    t.boolean  "is_template",                           :default => false
     t.integer  "template_id"
     t.string   "redirection_after_login"
   end
@@ -27,6 +27,7 @@ class CustomFormsPluginProfileController &lt; ProfileController
           failed_answers.each do |answer|
             @submission.errors.add(answer.field.name.to_sym, answer.errors[answer.field.slug.to_sym])
           end
+          raise 'Submission failed: answers not valid'
         end
         session[:notice] = _('Submission saved')
         redirect_to :action => 'show'
@@ -103,14 +103,17 @@ module CustomFormsPlugin::Helper
   def build_answers(submission, form)
     answers = []
-    submission.each do |slug, value|
-      field = form.fields.select {|field| field.slug==slug}.first
-      if value.kind_of?(String)
-        final_value = value
-      elsif value.kind_of?(Array)
-        final_value = value.join(',')
-      elsif value.kind_of?(Hash)
-        final_value = value.map {|option, present| present == '1' ? option : nil}.compact.join(',')
+    form.fields.each do |field|
+      final_value = ''
+      if submission.has_key?(field.slug)
+        value = submission[field.slug]
+        if value.kind_of?(String)
+          final_value = value
+        elsif value.kind_of?(Array)
+          final_value = value.join(',')
+        elsif value.kind_of?(Hash)
+          final_value = value.map {|option, present| present == '1' ? option : nil}.compact.join(',')
+        end
       end
       answers << CustomFormsPlugin::Answer.new(:field => field, :value => final_value)
     end
@@ -8,7 +8,6 @@ jQuery(&#39;.icon-edit&#39;).live(&#39;click&#39;, function() {
       id = jQuery(elem).attr('field_id');
       type = jQuery('#fields_'+id+'_type').val().split('_')[0];
       selector = '#edit-'+type+'-'+id
-      jQuery(selector).show();
       return selector
     }
   });
@@ -28,3 +28,6 @@
 .edit-information {
   display: none;
 }
+#colorbox .edit-information {
+  display: block;
+}
@@ -0,0 +1,31 @@
+require File.dirname(__FILE__) + '/../../../../test/test_helper'
+require File.dirname(__FILE__) + '/../../controllers/custom_forms_plugin_profile_controller'
+
+# Re-raise errors caught by the controller.
+class CustomFormsPluginProfileController; def rescue_action(e) raise e end; end
+
+class CustomFormsPluginProfileControllerTest < ActionController::TestCase
+  def setup
+    @controller = CustomFormsPluginProfileController.new
+    @request    = ActionController::TestRequest.new
+    @response   = ActionController::TestResponse.new
+    @profile = create_user('profile').person
+    login_as(@profile.identifier)
+    environment = Environment.default
+    environment.enable_plugin(CustomFormsPlugin)
+  end
+
+  attr_reader :profile
+
+  should 'save submission if fields are ok' do
+    form = CustomFormsPlugin::Form.create!(:profile => profile, :name => 'Free Software')
+    field1 = CustomFormsPlugin::TextField.create(:name => 'Name', :form => form, :mandatory => true)
+    field2 = CustomFormsPlugin::TextField.create(:name => 'License', :form => form)
+
+    assert_difference CustomFormsPlugin::Submission, :count, 1 do
+      post :show, :profile => profile.identifier, :id => form.id, :submission => {field1.name.to_slug => 'Noosfero', field2.name.to_slug => 'GPL'}
+    end
+    assert !session[:notice].include?('not saved')
+    assert_redirected_to :action => 'show'
+  end
+end
 <tr id=<%= "empty-option-#{counter}" %> option_id=<%= option_counter %> style="display: none;">
   <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][name]") %></td>
-  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][value]", nil, :size => 15) %></td>
+  <td><%= text_field_tag("fields[#{counter}][choices][#{option_counter}][value]") %></td>
   <td class='actions'>
     <%= button_without_text :remove, _('Remove'), '#', :class => 'remove-option', :field_id => counter, :option_id => option_counter,  :confirm => _('Are you sure you want to remove this option?') %>
   </td>
@@ -486,7 +486,9 @@ jQuery(function($) {
       // logged in
       loggedInDataCallBack(data);
       addManageEnterprisesToOldStyleMenu(data);
-      chatOnlineUsersDataCallBack(data);
+      if (data.chat_enabled) {
+        setInterval(function(){ $.getJSON('/account/user_data', chatOnlineUsersDataCallBack)}, 10000);
+      }
     } else {
       // not logged in
       $('#user .not-logged-in, .login-block .not-logged-user').fadeIn();
@@ -538,7 +540,7 @@ jQuery(function($) {
       return;
     }
     var content = '';
-    $('#chat-online-users').html($('#chat-online-users').html().replace(/%{amount}/g, data['amount_of_friends']));
+    $('#chat-online-users .amount_of_friends').html(data['amount_of_friends']);
     $('#chat-online-users').fadeIn();
     for (var user in data['friends_list']) {
       var name = "<span class='friend_name'>%{name}</span>";
@@ -253,7 +253,7 @@ jQuery(function($) {
                  result.show = 'away';
               }
            }
-           if ($(stanza).find('x[xmlns='+ Strophe.NS.MUC_USER +']').length > 0) {
+           if ($(stanza).find('x[xmlns="'+ Strophe.NS.MUC_USER +'"]').length > 0) {
               result.is_from_room = true;
               result.from_user = $(stanza).find('x item').attr('jid');
               if ($(stanza).find('x item').attr('affiliation') == 'owner') {
@@ -351,7 +351,7 @@ jQuery(function($) {
      },
      on_muc_support: function(iq) {
-        if ($(iq).find('identity[category=conference]').length > 0 && $(iq).find('feature[var='+ Strophe.NS.MUC +']').length > 0) {
+        if ($(iq).find('identity[category=conference]').length > 0 && $(iq).find('feature[var="'+ Strophe.NS.MUC +'"]').length > 0) {
            var name = $(iq).find('identity[category=conference]').attr('name');
            log('muc support found with identity '+ name);
            Jabber.muc_supported = true;
@@ -4884,6 +4884,11 @@ h1#agenda-title {
 #chat-window .history .message h5, #chat-window .history .message p {
   margin: 0;
 }
+#chat-window .history .message p {
+  max-width: 100%;
+  overflow: auto;
+}
+
 #chat-window .history .message .avatar {
   position: absolute;
   left: 0;
 require File.dirname(__FILE__) + '/../test_helper'
-class BlogHelperTest < ActiveSupport::TestCase
+class BlockHelperTest < ActiveSupport::TestCase
   include BlockHelper
   include ActionView::Helpers::TagHelper
@@ -234,6 +234,14 @@ class EventTest &lt; ActiveSupport::TestCase
     assert_equal "<strong> Address <strong>", event.address
   end
+  should 'not filter & on link field' do
+    event = Event.new
+    event.link = 'myevent.com/?param1=value&param2=value2'
+    event.valid?
+
+    assert_equal "http://myevent.com/?param1=value&param2=value2", event.link
+  end
+
   should 'escape malformed html tags' do
     event = Event.new
     event.body = "<h1<< Description >>/h1>"
@@ -335,7 +335,7 @@ class UserTest &lt; ActiveSupport::TestCase
     Person.any_instance.stubs(:is_admin?).returns(true)
     Person.any_instance.stubs(:created_at).returns(DateTime.parse('16-08-2010'))
     expected_hash = {
-      'login' => 'x_and_y', 'is_admin' => true, 'since_month' => 8, 'since_year' => 2010, 'email_domain' => nil, 'amount_of_friends' => 0,
+      'login' => 'x_and_y', 'is_admin' => true, 'since_month' => 8, 'chat_enabled' => false, 'since_year' => 2010, 'email_domain' => nil, 'amount_of_friends' => 0,
       'friends_list' => {}, 'enterprises' => [],
     }
     assert_equal expected_hash, person.user.data_hash
@@ -399,6 +399,19 @@ class UserTest &lt; ActiveSupport::TestCase
     assert_equal 15, User.expires_chat_status_every
   end
+  should "return status of chat on environment in data_hash" do
+    person = create_user('coldplay').person
+    env = person.environment
+    env.enable('xmpp_chat')
+    env.save
+    assert_equal true, person.user.data_hash['chat_enabled']
+
+    env.disable('xmpp_chat')
+    env.save
+    person.reload
+    assert_equal false, person.user.data_hash['chat_enabled']
+  end
+
   should 'respond name with related person name' do
     user = create_user('testuser')
     user.person.name = 'Test User'
	@@ -244,7 +244,7 @@ module FormsHelper		@@ -244,7 +244,7 @@ module FormsHelper
244	yearSuffix: #{datepicker_options[:year_suffix].to_json}	244	yearSuffix: #{datepicker_options[:year_suffix].to_json}
245	})	245	})
246	</script>	246	</script>
247	- "	247	+ ".html_safe
248	result	248	result
249	end	249	end
250		250
	@@ -84,5 +84,11 @@ module LayoutHelper		@@ -84,5 +84,11 @@ module LayoutHelper
84	theme_path + '/style.css'	84	theme_path + '/style.css'
85	end	85	end
86		86
		87	+ def addthis_javascript
		88	+ if NOOSFERO_CONF['addthis_enabled']
		89	+ '<script src="http://s7.addthis.com/js/152/addthis_widget.js"></script>'
		90	+ end
		91	+ end
		92	+
87	end	93	end
88		94
	@@ -595,7 +595,7 @@ class Article < ActiveRecord::Base		@@ -595,7 +595,7 @@ class Article < ActiveRecord::Base
595	end	595	end
596		596
597	def lead	597	def lead
598	- abstract.blank? ? first_paragraph : abstract	598	+ abstract.blank? ? first_paragraph.html_safe : abstract.html_safe
599	end	599	end
600		600
601	def short_lead	601	def short_lead
	@@ -14,7 +14,6 @@ class Event < Article		@@ -14,7 +14,6 @@ class Event < Article
14	maybe_add_http(self.setting[:link])	14	maybe_add_http(self.setting[:link])
15	end	15	end
16		16
17	- xss_terminate :only => [ :link ], :on => 'validation'
18	xss_terminate :only => [ :body, :link, :address ], :with => 'white_list', :on => 'validation'	17	xss_terminate :only => [ :body, :link, :address ], :with => 'white_list', :on => 'validation'
19		18
20	def initialize(*args)	19	def initialize(*args)
	@@ -60,7 +60,6 @@		@@ -60,7 +60,6 @@
60	addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';	60	addthis_options = '<%= escape_javascript( NOOSFERO_CONF['addthis_options'] ) %>';
61	</script>	61	</script>
62	<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>	62	<a href="http://www.addthis.com/bookmark.php" id="bt_addThis" target="_blank" onmouseover="return addthis_open(this, '', '[URL]')" onmouseout="addthis_close()" onclick="return addthis_sendto()"><%= addthis_image_tag %></a>
63	-<script type="text/javascript" src="http://s7.addthis.com/js/152/addthis_widget.js"></script>
64	</div>	63	</div>
65	<% end %>	64	<% end %>
66		65
	@@ -56,5 +56,6 @@		@@ -56,5 +56,6 @@
56	</div><!-- end id="theme-footer" -->	56	</div><!-- end id="theme-footer" -->
57	<%= noosfero_layout_features %>	57	<%= noosfero_layout_features %>
58	<%= theme_javascript_ng %>	58	<%= theme_javascript_ng %>
		59	+ <%= addthis_javascript %>
59	</body>	60	</body>
60	</html>	61	</html>
	@@ -6,6 +6,6 @@		@@ -6,6 +6,6 @@
6	</div>	6	</div>
7	</div>	7	</div>
8	<a href='#' id='chat-online-users-title' onclick='return false;'>	8	<a href='#' id='chat-online-users-title' onclick='return false;'>
9	- <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat <span class='amount_of_friends'>(%{amount})</span>") %></span></div>	9	+ <div class='header'><i class='icon-chat'></i><span><%= _("Friends in chat (<span class='amount_of_friends'>%{amount}</span>)") %></span></div>
10	</a>	10	</a>
11	</div>	11	</div>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class ChangeArticlePublishedAtFromDateToDatetime < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_column :articles, :published_at, :datetime
	4	+ end
	5	+
	6	+ def self.down
	7	+ change_column :articles, :published_at, :date
	8	+ end
	9	+end
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class ChangeArticleVersionsPublishedAtFromDateToDatetime < ActiveRecord::Migration
	2	+ def self.up
	3	+ change_column :article_versions, :published_at, :datetime
	4	+ end
	5	+
	6	+ def self.down
	7	+ change_column :article_versions, :published_at, :date
	8	+ end
	9	+end
	@@ -28,3 +28,6 @@		@@ -28,3 +28,6 @@
28	.edit-information {	28	.edit-information {
29	display: none;	29	display: none;
30	}	30	}
		31	+#colorbox .edit-information {
		32	+ display: block;
		33	+}