webmcp

changeset 92:774a891dc74f

Removed functions param.get_id_raw() and param.get_all_raw()
author jbe
date Wed Oct 10 17:57:40 2012 +0200 (2012-10-10)
parents 2f8d8edd1836
children 075ab292653d
files demo-app/app/main/_filter_view/30_topnav.lua framework/env/param/get_all_cgi.lua framework/env/param/get_all_raw.lua framework/env/param/get_id_cgi.lua framework/env/param/get_id_raw.lua framework/env/ui/filters.lua framework/env/ui/paginate.lua
line diff
     1.1 --- a/demo-app/app/main/_filter_view/30_topnav.lua	Wed Oct 10 17:41:46 2012 +0200
     1.2 +++ b/demo-app/app/main/_filter_view/30_topnav.lua	Wed Oct 10 17:57:40 2012 +0200
     1.3 @@ -55,8 +55,8 @@
     1.4                    mode = "redirect",
     1.5                    module = request.get_module(),
     1.6                    view = request.get_view(),
     1.7 -                  id = param.get_id_raw(),
     1.8 -                  params = param.get_all_raw()
     1.9 +                  id = request.get_id_string(),
    1.10 +                  params = request.get_param_strings()
    1.11                  }
    1.12                }
    1.13              }
     2.1 --- a/framework/env/param/get_all_cgi.lua	Wed Oct 10 17:41:46 2012 +0200
     2.2 +++ b/framework/env/param/get_all_cgi.lua	Wed Oct 10 17:57:40 2012 +0200
     2.3 @@ -2,12 +2,12 @@
     2.4  params =
     2.5  param.get_all_cgi()
     2.6  
     2.7 -Deprecated. Alias for param.get_all_raw().
     2.8 +Deprecated. Alias for request.get_param_strings().
     2.9  
    2.10  --]]--
    2.11  
    2.12  -- TODO: Remove this function.
    2.13  
    2.14 -function param.get_all_raw()
    2.15 -  return param.get_all_raw()
    2.16 +function param.get_all_cgi()
    2.17 +  return request.get_param_strings()
    2.18  end
     3.1 --- a/framework/env/param/get_all_raw.lua	Wed Oct 10 17:41:46 2012 +0200
     3.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.3 @@ -1,15 +0,0 @@
     3.4 ---[[--
     3.5 -params =
     3.6 -param.get_all_raw()
     3.7 -
     3.8 -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.
     3.9 -
    3.10 ---]]--
    3.11 -
    3.12 -function param.get_all_raw()
    3.13 -  if param._exchanged then
    3.14 -    return param._exchanged.params
    3.15 -  else
    3.16 -    return request.get_param_strings()
    3.17 -  end
    3.18 -end
     4.1 --- a/framework/env/param/get_id_cgi.lua	Wed Oct 10 17:41:46 2012 +0200
     4.2 +++ b/framework/env/param/get_id_cgi.lua	Wed Oct 10 17:57:40 2012 +0200
     4.3 @@ -2,12 +2,12 @@
     4.4  value =             -- id as string (or other type after if params.exchange(...) has been used), or nil
     4.5  param.get_id_cgi()
     4.6  
     4.7 -Deprecated. Alias for param.get_id_raw().
     4.8 +Deprecated. Alias for request.get_id_string().
     4.9  
    4.10  --]]--
    4.11  
    4.12  -- TODO: Remove this function.
    4.13  
    4.14  function param.get_id_cgi()
    4.15 -  return param.get_id_raw()
    4.16 +  return request.get_id_string()
    4.17  end
     5.1 --- a/framework/env/param/get_id_raw.lua	Wed Oct 10 17:41:46 2012 +0200
     5.2 +++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
     5.3 @@ -1,15 +0,0 @@
     5.4 ---[[--
     5.5 -value =             -- id as string (or other type after if params.exchange(...) has been used), or nil
     5.6 -param.get_id_raw()
     5.7 -
     5.8 -Returns the requested id for a view unprocessed (that is as a string, unless params.exchange(...) has been used).
     5.9 -
    5.10 ---]]--
    5.11 -
    5.12 -function param.get_id_raw()
    5.13 -  if param._exchanged then
    5.14 -    return param._exchanged.id
    5.15 -  else
    5.16 -    return request.get_id_string()
    5.17 -  end
    5.18 -end
     6.1 --- a/framework/env/ui/filters.lua	Wed Oct 10 17:41:46 2012 +0200
     6.2 +++ b/framework/env/ui/filters.lua	Wed Oct 10 17:57:40 2012 +0200
     6.3 @@ -97,8 +97,8 @@
     6.4              if not current_option or #current_option == 0 then
     6.5                current_option = filter[1].name
     6.6              end
     6.7 -            local id     = param.get_id_raw()
     6.8 -            local params = param.get_all_raw()
     6.9 +            local id     = request.get_id_string()
    6.10 +            local params = request.get_param_strings()
    6.11              ui.container{
    6.12                attr = { class = "ui_filter_head" },
    6.13                content = function()
     7.1 --- a/framework/env/ui/paginate.lua	Wed Oct 10 17:41:46 2012 +0200
     7.2 +++ b/framework/env/ui/paginate.lua	Wed Oct 10 17:57:40 2012 +0200
     7.3 @@ -35,8 +35,8 @@
     7.4    end
     7.5    selector:limit(per_page)
     7.6    selector:offset((current_page - 1) * per_page)
     7.7 -  local id     = param.get_id_raw()
     7.8 -  local params = param.get_all_raw()
     7.9 +  local id     = request.get_id_string()
    7.10 +  local params = request.get_param_strings()
    7.11    local function pagination_elements()
    7.12      if page_count > 1 then
    7.13        for page = 1, page_count do

Impressum / About Us