Download as
Browse Code »

Commit 353c627b5e225da1e02fd98d93d9efa81c92abd1

Authored by Leandro Santos
2 parents 2dd0cfb6 7e277a5d
Exists in production

Merge branch 'staging' into production

Showing 6 changed files with 22 additions and 35 deletions   Show diff stats
enable_participa_plugins
View file @2dd0cfb
... ... @@ -1,32 +0,0 @@
1   -./script/noosfero-plugins disableall
2   -./script/noosfero-plugins enable breadcrumbs
3   -./script/noosfero-plugins enable comment_paragraph
4   -./script/noosfero-plugins enable container_block
5   -./script/noosfero-plugins enable dspace
6   -./script/noosfero-plugins enable oauth_client
7   -./script/noosfero-plugins enable piwik
8   -./script/noosfero-plugins enable relevant_content
9   -./script/noosfero-plugins enable sub_organizations
10   -./script/noosfero-plugins enable ckeditor_content
11   -./script/noosfero-plugins enable community_block
12   -./script/noosfero-plugins enable context_content
13   -./script/noosfero-plugins enable email_article
14   -./script/noosfero-plugins enable oauth_provider
15   -./script/noosfero-plugins enable proposals_discussion
16   -./script/noosfero-plugins enable require_auth_to_comment
17   -./script/noosfero-plugins enable video
18   -./script/noosfero-plugins enable comment_classification
19   -./script/noosfero-plugins enable community_hub
20   -./script/noosfero-plugins enable custom_forms
21   -./script/noosfero-plugins enable import_data
22   -./script/noosfero-plugins enable pairwise
23   -./script/noosfero-plugins enable site_tour
24   -./script/noosfero-plugins enable vote
25   -./script/noosfero-plugins enable comment_group
26   -./script/noosfero-plugins enable community_track
27   -./script/noosfero-plugins enable display_content
28   -./script/noosfero-plugins enable mark_comment_as_read
29   -./script/noosfero-plugins enable pg_search
30   -./script/noosfero-plugins enable recent_content
31   -./script/noosfero-plugins enable statistics
32   -./script/noosfero-plugins enable work_assignment
plugins/community_track/test/functional/community_track_plugin_cms_controller_test.rb
  Diff comments   View file @353c627
... ... @@ -6,6 +6,9 @@ class CmsController; def rescue_action(e) raise e end; end
6 6 class CmsControllerTest < ActionController::TestCase
7 7  
8 8 def setup
  9 + @environment = Environment.default
  10 + @environment.enabled_plugins = ['CommunityTrackPlugin']
  11 + @environment.save!
9 12 @profile = fast_create(Community)
10 13 @track = create_track('track', @profile)
11 14 @step = CommunityTrackPlugin::Step.create!(:name => 'step1', :body => 'body', :profile => @profile, :parent => @track, :published => false, :end_date => Date.today, :start_date => Date.today)
... ... @@ -39,4 +42,15 @@ class CmsControllerTest &lt; ActionController::TestCase
39 42 assert_equal 'changed', @step.name
40 43 end
41 44  
  45 + should 'have parent_id present in form' do
  46 + get :new, :parent_id => @track.id, :profile => @profile.identifier, :type => CommunityTrackPlugin::Step
  47 + assert_tag :tag => 'input', :attributes => { :name => 'parent_id' }
  48 + end
  49 +
  50 + should 'be able to create an step with a parent' do
  51 + amount_of_steps = CommunityTrackPlugin::Step.count
  52 + post :new, :parent_id => @track.id, :profile => @profile.identifier, :type => CommunityTrackPlugin::Step, :article => {:name => 'some', :body => 'some'}
  53 + assert_equal amount_of_steps + 1, CommunityTrackPlugin::Step.count
  54 + end
  55 +
42 56 end
... ...
plugins/community_track/views/cms/community_track_plugin/_step.html.erb
  Diff comments   View file @353c627
... ... @@ -14,6 +14,8 @@
14 14  
15 15 <%= labelled_form_field(_('Tool type'), select(:article, :tool_type, @article.enabled_tools.map {|t| [t.short_description, t.name]} )) %>
16 16 <%= hidden_field_tag('success_back_to', url_for(@article.parent.view_url)) %>
  17 + <%= hidden_field_tag('parent_id', @article.parent_id) %>
  18 +
17 19 </div>
18 20  
19 21 <%= labelled_form_field check_box(:article, :hidden) + _('Hidden Step'), '' %>
... ...
plugins/oauth_client/Gemfile
  Diff comments   View file @353c627
1 1 source 'https://rubygems.org'
2 2 gem 'omniauth', '~> 1.2.2'
3 3 gem 'omniauth-facebook', '~> 2.0.0'
4   -gem "omniauth-google-oauth2", '~> 0.2.6'
  4 +gem "omniauth-google-oauth2", '0.2.6'
... ...
plugins/proposals_discussion
  Diff comments   View file @353c627
1   -Subproject commit bf59537c3fc4026757975c9644163445568dcc88
  1 +Subproject commit 5aa7a5fa14d9ba12b0588696449a5a89c60c1092
... ...
script/production
  Diff comments   View file @353c627
... ... @@ -40,7 +40,10 @@ app_server_stop() {
40 40 app_server_restart() {
41 41 # see unicorn_rails(1) and "Signal handling" in unicorn documentation
42 42 kill -s USR2 $(cat tmp/pids/unicorn.pid)
43   - sleep 5
  43 + while [ ! -f tmp/pids/unicorn.pid.oldbin ]
  44 + do
  45 + sleep 1
  46 + done
44 47 kill -s QUIT $(cat tmp/pids/unicorn.pid.oldbin)
45 48 }
46 49  
... ...