webmcp

diff framework/env/request/get_view.lua @ 221:25a20bd1f416

More work on Moonbridge integration: several changes in env/request
author jbe
date Wed Feb 25 01:33:27 2015 +0100 (2015-02-25)
parents 2f8d8edd1836
children 24d69c4f23c1
line diff
     1.1 --- a/framework/env/request/get_view.lua	Sun Feb 22 17:16:13 2015 +0100
     1.2 +++ b/framework/env/request/get_view.lua	Wed Feb 25 01:33:27 2015 +0100
     1.3 @@ -11,13 +11,13 @@
     1.4      return request._forward.view or 'index'
     1.5    else
     1.6      if request._view then
     1.7 -      local suffix = request._suffix or "html"
     1.8 +      local suffix = request._route._suffix or "html"
     1.9        if suffix == "html" then
    1.10 -        return request._view
    1.11 +        return request._route._view
    1.12        else
    1.13 -        return request._view .. "." .. suffix
    1.14 +        return request._route._view .. "." .. suffix
    1.15        end
    1.16 -    elseif not request._action then
    1.17 +    elseif not request._route._action then
    1.18        return 'index'
    1.19      else
    1.20        return nil

Impressum / About Us