merging from github. Fixing localhost bug in records index page

docjason · Sep 18, 2012 · 3d4220c · 3d4220c
1 parent bff5f75
commit 3d4220c
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 25 deletions.
diff --git a/Gemfile b/Gemfile
@@ -3,7 +3,7 @@ source 'http://rubygems.org'
 
 gem 'rails', '3.2.8'
 gem "health-data-standards", :git => "http://github.com/projectcypress/health-data-standards.git", :branch => "develop"
-gem 'ruby-openid', :git => 'https://github.com/rdingwell/ruby-openid.git',:branch => "master" 
+gem 'ruby-openid', :git => 'http://github.com/rdingwell/ruby-openid.git' #,:branch => "master" 
 gem "mongoid"
 gem "bson_ext"
 gem "pry"
@@ -12,7 +12,7 @@ gem "capistrano"
 gem 'heroku'
 gem "nokogiri"
 gem 'devise'
-gem 'devise_oauth2_providable', :git => 'https://github.com/rdingwell/devise_oauth2_providable.git',:branch => "master" 
+gem 'devise_oauth2_providable', :git => 'http://github.com/rdingwell/devise_oauth2_providable.git' #,:branch => "master" 
 gem 'omniauth_openid_connect', :git => "https://github.com/project-rhex/omniauth_openid_connect.git"
 
 gem 'omniauth'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,6 +1,6 @@
 GIT
   remote: http://github.com/projectcypress/health-data-standards.git
-  revision: 6ede32700d131e227187978817be2a5aa049f175
+  revision: e2a73f19322e6ef9115e932dbba9b11751afa745
   branch: develop
   specs:
     health-data-standards (1.0.1)
@@ -11,31 +11,29 @@ GIT
       uuid (~> 2.3.4)
 
 GIT
-  remote: https://github.com/project-rhex/omniauth_openid_connect.git
-  revision: b12d89d5744b0fcf766b6e12e1fc6c2b2c4382df
-  specs:
-    omniauth_openid_connect (0.2.0)
-      omniauth (~> 1.0)
-      openid_connect (= 0.2.0.alpha3)
-      rack-oauth2
-
-GIT
-  remote: https://github.com/rdingwell/devise_oauth2_providable.git
+  remote: http://github.com/rdingwell/devise_oauth2_providable.git
   revision: 99d0ca56786f86a8e28875d462c99f9e344ac2f9
-  branch: master
   specs:
     devise_oauth2_providable (1.0.5)
       devise (>= 1.4.3)
       rack-oauth2 (>= 0.11.0)
       rails (>= 3.1.0)
 
 GIT
-  remote: https://github.com/rdingwell/ruby-openid.git
+  remote: http://github.com/rdingwell/ruby-openid.git
   revision: cc6fa401242190344935fb12a824fa39043cffc7
-  branch: master
   specs:
     ruby-openid (2.1.9)
 
+GIT
+  remote: https://github.com/project-rhex/omniauth_openid_connect.git
+  revision: b12d89d5744b0fcf766b6e12e1fc6c2b2c4382df
+  specs:
+    omniauth_openid_connect (0.2.0)
+      omniauth (~> 1.0)
+      openid_connect (= 0.2.0.alpha3)
+      rack-oauth2
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -75,7 +73,7 @@ GEM
     bson_ext (1.7.0)
       bson (~> 1.7.0)
     builder (3.0.3)
-    capistrano (2.13.3)
+    capistrano (2.13.4)
       highline
       net-scp (>= 1.0.0)
       net-sftp (>= 2.0.0)
@@ -107,10 +105,10 @@ GEM
     excon (0.16.2)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    factory_girl (4.0.0)
+    factory_girl (4.1.0)
       activesupport (>= 3.0.0)
-    factory_girl_rails (4.0.0)
-      factory_girl (~> 4.0.0)
+    factory_girl_rails (4.1.0)
+      factory_girl (~> 4.1.0)
       railties (>= 3.0.0)
     feedzirra (0.0.24)
       activesupport (>= 2.3.8)
@@ -126,9 +124,9 @@ GEM
       netrc (~> 0.7.7)
       rest-client (~> 1.6.1)
       rubyzip
-    heroku-api (0.3.4)
+    heroku-api (0.3.5)
       excon (~> 0.16.1)
-    highline (1.6.14)
+    highline (1.6.15)
     hike (1.2.1)
     httpclient (2.2.7)
     i18n (0.6.1)
@@ -142,7 +140,7 @@ GEM
       i18n
       json (>= 1.4.3)
       url_safe_base64
-    kaminari (0.14.0)
+    kaminari (0.14.1)
       actionpack (>= 3.0.0)
       activesupport (>= 3.0.0)
     launchy (2.1.2)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
@@ -1,7 +1,7 @@
 require 'request_error'
 
 class ApplicationController < ActionController::Base
-  protect_from_forgery
+#  protect_from_forgery
 
   before_filter :authenticate_user!
   before_filter :audit_log_all

diff --git a/app/views/records/index.html.erb b/app/views/records/index.html.erb
@@ -7,5 +7,5 @@
 
 <h3>Patient Records</h3>
 <% @records.each do |record| %>
-    <div class="record"><%= record.medical_record_number %>. <%= link_to((record.first + '&nbsp;' + record.last).html_safe, root_feed_url(record.medical_record_number)) %></div>
+    <div class="record"><%= record.medical_record_number %>. <%= link_to((record.first + '&nbsp;' + record.last).html_safe, root_feed_path(record.medical_record_number)) %></div>
 <% end %>
diff --git a/config/application.rb b/config/application.rb
@@ -13,6 +13,8 @@
   # Bundler.require(:default, :assets, Rails.env)
 end
 
+
+
 module HdataServer
   class Application < Rails::Application
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,8 @@ @@
       # Bundler.require(:default, :assets, Rails.env)
     end
     module HdataServer
       class Application < Rails::Application
@@ Expand Down @@