# HG changeset patch # User jbe # Date 1349884660 -7200 # Node ID 774a891dc74f7a2679466657f313cc2e5ffa11a5 # Parent 2f8d8edd18365a044b7e703f3028fee224c4c689 Removed functions param.get_id_raw() and param.get_all_raw() diff -r 2f8d8edd1836 -r 774a891dc74f demo-app/app/main/_filter_view/30_topnav.lua --- a/demo-app/app/main/_filter_view/30_topnav.lua Wed Oct 10 17:41:46 2012 +0200 +++ b/demo-app/app/main/_filter_view/30_topnav.lua Wed Oct 10 17:57:40 2012 +0200 @@ -55,8 +55,8 @@ mode = "redirect", module = request.get_module(), view = request.get_view(), - id = param.get_id_raw(), - params = param.get_all_raw() + id = request.get_id_string(), + params = request.get_param_strings() } } } diff -r 2f8d8edd1836 -r 774a891dc74f framework/env/param/get_all_cgi.lua --- a/framework/env/param/get_all_cgi.lua Wed Oct 10 17:41:46 2012 +0200 +++ b/framework/env/param/get_all_cgi.lua Wed Oct 10 17:57:40 2012 +0200 @@ -2,12 +2,12 @@ params = param.get_all_cgi() -Deprecated. Alias for param.get_all_raw(). +Deprecated. Alias for request.get_param_strings(). --]]-- -- TODO: Remove this function. -function param.get_all_raw() - return param.get_all_raw() +function param.get_all_cgi() + return request.get_param_strings() end diff -r 2f8d8edd1836 -r 774a891dc74f framework/env/param/get_all_raw.lua --- a/framework/env/param/get_all_raw.lua Wed Oct 10 17:41:46 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ---[[-- -params = -param.get_all_raw() - -This function returns a table with all GET/POST parameters (except internal parameters like "_webmcp_path" or "_webmcp_id") unprocessed (that is as a string, unless params.exchange(...) has been used). The returned table must not be modified. - ---]]-- - -function param.get_all_raw() - if param._exchanged then - return param._exchanged.params - else - return request.get_param_strings() - end -end diff -r 2f8d8edd1836 -r 774a891dc74f framework/env/param/get_id_cgi.lua --- a/framework/env/param/get_id_cgi.lua Wed Oct 10 17:41:46 2012 +0200 +++ b/framework/env/param/get_id_cgi.lua Wed Oct 10 17:57:40 2012 +0200 @@ -2,12 +2,12 @@ value = -- id as string (or other type after if params.exchange(...) has been used), or nil param.get_id_cgi() -Deprecated. Alias for param.get_id_raw(). +Deprecated. Alias for request.get_id_string(). --]]-- -- TODO: Remove this function. function param.get_id_cgi() - return param.get_id_raw() + return request.get_id_string() end diff -r 2f8d8edd1836 -r 774a891dc74f framework/env/param/get_id_raw.lua --- a/framework/env/param/get_id_raw.lua Wed Oct 10 17:41:46 2012 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,15 +0,0 @@ ---[[-- -value = -- id as string (or other type after if params.exchange(...) has been used), or nil -param.get_id_raw() - -Returns the requested id for a view unprocessed (that is as a string, unless params.exchange(...) has been used). - ---]]-- - -function param.get_id_raw() - if param._exchanged then - return param._exchanged.id - else - return request.get_id_string() - end -end diff -r 2f8d8edd1836 -r 774a891dc74f framework/env/ui/filters.lua --- a/framework/env/ui/filters.lua Wed Oct 10 17:41:46 2012 +0200 +++ b/framework/env/ui/filters.lua Wed Oct 10 17:57:40 2012 +0200 @@ -97,8 +97,8 @@ if not current_option or #current_option == 0 then current_option = filter[1].name end - local id = param.get_id_raw() - local params = param.get_all_raw() + local id = request.get_id_string() + local params = request.get_param_strings() ui.container{ attr = { class = "ui_filter_head" }, content = function() diff -r 2f8d8edd1836 -r 774a891dc74f framework/env/ui/paginate.lua --- a/framework/env/ui/paginate.lua Wed Oct 10 17:41:46 2012 +0200 +++ b/framework/env/ui/paginate.lua Wed Oct 10 17:57:40 2012 +0200 @@ -35,8 +35,8 @@ end selector:limit(per_page) selector:offset((current_page - 1) * per_page) - local id = param.get_id_raw() - local params = param.get_all_raw() + local id = request.get_id_string() + local params = request.get_param_strings() local function pagination_elements() if page_count > 1 then for page = 1, page_count do