diff --git a/app/views/portlet/garde_contents/_garde_content.html.haml b/app/views/portlet/garde_contents/_garde_content.html.haml index 9dd0241..69df1e4 100644 --- a/app/views/portlet/garde_contents/_garde_content.html.haml +++ b/app/views/portlet/garde_contents/_garde_content.html.haml @@ -2,15 +2,15 @@ %table.garde_content %tr - %td=simple_format garde_content.column_1 - %td=simple_format garde_content.column_2 - %td=simple_format garde_content.column_3 - %td=simple_format garde_content.column_4 + %td=raw garde_content.column_1 + %td=raw garde_content.column_2 + %td=raw garde_content.column_3 + %td=raw garde_content.column_4 -garde_content.garde_lines.each do |garde_line| %tr - %td=simple_format garde_line.column_1 - %td=simple_format garde_line.column_2 - %td=simple_format garde_line.column_3 - %td=simple_format garde_line.column_4 + %td=raw garde_line.column_1 + %td=raw garde_line.column_2 + %td=raw garde_line.column_3 + %td=raw garde_line.column_4 diff --git a/app/views/portlets/render_public/_gardecontent.html.haml b/app/views/portlets/render_public/_gardecontent.html.haml index 38e52b0..8c80fd7 100644 --- a/app/views/portlets/render_public/_gardecontent.html.haml +++ b/app/views/portlets/render_public/_gardecontent.html.haml @@ -2,15 +2,15 @@ .portlet.garde_content %table %tr - %td=simple_format input.column_1 - %td=simple_format input.column_2 - %td=simple_format input.column_3 - %td=simple_format input.column_4 + %td=raw input.column_1 + %td=raw input.column_2 + %td=raw input.column_3 + %td=raw input.column_4 -input.garde_lines.each do |garde_line| %tr - %td=simple_format garde_line.column_1 - %td=simple_format garde_line.column_2 - %td=simple_format garde_line.column_3 - %td=simple_format garde_line.column_4 + %td=raw garde_line.column_1 + %td=raw garde_line.column_2 + %td=raw garde_line.column_3 + %td=raw garde_line.column_4 diff --git a/config/deploy.rb b/config/deploy.rb index 3d70acc..a5212fd 100644 --- a/config/deploy.rb +++ b/config/deploy.rb @@ -54,4 +54,8 @@ namespace :deploy do task :restart, :roles => :app, :except => { :no_release => true } do run "touch #{File.join(current_path,'tmp','restart.txt')}" end + task :migrate do + run "cd #{deploy_to} && rake db:migrate RAILS_ENV=#{rails_env}" + + end end