aboutsummaryrefslogtreecommitdiffstats
path: root/app/controllers
diff options
context:
space:
mode:
Diffstat (limited to 'app/controllers')
-rw-r--r--app/controllers/application_controller.rb3
-rw-r--r--app/controllers/lines_controller.rb4
-rw-r--r--app/controllers/lines_controller.rb~2
-rw-r--r--app/controllers/welcome_controller.rb4
-rw-r--r--app/controllers/welcome_controller.rb~2
5 files changed, 15 insertions, 0 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
new file mode 100644
index 000000000..e8065d950
--- /dev/null
+++ b/app/controllers/application_controller.rb
@@ -0,0 +1,3 @@
+class ApplicationController < ActionController::Base
+ protect_from_forgery
+end
diff --git a/app/controllers/lines_controller.rb b/app/controllers/lines_controller.rb
new file mode 100644
index 000000000..3a986b27c
--- /dev/null
+++ b/app/controllers/lines_controller.rb
@@ -0,0 +1,4 @@
+class LinesController < InheritedResources::Base
+ defaults :resource_class => Chouette::Line
+
+end
diff --git a/app/controllers/lines_controller.rb~ b/app/controllers/lines_controller.rb~
new file mode 100644
index 000000000..81710ab8f
--- /dev/null
+++ b/app/controllers/lines_controller.rb~
@@ -0,0 +1,2 @@
+class LinesController < ApplicationController
+end
diff --git a/app/controllers/welcome_controller.rb b/app/controllers/welcome_controller.rb
new file mode 100644
index 000000000..f9b859b9c
--- /dev/null
+++ b/app/controllers/welcome_controller.rb
@@ -0,0 +1,4 @@
+class WelcomeController < ApplicationController
+ def index
+ end
+end
diff --git a/app/controllers/welcome_controller.rb~ b/app/controllers/welcome_controller.rb~
new file mode 100644
index 000000000..d8c85ab84
--- /dev/null
+++ b/app/controllers/welcome_controller.rb~
@@ -0,0 +1,2 @@
+class WelcomeController < ApplicationController
+end