Moved views

2013-07-11 02:09:55 +07:00 · 2013-07-11 02:09:55 +07:00 · 999509d17f
parent 23fee68790
commit 999509d17f
7 changed files with 3 additions and 2 deletions
--- a/app/views/default.slim
+++ b/app/views/default.slim
--- a/app/views/error_403.slim
+++ b/app/views/error_403.slim
--- a/app/views/error_404.slim
+++ b/app/views/error_404.slim
--- a/app/views/form.slim
+++ b/app/views/form.slim
--- a/app/views/show.slim
+++ b/app/views/show.slim
--- a/lib/error_pages.rb
+++ b/lib/error_pages.rb
@ -1,5 +1,5 @@
 class ErrorPages < Sinatra::Base
-  set :views, File.expand_path('../../views', __FILE__)
+  set :views, File.expand_path('../../app/views', __FILE__)

  not_found do
    status 404
--- a/pastemaster.rb
+++ b/pastemaster.rb
@ -24,6 +24,7 @@ require 'lib/assets'
 class Pastemaster < Sinatra::Application
  set :server, 'unicorn'
  set :public_folder, 'public'
+  set :views, File.expand_path('../app/views', __FILE__)

  set :slim, pretty: true

@ -46,7 +47,7 @@ class Pastemaster < Sinatra::Application
  end

  get '/:id/:key' do
-    @paste = Paste.find(params[:id])
+    @paste = Paste.find(params[:id].to_i)
    return not_found unless @paste

    begin