From baeb747fcbad6e362f14c2fa5bdf971a0e4ce5f0 Mon Sep 17 00:00:00 2001 From: Kane York Date: Tue, 30 Jun 2015 16:43:43 -0700 Subject: [PATCH] Fix param-extraction --- .../discourse/templates/admin/plugins-explorer.hbs | 2 +- plugin.rb | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs index 0e34c83..c34c7e5 100644 --- a/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs +++ b/assets/javascripts/discourse/templates/admin/plugins-explorer.hbs @@ -1,6 +1,6 @@

Queries

- {{combo-box valueAttribute="id" value=selectedQueryId nameProperty="listName" content=content castInteger="true"}} + {{combo-box valueAttribute="id" value=selectedQueryId nameProperty="listName" content=content castInteger="true" nameChanges="true"}} {{d-button action="showCreate" icon="plus" class="no-text"}} {{d-button action="importQuery" label="explorer.import.label" icon="upload"}}
diff --git a/plugin.rb b/plugin.rb index 3a1e0c1..47464c9 100644 --- a/plugin.rb +++ b/plugin.rb @@ -47,9 +47,13 @@ after_initialize do # (The first name is $0.) def self.extract_params(sql) names = [] - new_sql = sql.gsub(/:([a-z_]+)/) do |_| - names << $1 - "$#{names.length - 1}" + new_sql = sql.gsub(/(:?):([a-z_]+)/) do |_| + if $1 == ':' # skip casts + $& + else + names << $1 + "$#{names.length - 1}" + end end {sql: new_sql, names: names} end