Merged branch 'master' into es17.05
This commit is contained in:
@@ -141,7 +141,7 @@ feature -- Hook
|
||||
|
||||
create s.make_empty
|
||||
if attached ch.information as l_information then
|
||||
s.append (l_information)
|
||||
s.append_string_general (l_information)
|
||||
end
|
||||
if attached ch.summary as sum then
|
||||
if not s.is_empty then
|
||||
@@ -248,9 +248,9 @@ feature -- Handler
|
||||
l_size := 25
|
||||
end
|
||||
|
||||
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
|
||||
if r.has_permission ("view recent changes") then
|
||||
l_user := r.user
|
||||
if api.has_permission ("view recent changes") then
|
||||
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
|
||||
l_user := api.user
|
||||
create l_changes.make (l_size, l_until_date, l_filter_source)
|
||||
|
||||
create l_content.make (1024)
|
||||
@@ -406,11 +406,10 @@ feature -- Handler
|
||||
create htdate.make_from_date_time (l_until_date)
|
||||
r.set_title ("Recent changes before " + htdate.string)
|
||||
end
|
||||
r.execute
|
||||
else
|
||||
create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
|
||||
api.response_api.send_permissions_access_denied (Void, <<"view recent changes">>, req, res)
|
||||
end
|
||||
|
||||
r.execute
|
||||
end
|
||||
|
||||
feature -- Hooks configuration
|
||||
|
||||
Reference in New Issue
Block a user