From 00eb9e4abe74174fae9f7481b3f7d7f141d6b40c Mon Sep 17 00:00:00 2001 From: tarteo Date: Mon, 24 Apr 2017 16:00:09 +0200 Subject: [PATCH 1/7] [ADD] Group 'Edit Favicon' --- web_favicon/README.rst | 2 ++ web_favicon/__manifest__.py | 3 ++- web_favicon/security/web_favicon_security.xml | 7 +++++++ web_favicon/views/res_company.xml | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 web_favicon/security/web_favicon_security.xml diff --git a/web_favicon/README.rst b/web_favicon/README.rst index a95c5d43..79335220 100644 --- a/web_favicon/README.rst +++ b/web_favicon/README.rst @@ -30,6 +30,8 @@ You have a sample SVG that can be used as template for generating your icon in /static/src/img/master_original_favicon.svg. You can also search for some favicon generators across the web. +To allow an user to edit the favicon it has to be member of group "Edit Favicon". + Usage ===== diff --git a/web_favicon/__manifest__.py b/web_favicon/__manifest__.py index 418dc2f5..984c5d2e 100644 --- a/web_favicon/__manifest__.py +++ b/web_favicon/__manifest__.py @@ -16,8 +16,9 @@ 'web', ], "data": [ - "views/res_company.xml", + 'views/res_company.xml', 'views/templates.xml', + 'security/web_favicon_security.xml' ], 'installable': True, } diff --git a/web_favicon/security/web_favicon_security.xml b/web_favicon/security/web_favicon_security.xml new file mode 100644 index 00000000..97a1be58 --- /dev/null +++ b/web_favicon/security/web_favicon_security.xml @@ -0,0 +1,7 @@ + + + + Edit Favicon + + + diff --git a/web_favicon/views/res_company.xml b/web_favicon/views/res_company.xml index b8d138d3..66dc953c 100644 --- a/web_favicon/views/res_company.xml +++ b/web_favicon/views/res_company.xml @@ -5,7 +5,7 @@ - + From f2c234f206aecc536d0a07ecec399f091717823f Mon Sep 17 00:00:00 2001 From: tarteo Date: Mon, 24 Apr 2017 16:05:23 +0200 Subject: [PATCH 2/7] [ADD] Group 'Edit Favicon' --- web_favicon/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_favicon/README.rst b/web_favicon/README.rst index 79335220..e61d6ef7 100644 --- a/web_favicon/README.rst +++ b/web_favicon/README.rst @@ -30,7 +30,7 @@ You have a sample SVG that can be used as template for generating your icon in /static/src/img/master_original_favicon.svg. You can also search for some favicon generators across the web. -To allow an user to edit the favicon it has to be member of group "Edit Favicon". +To allow a user to edit the favicon it has to be member of group "Edit Favicon". Usage ===== From 37b5fd80d1f3604ade5c54ba10e7cc809cc08dd3 Mon Sep 17 00:00:00 2001 From: tarteo Date: Mon, 24 Apr 2017 16:12:31 +0200 Subject: [PATCH 3/7] [ADD] root user as default member of group --- web_favicon/security/web_favicon_security.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/web_favicon/security/web_favicon_security.xml b/web_favicon/security/web_favicon_security.xml index 97a1be58..bdc0eab7 100644 --- a/web_favicon/security/web_favicon_security.xml +++ b/web_favicon/security/web_favicon_security.xml @@ -3,5 +3,6 @@ Edit Favicon + From 6978280f98f2504d89fb7e07fea408ae40688074 Mon Sep 17 00:00:00 2001 From: tarteo Date: Wed, 31 May 2017 11:24:05 +0200 Subject: [PATCH 4/7] [REM] Separate group for editing favicon --- web_favicon/README.rst | 1 + web_favicon/security/web_favicon_security.xml | 8 -------- web_favicon/views/res_company.xml | 2 +- 3 files changed, 2 insertions(+), 9 deletions(-) delete mode 100644 web_favicon/security/web_favicon_security.xml diff --git a/web_favicon/README.rst b/web_favicon/README.rst index e61d6ef7..43ac703b 100644 --- a/web_favicon/README.rst +++ b/web_favicon/README.rst @@ -67,6 +67,7 @@ Contributors * Holger Brunn * Pedro M. Baeza +* Dennis Sluijk Maintainer ---------- diff --git a/web_favicon/security/web_favicon_security.xml b/web_favicon/security/web_favicon_security.xml deleted file mode 100644 index bdc0eab7..00000000 --- a/web_favicon/security/web_favicon_security.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - Edit Favicon - - - - diff --git a/web_favicon/views/res_company.xml b/web_favicon/views/res_company.xml index 66dc953c..b35fe55d 100644 --- a/web_favicon/views/res_company.xml +++ b/web_favicon/views/res_company.xml @@ -5,7 +5,7 @@ - + From bc06abda70fd93f0ec1abea2a0e3f2cfc3ebdd9c Mon Sep 17 00:00:00 2001 From: tarteo Date: Wed, 31 May 2017 11:25:49 +0200 Subject: [PATCH 5/7] [REM] Separate group for editing favicon --- web_favicon/README.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/web_favicon/README.rst b/web_favicon/README.rst index 43ac703b..d3d67e98 100644 --- a/web_favicon/README.rst +++ b/web_favicon/README.rst @@ -30,7 +30,7 @@ You have a sample SVG that can be used as template for generating your icon in /static/src/img/master_original_favicon.svg. You can also search for some favicon generators across the web. -To allow a user to edit the favicon it has to be member of group "Edit Favicon". +To allow a user to edit the favicon it has to be member of group "Administration / Settings". Usage ===== From f56faebccce439a8c429c429e3effcb67d99c4dd Mon Sep 17 00:00:00 2001 From: tarteo Date: Wed, 31 May 2017 11:26:27 +0200 Subject: [PATCH 6/7] [REM] Separate group for editing favicon --- web_favicon/__manifest__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/web_favicon/__manifest__.py b/web_favicon/__manifest__.py index 984c5d2e..f12886f5 100644 --- a/web_favicon/__manifest__.py +++ b/web_favicon/__manifest__.py @@ -18,7 +18,6 @@ "data": [ 'views/res_company.xml', 'views/templates.xml', - 'security/web_favicon_security.xml' ], 'installable': True, } From d68ea0ce9103e87a31d1a371145eda7a1a3bf99a Mon Sep 17 00:00:00 2001 From: tarteo Date: Wed, 31 May 2017 11:34:42 +0200 Subject: [PATCH 7/7] [FIX] Removed single quotes from manifest --- web_favicon/__manifest__.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/web_favicon/__manifest__.py b/web_favicon/__manifest__.py index f12886f5..d70733a7 100644 --- a/web_favicon/__manifest__.py +++ b/web_favicon/__manifest__.py @@ -13,11 +13,11 @@ "category": "Website", "summary": "Allows to set a custom shortcut icon (aka favicon)", "depends": [ - 'web', + "web", ], "data": [ - 'views/res_company.xml', - 'views/templates.xml', + "views/res_company.xml", + "views/templates.xml", ], - 'installable': True, + "installable": True, }