backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Better handling of path or location for administration links.

Browse Source
This commit is contained in:
Jocelyn FIAT
2017-03-24 21:56:48 +01:00
parent 21e75a6492
commit 307a87eaf4
5 changed files with 39 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/service/cms_api.e
View File

@@ -256,11 +256,15 @@ feature -- Access: url
administration_path (a_relative_path: detachable READABLE_STRING_8): STRING_8
do
create Result.make_from_string (setup.administration_base_path)
if a_relative_path /= Void and then not a_relative_path.is_empty then
if a_relative_path[1] /= '/' then
if a_relative_path /= Void then
if a_relative_path.is_empty then
Result.append_character ('/')
else
if a_relative_path[1] /= '/' then
Result.append_character ('/')
end
Result.append (a_relative_path)
end
Result.append (a_relative_path)
end
end
@@ -270,8 +274,14 @@ feature -- Access: url
do
create Result.make_from_string (administration_base_path_location)
if a_relative_location /= Void then
Result.append_character ('/')
Result.append (a_relative_location)
if a_relative_location.is_empty then
Result.append_character ('/')
else
if a_relative_location[1] /= '/' then
Result.append_character ('/')
end
Result.append (a_relative_location)
end
end
end
@@ -282,9 +292,11 @@ feature {NONE} -- Url implementation.
feature -- CMS links
administration_link (a_title: READABLE_STRING_GENERAL; a_location: READABLE_STRING_8): CMS_LOCAL_LINK
administration_link (a_title: READABLE_STRING_GENERAL; a_relative_location: detachable READABLE_STRING_8): CMS_LOCAL_LINK
require
no_first_slash: a_relative_location = Void or else not a_relative_location.starts_with_general ("/")
do
Result := local_link (a_title, administration_path_location (a_location))
Result := local_link (a_title, administration_path_location (a_relative_location))
end
local_link (a_title: READABLE_STRING_GENERAL; a_location: READABLE_STRING_8): CMS_LOCAL_LINK

4
src/service/cms_execution.e
View File

@@ -160,8 +160,8 @@ feature -- Settings: router
l_api.logger.put_debug (generator + ".setup_router_for_administration", Void)
-- Configure root of api handler.
l_router.set_base_url (l_api.administration_path (""))
l_router.set_base_url (l_api.administration_path (Void))
-- Include routes from modules.
across
modules as ic

2
src/service/handler/cms_admin_install_handler.e
View File

@@ -105,7 +105,7 @@ feature -- HTTP Methods
s.append ("</li>%N")
end
s.append ("</ul>")
s.append ("<div>Back to the " + r.link ("Administration", api.administration_path (""), Void) + " ...</div>")
s.append ("<div>Back to the " + r.link ("Administration", api.administration_path (Void), Void) + " ...</div>")
r.set_main_content (s)
end
r.set_title (r.translation ("CMS Installation ...", Void))

6
src/service/response/cms_response.e
View File

@@ -1333,9 +1333,11 @@ feature -- Generation
feature -- Helpers: cms link
administration_link (a_title: READABLE_STRING_GENERAL; a_location: READABLE_STRING_8): CMS_LOCAL_LINK
administration_link (a_title: READABLE_STRING_GENERAL; a_relative_location: detachable READABLE_STRING_8): CMS_LOCAL_LINK
require
no_first_slash: a_relative_location = Void or else not a_relative_location.starts_with_general ("/")
do
Result := api.administration_link (a_title, a_location)
Result := api.administration_link (a_title, a_relative_location)
end
local_link (a_title: READABLE_STRING_GENERAL; a_location: READABLE_STRING_8): CMS_LOCAL_LINK