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

Fixed wrong error report for path alias validation.

Browse Source
This commit is contained in:
Jocelyn FIAT
2015-07-14 12:47:59 +02:00
parent 19e8607e54
commit 5688cffcf1
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
modules/node/handler/cms_node_type_webform_manager.e
View File

@@ -106,12 +106,12 @@ feature -- Forms ...
end end
ti.set_text_value (l_uri) ti.set_text_value (l_uri)
ti.set_description ("Optionally specify an alternative URL path by which this content can be accessed. For example, type 'about' when writing an about page. Use a relative path or the URL alias won't work.") ti.set_description ("Optionally specify an alternative URL path by which this content can be accessed. For example, type 'about' when writing an about page. Use a relative path or the URL alias won't work.")
ti.set_validation_action (agent (fd: WSF_FORM_DATA; a_response: CMS_RESPONSE) ti.set_validation_action (agent (fd: WSF_FORM_DATA; ia_response: NODE_RESPONSE; ia_node: CMS_NODE)
do do
if if
attached fd.string_item ("path_alias") as f_path_alias attached fd.string_item ("path_alias") as f_path_alias
then then
if a_response.api.is_valid_path_alias (f_path_alias) then if ia_response.api.is_valid_path_alias (f_path_alias) then
-- Ok. -- Ok.
elseif f_path_alias.is_empty then elseif f_path_alias.is_empty then
-- Ok -- Ok
@@ -123,12 +123,13 @@ feature -- Forms ...
-- TODO: implement full path alias validation -- TODO: implement full path alias validation
end end
if if
attached a_response.api.source_of_path_alias (f_path_alias) as l_aliased_location attached ia_response.api.source_of_path_alias (f_path_alias) as l_aliased_location and then
not l_aliased_location.same_string (ia_response.node_api.node_path (ia_node))
then then
fd.report_invalid_field ("path_alias", "Path is already aliased to location %"" + a_response.link (Void, l_aliased_location, Void) + "%" !") fd.report_invalid_field ("path_alias", "Path is already aliased to location %"" + ia_response.link (Void, l_aliased_location, Void) + "%" !")
end end
end end
end(?, response) end(?, response, a_node)
) )
end end
if if