Skip to content

Commit

Permalink
Revert "Added OAuthLogin Providers. Added "Other OSI approved licence…
Browse files Browse the repository at this point in the history
…" in allowed license."

This reverts commit 1be79f3.
  • Loading branch information
mkumar-02 committed Apr 17, 2024
1 parent 00f3adc commit 42ed27c
Show file tree
Hide file tree
Showing 9 changed files with 47 additions and 5 deletions.
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/templat
manifest-required-authors=OpenG2P
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3,Other OSI approved licence
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=17.0

[MESSAGES CONTROL]
Expand Down
2 changes: 1 addition & 1 deletion .pylintrc-mandatory
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ readme-template-url="https://github.com/OCA/maintainer-tools/blob/master/templat
manifest-required-authors=OpenG2P
manifest-required-keys=license
manifest-deprecated-keys=description,active
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3,Other OSI approved licence
license-allowed=AGPL-3,GPL-2,GPL-2 or any later version,GPL-3,GPL-3 or any later version,LGPL-3
valid-odoo-versions=17.0

[MESSAGES CONTROL]
Expand Down
6 changes: 6 additions & 0 deletions g2p_self_service_portal/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,8 @@
"views/g2p_self_service_aboutus.xml",
"views/g2p_self_service_otherpage.xml",
"views/g2p_self_service_contactus.xml",
# TODO: The 'auth_oidc' module was removed; a replacement is needed in the code.
# "views/auth_oauth_provider.xml",
"views/g2p_self_service_form_page_template.xml",
"views/program_view.xml",
"views/g2p_self_service_signup.xml",
Expand All @@ -41,6 +43,10 @@
"assets": {
"web.assets_frontend": [
"g2p_self_service_portal/static/src/js/self_service_form_action.js",
# # "g2p_self_service_portal/static/src/js/self_service_pie_chart.js",
# "g2p_self_service_portal/static/src/js/self_service_search_sort.js",
# "g2p_self_service_portal/static/src/js/self_service_search_sort_all.js",
# "g2p_self_service_portal/static/src/js/self_service_welcome_alert.js"
],
"website.assets_wysiwyg": [
"g2p_self_service_portal/static/src/js/apply_program_form_editor.js",
Expand Down
5 changes: 4 additions & 1 deletion g2p_self_service_portal/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,13 @@
from odoo.http import request
from odoo.tools import safe_eval

from odoo.addons.auth_oauth.controllers.main import OAuthLogin
from odoo.addons.auth_signup.controllers.main import AuthSignupHome
from odoo.addons.web.controllers.home import Home

# TODO: The 'auth_oidc' module was removed; a replacement is needed in the code.
# from odoo.addons.auth_oidc.controllers.main import OpenIDLogin


_logger = logging.getLogger(__name__)


Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/** @odoo-module **/

import FormEditorRegistry from "@website/js/form_editor_registry";
import {_t} from "@web/core/l10n/translation";
import FormEditorRegistry from "@website/js/form_editor_registry";

FormEditorRegistry.add("apply_for_program", {
formFields: [
Expand Down
14 changes: 14 additions & 0 deletions g2p_self_service_portal/views/auth_oauth_provider.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" ?>
<odoo>
<!-- TODO: The 'auth_oidc' module was removed; a replacement is needed in the code. -->
<!-- <record model="ir.ui.view" id="view_g2p_self_service_oauth_provider_form">
<field name="name">g2p.self.service.oauth.provider.form</field>
<field name="model">auth.oauth.provider</field>
<field name="inherit_id" ref="auth_oidc.view_oidc_provider_form" />
<field name="arch" type="xml">
<field name="enabled" position="after">
<field name="g2p_self_service_allowed" />
</field>
</field>
</record> -->
</odoo>
2 changes: 2 additions & 0 deletions g2p_service_provider_portal/__manifest__.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@
],
"data": [
"data/g2p_service_provider_form_action_data.xml",
# TODO: The 'auth_oidc' module was removed; a replacement is needed in the code.
# "views/auth_oauth_provider.xml",
"views/g2p_service_provider_aboutus.xml",
"views/g2p_service_provider_base.xml",
"views/g2p_service_provider_contactus.xml",
Expand Down
5 changes: 4 additions & 1 deletion g2p_service_provider_portal/controllers/main.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,13 @@
from odoo import _, http
from odoo.http import request

from odoo.addons.auth_oauth.controllers.main import OAuthLogin
from odoo.addons.g2p_self_service_portal.controllers.main import SelfServiceController
from odoo.addons.web.controllers.home import Home

# TODO: The 'auth_oidc' module was removed; a replacement is needed in the code."
# from odoo.addons.auth_oidc.controllers.main import OpenIDLogin


_logger = logging.getLogger(__name__)


Expand Down
14 changes: 14 additions & 0 deletions g2p_service_provider_portal/views/auth_oauth_provider.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" ?>
<odoo>
<!-- TODO: The 'auth_oidc' module was removed; a replacement is needed in the code. -->
<!-- <record model="ir.ui.view" id="view_g2p_service_provider_oauth_provider_form">
<field name="name">g2p.service.provider.oauth.provider.form</field>
<field name="model">auth.oauth.provider</field>
<field name="inherit_id" ref="g2p_self_service_portal.view_g2p_self_service_oauth_provider_form" />
<field name="arch" type="xml">
<field name="g2p_self_service_allowed" position="after">
<field name="g2p_service_provider_allowed" />
</field>
</field>
</record> -->
</odoo>

0 comments on commit 42ed27c

Please sign in to comment.