Allow trailing ? when calling rezept or interaction

ngiger · Mar 19, 2014 · 502e915 · 502e915
1 parent 7695e09
commit 502e915
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/state/drugs/prescription.rb b/src/state/drugs/prescription.rb
@@ -39,7 +39,7 @@ def handle_drug_changes(drugs, msg)
   end
   def init
     ean13 = @session.user_input(:search_query)
-    path = @session.request_path
+    path = @session.request_path.sub(/(\?|)$/, '')
     uri = @session.lookandfeel._event_url(:rezept, [])
     search_code = path.split('rezept/ean/')[1]
     drugs = {}

diff --git a/src/state/interactions/interaction_chooser.rb b/src/state/interactions/interaction_chooser.rb
@@ -36,7 +36,7 @@ def handle_drug_changes(drugs, msg)
 
   def init
     ean13 = @session.user_input(:search_query)
-    path = @session.request_path
+    path = @session.request_path.sub(/(\?|)$/, '')
     search_code = path.split('home_interactions/')[1]
     drugs = {}
     if search_code

diff --git a/src/view/interactions/interaction_chooser.rb b/src/view/interactions/interaction_chooser.rb
@@ -311,7 +311,7 @@ class InteractionChooserForm < View::Form
   private
   def init
     super
-    self.onload = "document.getElementById('interaction_searchbar').focus();"
+    self.onload = "if (document.getElementById('interaction_searchbar') != null) document.getElementById('interaction_searchbar').focus();"
     @form_properties.update({
       'id'     => 'interaction_chooser_form',
       'target' => '_blank',