From aa1443cb8f42540f6a8cd6e6cec198087aeea22b Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Tue, 7 Nov 2017 15:54:20 +0100 Subject: [PATCH] Fixed conflicts between versions of repeatedly inherited feature. --- modules/admin/handler/cms_admin_handler.e | 5 +++++ modules/admin/handler/format/cms_admin_formats_handler.e | 5 +++++ modules/admin/handler/logs/cms_logs_handler.e | 5 +++++ modules/admin/handler/role/cms_admin_roles_handler.e | 6 +++++- modules/admin/handler/role/cms_role_handler.e | 5 +++++ modules/admin/handler/user/cms_admin_user_handler.e | 5 +++++ modules/admin/handler/user/cms_admin_users_handler.e | 6 +++++- modules/blog/handler/blog_handler.e | 5 +++++ modules/node/handler/node_handler.e | 5 +++++ modules/node/handler/nodes_handler.e | 5 +++++ modules/taxonomy/handler/taxonomy_handler.e | 5 +++++ modules/taxonomy/handler/taxonomy_term_admin_handler.e | 5 +++++ .../taxonomy/handler/taxonomy_vocabulary_admin_handler.e | 5 +++++ modules/taxonomy/handler/taxonomy_vocabulary_handler.e | 5 +++++ src/modules/core/handler/user/cms_user_handler.e | 5 +++++ 15 files changed, 75 insertions(+), 2 deletions(-) diff --git a/modules/admin/handler/cms_admin_handler.e b/modules/admin/handler/cms_admin_handler.e index c7a3b29..bf1dcfb 100644 --- a/modules/admin/handler/cms_admin_handler.e +++ b/modules/admin/handler/cms_admin_handler.e @@ -13,6 +13,11 @@ class inherit CMS_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/admin/handler/format/cms_admin_formats_handler.e b/modules/admin/handler/format/cms_admin_formats_handler.e index 2f8ca94..82fc24b 100644 --- a/modules/admin/handler/format/cms_admin_formats_handler.e +++ b/modules/admin/handler/format/cms_admin_formats_handler.e @@ -11,6 +11,11 @@ inherit CMS_API_ACCESS + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/admin/handler/logs/cms_logs_handler.e b/modules/admin/handler/logs/cms_logs_handler.e index d89f22a..e84de48 100644 --- a/modules/admin/handler/logs/cms_logs_handler.e +++ b/modules/admin/handler/logs/cms_logs_handler.e @@ -11,6 +11,11 @@ class inherit CMS_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/admin/handler/role/cms_admin_roles_handler.e b/modules/admin/handler/role/cms_admin_roles_handler.e index 7a78471..dae7881 100644 --- a/modules/admin/handler/role/cms_admin_roles_handler.e +++ b/modules/admin/handler/role/cms_admin_roles_handler.e @@ -7,9 +7,13 @@ class CMS_ADMIN_ROLES_HANDLER inherit - CMS_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/admin/handler/role/cms_role_handler.e b/modules/admin/handler/role/cms_role_handler.e index 32a36e5..cc987dc 100644 --- a/modules/admin/handler/role/cms_role_handler.e +++ b/modules/admin/handler/role/cms_role_handler.e @@ -11,6 +11,11 @@ class inherit CMS_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/admin/handler/user/cms_admin_user_handler.e b/modules/admin/handler/user/cms_admin_user_handler.e index 2f2d427..fb42207 100644 --- a/modules/admin/handler/user/cms_admin_user_handler.e +++ b/modules/admin/handler/user/cms_admin_user_handler.e @@ -10,6 +10,11 @@ class inherit CMS_HANDLER + + WSF_EXECUTE_HANDLER + select + execute + end WSF_URI_HANDLER rename diff --git a/modules/admin/handler/user/cms_admin_users_handler.e b/modules/admin/handler/user/cms_admin_users_handler.e index 8451b2c..964f472 100644 --- a/modules/admin/handler/user/cms_admin_users_handler.e +++ b/modules/admin/handler/user/cms_admin_users_handler.e @@ -7,9 +7,13 @@ class CMS_ADMIN_USERS_HANDLER inherit - CMS_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/blog/handler/blog_handler.e b/modules/blog/handler/blog_handler.e index d483133..557097a 100644 --- a/modules/blog/handler/blog_handler.e +++ b/modules/blog/handler/blog_handler.e @@ -10,6 +10,11 @@ class inherit CMS_BLOG_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/node/handler/node_handler.e b/modules/node/handler/node_handler.e index 6b0cf4b..76c8e4b 100644 --- a/modules/node/handler/node_handler.e +++ b/modules/node/handler/node_handler.e @@ -13,6 +13,11 @@ class inherit CMS_NODE_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/node/handler/nodes_handler.e b/modules/node/handler/nodes_handler.e index b4daa04..3b575fb 100644 --- a/modules/node/handler/nodes_handler.e +++ b/modules/node/handler/nodes_handler.e @@ -9,6 +9,11 @@ class inherit CMS_NODE_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename new_mapping as new_uri_mapping, diff --git a/modules/taxonomy/handler/taxonomy_handler.e b/modules/taxonomy/handler/taxonomy_handler.e index a0e13a3..ba578de 100644 --- a/modules/taxonomy/handler/taxonomy_handler.e +++ b/modules/taxonomy/handler/taxonomy_handler.e @@ -15,6 +15,11 @@ inherit module_api as taxonomy_api end + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/taxonomy/handler/taxonomy_term_admin_handler.e b/modules/taxonomy/handler/taxonomy_term_admin_handler.e index c50caf3..2bb9966 100644 --- a/modules/taxonomy/handler/taxonomy_term_admin_handler.e +++ b/modules/taxonomy/handler/taxonomy_term_admin_handler.e @@ -15,6 +15,11 @@ inherit module_api as taxonomy_api end + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/taxonomy/handler/taxonomy_vocabulary_admin_handler.e b/modules/taxonomy/handler/taxonomy_vocabulary_admin_handler.e index ad765b7..9bdcb84 100644 --- a/modules/taxonomy/handler/taxonomy_vocabulary_admin_handler.e +++ b/modules/taxonomy/handler/taxonomy_vocabulary_admin_handler.e @@ -16,6 +16,11 @@ inherit module_api as taxonomy_api end + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/modules/taxonomy/handler/taxonomy_vocabulary_handler.e b/modules/taxonomy/handler/taxonomy_vocabulary_handler.e index 41ac365..8d7203d 100644 --- a/modules/taxonomy/handler/taxonomy_vocabulary_handler.e +++ b/modules/taxonomy/handler/taxonomy_vocabulary_handler.e @@ -16,6 +16,11 @@ inherit module_api as taxonomy_api end + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute, diff --git a/src/modules/core/handler/user/cms_user_handler.e b/src/modules/core/handler/user/cms_user_handler.e index 1cb4752..c4789f7 100644 --- a/src/modules/core/handler/user/cms_user_handler.e +++ b/src/modules/core/handler/user/cms_user_handler.e @@ -11,6 +11,11 @@ class inherit CMS_HANDLER + WSF_EXECUTE_HANDLER + select + execute + end + WSF_URI_HANDLER rename execute as uri_execute,