Rails4 migration.

This commit is contained in:
Martin Edenhofer 2013-08-22 22:29:24 +02:00
parent 5878b239dc
commit e9a21228ec
7 changed files with 21 additions and 32 deletions

19
Gemfile
View file

@ -1,11 +1,8 @@
source 'http://rubygems.org' source 'http://rubygems.org'
gem 'rails', '3.2.14' gem 'rails', '4.0.0'
gem 'rails-observers'
# preparation for rails 4 gem 'activerecord-session_store'
#gem 'rails', '4.0.0.rc1'
#gem 'rails-observers'
#gem 'activerecord-session_store'
gem 'eco' gem 'eco'
@ -19,10 +16,8 @@ gem 'json'
group :assets do group :assets do
# preparation for rails 4 # preparation for rails 4
# gem 'sass-rails', '~> 4.0.0.rc1' gem 'sass-rails', '~> 4.0.0'
# gem 'coffee-rails', '~> 4.0.0.rc1' gem 'coffee-rails', '~> 4.0.0'
gem 'sass-rails', '~> 3.2.4'
gem 'coffee-rails', '~> 3.2.2'
gem 'uglifier' gem 'uglifier'
end end
@ -76,6 +71,8 @@ gem 'em-websocket'
# in production environments by default. # in production environments by default.
group :development, :test do group :development, :test do
gem 'test-unit'
gem 'sqlite3' gem 'sqlite3'
# code coverage # code coverage
@ -92,4 +89,4 @@ group :development, :test do
# gem 'em-websocket-client' # gem 'em-websocket-client'
end end
gem 'thin' gem 'puma'

View file

@ -14,7 +14,8 @@ class ApplicationController < ActionController::Base
:mode_show_rendeder, :mode_show_rendeder,
:model_index_render :model_index_render
before_filter :log_request, :set_user, :session_update skip_before_filter :verify_authenticity_token
before_filter :set_user, :session_update
before_filter :cors_preflight_check before_filter :cors_preflight_check
after_filter :set_access_control_headers after_filter :set_access_control_headers
@ -52,10 +53,6 @@ class ApplicationController < ActionController::Base
Observer::Ticket::Notification.transaction Observer::Ticket::Notification.transaction
end end
def log_request
puts Time.now().to_s + ' ' + request.original_fullpath.to_s
end
# Finds the User with the ID stored in the session with the key # Finds the User with the ID stored in the session with the key
# :current_user_id This is a common way to handle user login in # :current_user_id This is a common way to handle user login in
# a Rails application; logging in sets the session value and # a Rails application; logging in sets the session value and
@ -257,7 +254,7 @@ class ApplicationController < ActionController::Base
begin begin
# create object # create object
generic_object = object.new( object.param_cleanup(params) ) generic_object = object.new( object.param_cleanup( params[object.to_s.downcase] ) )
# save object # save object
generic_object.save! generic_object.save!
@ -280,7 +277,7 @@ class ApplicationController < ActionController::Base
generic_object = object.find( params[:id] ) generic_object = object.find( params[:id] )
# save object # save object
generic_object.update_attributes!( object.param_cleanup(params) ) generic_object.update_attributes!( object.param_cleanup( params[object.to_s.downcase] ) )
model_update_render_item(generic_object) model_update_render_item(generic_object)
rescue Exception => e rescue Exception => e
logger.error e.message logger.error e.message

View file

@ -53,7 +53,7 @@ class TicketsController < ApplicationController
if params[:article] if params[:article]
form_id = params[:article][:form_id] form_id = params[:article][:form_id]
params[:article].delete(:form_id) params[:article].delete(:form_id)
@article = Ticket::Article.new( params[:article] ) @article = Ticket::Article.new( Ticket::Article.param_validation( params[:article] ) )
@article.ticket_id = @ticket.id @article.ticket_id = @ticket.id
# find attachments in upload cache # find attachments in upload cache

View file

@ -79,11 +79,5 @@ module Zammad
# REST api path # REST api path
config.api_path = '/api/v1' config.api_path = '/api/v1'
# Enable threaded mode
config.threadsafe!
# catch all router files
config.paths['config/routes'] += Dir[Rails.root.join("config/routes/*.rb")]
end end
end end

View file

@ -6,9 +6,6 @@ Zammad::Application.configure do
# since you don't have to restart the web server when you make code changes. # since you don't have to restart the web server when you make code changes.
config.cache_classes = false config.cache_classes = false
# Log error messages when you accidentally call methods on nil.
config.whiny_nils = true
# Show full error reports and disable caching # Show full error reports and disable caching
config.consider_all_requests_local = true config.consider_all_requests_local = true
config.action_controller.perform_caching = false config.action_controller.perform_caching = false

View file

@ -15,9 +15,6 @@ Zammad::Application.configure do
config.assets.compile = true config.assets.compile = true
config.assets.digest = true config.assets.digest = true
# Log error messages when you accidentally call methods on nil
config.whiny_nils = true
# Show full error reports and disable caching # Show full error reports and disable caching
config.consider_all_requests_local = true config.consider_all_requests_local = true
config.action_controller.perform_caching = true config.action_controller.perform_caching = true

View file

@ -8,4 +8,11 @@ Zammad::Application.routes.draw do
# just remember to delete public/index.html. # just remember to delete public/index.html.
root :to => 'init#index', :via => :get root :to => 'init#index', :via => :get
# load routes from external files
dir = File.expand_path('../', __FILE__)
files = Dir.glob( "#{dir}/routes/*.rb" )
for file in files
require file
end
end end