Download as
Browse Code »

Commit 8f081d7588089c769e6ac4a07e2a4d1770e9fd96

Authored by Paulo Meireles
2 parents 956e57ad 7b8b62ef
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'mezuro-dev' into mezuro-stable

Showing 5 changed files with 26 additions and 2 deletions   Show diff stats
features/support/hooks.rb
  Diff comments   View file @8f081d7
  1 +Before do
  2 + if !$dunit
  3 + command = "#{RAILS_ROOT}/plugins/mezuro/script/prepare_kalibro_query_file.sh"
  4 + system command
  5 + $dunit = true
  6 + end
  7 +end
  8 +
1 9 After ('@kalibro_restart') do
2 10 command = "#{RAILS_ROOT}/plugins/mezuro/script/delete_all_kalibro_entries.sh"
3 11 system command
... ...
plugins/mezuro/script/delete_all_kalibro_entries.sh
  Diff comments   View file @8f081d7
1 1 #!/bin/bash
2 2  
3   -DATABASE="kalibro_test"
  3 +source plugins/mezuro/script/kalibro_scripts.conf
4 4  
5   -sudo su postgres -c "export PGPASSWORD=\"kalibro\" && psql -q -t -d $DATABASE -c \"SELECT 'DELETE FROM ' || n.nspname || '.' || c.relname || ' CASCADE;' FROM pg_catalog.pg_class AS c LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace WHERE relkind = 'r' AND n.nspname NOT IN ('pg_catalog', 'pg_toast') AND pg_catalog.pg_table_is_visible(c.oid)\" | sed '/sequences/d' > /tmp/query && psql -q -d $DATABASE -f /tmp/query && rm /tmp/query"
  5 +sudo su postgres -c "export PGPASSWORD=$PASSWORD && psql -q -d $DATABASE -f $QUERYFILE"
... ...
plugins/mezuro/script/kalibro_scripts.conf 0 → 100644
  Diff comments   View file @8f081d7
... ... @@ -0,0 +1,6 @@
  1 +# Definition of constants used in kalibro scripts.
  2 +
  3 +DATABASE="kalibro_test"
  4 +PASSWORD="kalibro"
  5 +QUERYFILE=/tmp/query
  6 +EXCEPTION="sequences"
... ...
plugins/mezuro/script/prepare_kalibro_query_file.sh 0 → 100755
  Diff comments   View file @8f081d7
... ... @@ -0,0 +1,9 @@
  1 +#!/bin/bash
  2 +
  3 +source plugins/mezuro/script/kalibro_scripts.conf
  4 +
  5 +sudo su postgres -c "export PGPASSWORD=$PASSWORD &&
  6 + if [ -f $QUERYFILE ]
  7 + then rm $QUERYFILE
  8 + fi &&
  9 + psql -q -t -d $DATABASE -c \"SELECT 'DELETE FROM ' || n.nspname || '.' || c.relname || ' CASCADE;' FROM pg_catalog.pg_class AS c LEFT JOIN pg_catalog.pg_namespace AS n ON n.oid = c.relnamespace WHERE relkind = 'r' AND n.nspname NOT IN ('pg_catalog', 'pg_toast') AND pg_catalog.pg_table_is_visible(c.oid)\" | sed '/$EXCEPTION/d' > $QUERYFILE"
... ...
plugins/mezuro/views/mezuro_plugin_repository/edit.html.erb
  Diff comments   View file @8f081d7
... ... @@ -2,5 +2,6 @@
2 2  
3 3 <h2><%= link_to("#{@project_content.name} Project", @project_content.view_url) %></h2>
4 4 <% form_for :repository, :url => {:action =>"save", :controller => "mezuro_plugin_repository"}, :method => :get do |f| %>
  5 + <%= f.hidden_field :id %>
5 6 <%= render :partial => "form", :locals => {:f => f} %>
6 7 <% end %>
... ...