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

Cleaned demo.ecf

Browse Source 
Fixed modules admin handler permission checking from "admin.installation_access" to "administration.installation_access".
Use constants for known form id.
Invoke hook form alter for user view response.
Include theme when installing roc cms library.
This commit is contained in:
Jocelyn Fiat
2017-09-11 22:31:23 +02:00
parent 5f7eb82def
commit 6b4668ec6b
11 changed files with 209 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/install.bat
View File

@@ -57,6 +57,7 @@ echo Install ROC as CMS ewf
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\dev_modules
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\modules
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\examples
%SAFE_RMDIR% %TMP_UNSTABLE_DIR%\library\web\cms\themes
%COPYCMD% %TMP_DIR%\launcher %TMP_UNSTABLE_DIR%\library\web\cms\launcher
%COPYCMD% %TMP_DIR%\library %TMP_UNSTABLE_DIR%\library\web\cms\library
@@ -65,6 +66,7 @@ echo Install ROC as CMS ewf
%COPYCMD% %TMP_DIR%\modules %TMP_UNSTABLE_DIR%\library\web\cms\modules
%COPYCMD% %TMP_DIR%\dev_modules %TMP_UNSTABLE_DIR%\library\web\cms\dev_modules
%COPYCMD% %TMP_DIR%\examples %TMP_UNSTABLE_DIR%\library\web\cms\examples
%COPYCMD% %TMP_DIR%\themes %TMP_UNSTABLE_DIR%\library\web\cms\themes
echo TOOLS
%COPYCMD% %TMP_DIR%\tools %TMP_UNSTABLE_DIR%\library\web\cms\tools
%SAFE_RM% %TMP_UNSTABLE_DIR%\library\web\cms\tools\install.bat

57
tools/roc/roc_install_command.e
View File

@@ -248,6 +248,8 @@ feature -- Execution
end
end
end
elseif l_config_path /= Void then
localized_print_error ({STRING_32} "Unable to read configuration file %"" + l_config_path.name + "%"!%N")
end
if l_cms_path = Void then
@@ -282,7 +284,7 @@ feature -- Execution
print (" in %"")
print (l_dest_dir.path.name)
print ("%":%N")
install_module_elements (l_module_source_path, l_dest_dir.path, Void)
install_module_elements (l_mod_name, l_module_source_path, l_dest_dir.path, Void)
-- install_module_elements (l_module_source_path, l_dest_dir.path, Config_dir)
-- install_module_elements (l_module_source_path, l_dest_dir.path, Scripts_dir)
-- install_module_elements (l_module_source_path, l_dest_dir.path, Themes_dir)
@@ -350,7 +352,52 @@ feature -- Execution
end
end
install_module_elements (a_module_source_path: ROC_INSTALL_COPY_PARAMETERS; a_cms_module_target_path: PATH; a_element: detachable READABLE_STRING_GENERAL)
ecf_location (a_module_name: READABLE_STRING_GENERAL; a_module_source_path: ROC_INSTALL_COPY_PARAMETERS): detachable PATH
-- ecf location if exists.
-- Try to find based on `a_module_name`, or dir name from `a_module_source_path`, or .. search unique .ecf file (ignoring -safe.ecf).
local
l_name: READABLE_STRING_GENERAL
p: PATH
ut: FILE_UTILITIES
do
p := a_module_source_path.location
Result := p.extended (a_module_name).appended_with_extension ("ecf")
if ut.file_path_exists (Result) then
-- Found.
else
Result := Void
if attached p.entry as e then
Result := p.extended (e.name).appended_with_extension ("ecf")
if not ut.file_path_exists (Result) then
Result := Void
end
end
if Result = Void then
if attached ut.file_names (p.name) as l_filenames then
across
l_filenames as ic
until
Result /= Void
loop
l_name := ic.item
if l_name.ends_with (".ecf") then
if l_name.ends_with ("-safe.ecf") then
-- Ignore
else
Result := p.extended (l_name)
if not ut.file_path_exists (Result) then
check existing_file: False end
Result := Void
end
end
end
end
end
end
end
end
install_module_elements (a_module_name: READABLE_STRING_GENERAL; a_module_source_path: ROC_INSTALL_COPY_PARAMETERS; a_cms_module_target_path: PATH; a_element: detachable READABLE_STRING_GENERAL)
-- Install module site files from `a_module_source_path' to cms application `a_cms_module_target_path' under expected modules folder.
-- If `a_element' is set, take into account only sub folder `a_element'.
local
@@ -380,6 +427,12 @@ feature -- Execution
else
link_directory (l_src_dir, l_dest_dir, True)
end
-- Detect ecf file (in the future, update main ecf file).
if attached ecf_location (a_module_name, a_module_source_path) as l_ecf_loc then
-- Found ecf file.
elseif not a_module_name.is_case_insensitive_equal ("core") then
localized_print_error ({STRING_32} "Missing .ecf file for " + a_module_name + "!%N")
end
end
install_theme_elements (a_theme_source_path: ROC_INSTALL_COPY_PARAMETERS; a_cms_theme_target_path: PATH; a_element: detachable READABLE_STRING_GENERAL)