This repository has been archived by the owner on Sep 12, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #9 from lalithkota/15.0-develop
Added proper titles to fields. Added registry encryption settings. Fixed Multiple bugs according to 17.0
- Loading branch information
Showing
28 changed files
with
276 additions
and
165 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -4,19 +4,20 @@ on: | |
| pull_request: | ||
| branches: | ||
| - "15.0*" | ||
| - "17.0*" | ||
| push: | ||
| branches: | ||
| - "15.0*" | ||
| - "15.0-ocabot-*" | ||
| - "17.0*" | ||
| env: | ||
| OCA_GIT_USER_NAME: openg2p | ||
| OCA_GIT_USER_EMAIL: [email protected] | ||
| jobs: | ||
| unreleased-deps: | ||
| runs-on: ubuntu-latest | ||
| runs-on: ubuntu-22.04 | ||
| name: Detect unreleased dependencies | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/checkout@v3 | ||
| - run: | | ||
| for reqfile in requirements.txt test-requirements.txt ; do | ||
| if [ -f ${reqfile} ] ; then | ||
|
|
@@ -29,32 +30,55 @@ jobs: | |
| fi | ||
| fi | ||
| done | ||
| matrix_prep: | ||
| runs-on: ubuntu-latest | ||
| outputs: | ||
| matrix: ${{ steps.set-matrix.outputs.matrix }} | ||
| steps: | ||
| - id: set-matrix | ||
| run: | | ||
| BRANCH_NAME=$(echo ${{ github.ref }} | sed -e 's,.*/\(.*\),\1,') | ||
| if [[ $BRANCH_NAME = 15.0* ]] ; then | ||
| matrix='{"include": [{ | ||
| "container": "ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest", | ||
| "makepot": "true", | ||
| "name": "test with Odoo 15" | ||
| },{ | ||
| "container": "ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest", | ||
| "name": "test with OCB 15" | ||
| }]}' | ||
| elif [[ $BRANCH_NAME = 17.0* ]] ; then | ||
| matrix='{"include": [{ | ||
| "container": "ghcr.io/oca/oca-ci/py3.10-odoo17.0:latest", | ||
| "makepot": "true", | ||
| "name": "test with Odoo 17" | ||
| },{ | ||
| "container": "ghcr.io/oca/oca-ci/py3.10-ocb17.0:latest", | ||
| "name": "test with OCB 17" | ||
| }]}' | ||
| fi | ||
| echo "matrix<<EOF"$'\n'"$matrix"$'\n'EOF >> $GITHUB_OUTPUT | ||
| test: | ||
| needs: matrix_prep | ||
| runs-on: ubuntu-latest | ||
| container: ${{ matrix.container }} | ||
| name: ${{ matrix.name }} | ||
| permissions: | ||
| contents: write | ||
| strategy: | ||
| fail-fast: false | ||
| matrix: | ||
| include: | ||
| - container: ghcr.io/oca/oca-ci/py3.8-odoo15.0:latest | ||
| makepot: "true" | ||
| name: test with Odoo | ||
| - container: ghcr.io/oca/oca-ci/py3.8-ocb15.0:latest | ||
| name: test with OCB | ||
| matrix: ${{fromJson(needs.matrix_prep.outputs.matrix)}} | ||
| services: | ||
| postgres: | ||
| image: postgres:9.6 | ||
| image: postgres:12.0 | ||
| env: | ||
| POSTGRES_USER: odoo | ||
| POSTGRES_PASSWORD: odoo | ||
| POSTGRES_DB: odoo | ||
| ports: | ||
| - 5432:5432 | ||
| steps: | ||
| - uses: actions/checkout@v2 | ||
| - uses: actions/checkout@v3 | ||
| with: | ||
| persist-credentials: false | ||
| - name: Install addons and dependencies | ||
|
|
@@ -69,6 +93,7 @@ jobs: | |
| run: oca_init_test_database | ||
| - name: Run tests | ||
| run: oca_run_tests | ||
| - uses: codecov/codecov-action@v1 | ||
| - name: Update .pot files | ||
| run: oca_export_and_push_pot https://x-access-token:${{ secrets.GITHUB_TOKEN }}@github.com/${{ github.repository }} | ||
| if: ${{ matrix.makepot == 'true' && github.event_name == 'push' && github.repository_owner == 'openg2p' }} | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,2 +1 @@ | ||
| Refer to contribution guidelines | ||
| [here](https://github.com/OpenG2P/openg2p-documentation/blob/1.0.0/community/contributing-to-openg2p.md). | ||
| Refer [Contributing to OpenG2P](https://github.com/OpenG2P/documentation/blob/master/CONTRIBUTING.md). |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,13 @@ | |
| G2P Encryption: Base | ||
| ==================== | ||
|
|
||
| .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| .. | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! source digest: sha256:2be24ba9e884952b98191815e8482ee2169686beba08fd5546a637202264487a | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png | ||
| :target: https://odoo-community.org/page/development-status | ||
|
|
@@ -14,7 +17,7 @@ G2P Encryption: Base | |
| :target: https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption | ||
| :alt: OpenG2P/openg2p-security | ||
|
|
||
| |badge1| |badge2| | ||
| |badge1| |badge2| | ||
|
|
||
| OpenG2P Encryption: Base | ||
|
|
||
|
|
@@ -33,7 +36,7 @@ Bug Tracker | |
|
|
||
| Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-security/issues>`_. | ||
| In case of trouble, please check there if your issue has already been reported. | ||
| If you spotted it first, help us smashing it by providing a detailed and welcomed | ||
| If you spotted it first, help us to smash it by providing a detailed and welcomed | ||
| `feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. | ||
|
|
||
| Do not contact contributors directly about support or help with technical issues. | ||
|
|
@@ -46,6 +49,12 @@ Authors | |
|
|
||
| * OpenG2P | ||
|
|
||
| Contributors | ||
| ~~~~~~~~~~~~ | ||
|
|
||
| * Lalith Kota <[email protected]> | ||
| * Vineela Ampili <[email protected]> | ||
|
|
||
| Maintainers | ||
| ~~~~~~~~~~~ | ||
|
|
||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,2 @@ | ||
| * Lalith Kota <[email protected]> | ||
| * Vineela Ampili <[email protected]> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,7 +1,16 @@ | ||
| <?xml version="1.0" encoding="UTF-8" ?> | ||
| <odoo> | ||
| <record model="ir.module.category" id="security_module"> | ||
| <field name="name">OpenG2P Security Module</field> | ||
| <field name="description">User access level for the openg2p security modules</field> | ||
| <field name="sequence">4</field> | ||
| </record> | ||
| <record id="crypto_admin" model="res.groups"> | ||
| <field name="name">Crypto Admin</field> | ||
| <field name="category_id" ref="g2p_registry_base.openg2p_module" /> | ||
| <field name="category_id" ref="security_module" /> | ||
| </record> | ||
| <record id="crypto_dummy" model="res.groups"> | ||
| <field name="name">Crypto Dummy</field> | ||
| <field name="category_id" ref="security_module" /> | ||
| </record> | ||
| </odoo> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2,10 +2,13 @@ | |
| G2P Encryption: Keymanager | ||
| ========================== | ||
|
|
||
| .. !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| .. | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! This file is generated by oca-gen-addon-readme !! | ||
| !! changes will be overwritten. !! | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| !! source digest: sha256:c5b90c4b58fa786333889d2061bb9fe6d3eb8eb89ba9384b3c37d72d094f71ad | ||
| !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! | ||
| .. |badge1| image:: https://img.shields.io/badge/maturity-Alpha-red.png | ||
| :target: https://odoo-community.org/page/development-status | ||
|
|
@@ -14,7 +17,7 @@ G2P Encryption: Keymanager | |
| :target: https://github.com/OpenG2P/openg2p-security/tree/15.0-develop/g2p_encryption_keymanager | ||
| :alt: OpenG2P/openg2p-security | ||
|
|
||
| |badge1| |badge2| | ||
| |badge1| |badge2| | ||
|
|
||
| OpenG2P Encryption With Keymanager | ||
|
|
||
|
|
@@ -33,7 +36,7 @@ Bug Tracker | |
|
|
||
| Bugs are tracked on `GitHub Issues <https://github.com/OpenG2P/openg2p-security/issues>`_. | ||
| In case of trouble, please check there if your issue has already been reported. | ||
| If you spotted it first, help us smashing it by providing a detailed and welcomed | ||
| If you spotted it first, help us to smash it by providing a detailed and welcomed | ||
| `feedback <https://github.com/OpenG2P/openg2p-security/issues/new?body=module:%20g2p_encryption_keymanager%0Aversion:%2015.0-develop%0A%0A**Steps%20to%20reproduce**%0A-%20...%0A%0A**Current%20behavior**%0A%0A**Expected%20behavior**>`_. | ||
|
|
||
| Do not contact contributors directly about support or help with technical issues. | ||
|
|
@@ -46,6 +49,12 @@ Authors | |
|
|
||
| * OpenG2P | ||
|
|
||
| Contributors | ||
| ~~~~~~~~~~~~ | ||
|
|
||
| * Lalith Kota <[email protected]> | ||
| * Vineela Ampili <[email protected]> | ||
|
|
||
| Maintainers | ||
| ~~~~~~~~~~~ | ||
|
|
||
|
|
||
Oops, something went wrong.