Skip to content

Commit 3ad3790

Browse files
committed
Merge branch '17.0' of https://github.com/OpenSPP/openspp-modules into 369-add-events-data-models-and-ui-for-laos-farmer-registry-module
2 parents f4a4b46 + 863ae4a commit 3ad3790

File tree

15 files changed

+424
-8
lines changed

15 files changed

+424
-8
lines changed

.github/workflows/pre-commit.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ jobs:
66
pre-commit:
77
runs-on: ubuntu-22.04
88
steps:
9-
- uses: actions/checkout@v2
10-
- uses: actions/setup-python@v2
9+
- uses: actions/checkout@v4
10+
- uses: actions/setup-python@v5
1111
with:
1212
python-version: "3.11"
1313
- name: Get python version
1414
run: echo "PY=$(python -VV | sha256sum | cut -d' ' -f1)" >> $GITHUB_ENV
15-
- uses: actions/cache@v1
15+
- uses: actions/cache@v4
1616
with:
1717
path: ~/.cache/pre-commit
1818
key: pre-commit|${{ env.PY }}|${{ hashFiles('.pre-commit-config.yaml') }}

.github/workflows/test.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ jobs:
1717
runs-on: ubuntu-latest
1818
name: Detect unreleased dependencies
1919
steps:
20-
- uses: actions/checkout@v3
20+
- uses: actions/checkout@v4
2121
- run: |
2222
for reqfile in requirements.txt test-requirements.txt ; do
2323
if [ -f ${reqfile} ] ; then
@@ -54,7 +54,7 @@ jobs:
5454
ports:
5555
- 5432:5432
5656
steps:
57-
- uses: actions/checkout@v3
57+
- uses: actions/checkout@v4
5858
# with:
5959
# persist-credentials: false
6060

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11

22
<!-- /!\ Non OCA Context : Set here the badge of your runbot / runboat instance. -->
3-
[![Pre-commit Status](https://github.com/openspp/openspp-registry/actions/workflows/pre-commit.yml/badge.svg?branch=15.0)](https://github.com/openspp/openspp-registry/actions/workflows/pre-commit.yml?query=branch%3A15.0)
4-
[![Build Status](https://github.com/openspp/openspp-registry/actions/workflows/test.yml/badge.svg?branch=15.0)](https://github.com/openspp/openspp-registry/actions/workflows/test.yml?query=branch%3A15.0)
5-
[![codecov](https://codecov.io/gh/openspp/openspp-registry/branch/15.0/graph/badge.svg)](https://codecov.io/gh/openspp/openspp-registry)
3+
[![Pre-commit Status](https://github.com/openspp/openspp-modules/actions/workflows/pre-commit.yml/badge.svg?branch=17.0)](https://github.com/openspp/openspp-modules/actions/workflows/pre-commit.yml?query=branch%3A17.0)
4+
[![Build Status](https://github.com/openspp/openspp-modules/actions/workflows/test.yml/badge.svg?branch=17.0)](https://github.com/openspp/openspp-modules/actions/workflows/test.yml?query=branch%3A17.0)
5+
[![codecov](https://codecov.io/gh/openspp/openspp-modules/branch/17.0/graph/badge.svg)](https://codecov.io/gh/openspp/openspp-modules)
66
<!-- /!\ Non OCA Context : Set here the badge of your translation instance. -->
77
[![Translation Status](https://translate.openspp.org/widgets/openspp/-/svg-badge.svg)](https://translate.openspp.org/engage/openspp/?utm_source=widget)
88

SECURITY.md

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
# OpenSPP Vulnerability Disclosure Policy
2+
3+
## Introduction
4+
5+
OpenSPP welcomes feedback from security researchers and the general public to help improve our security. If
6+
you believe you have discovered a vulnerability, privacy issue, exposed data, or other security issues in any
7+
of our assets, we want to hear from you. This policy outlines steps for reporting vulnerabilities to us, what
8+
we expect, what you can expect from us.
9+
10+
## Systems in Scope
11+
12+
This policy applies to any digital assets owned, operated, or maintained by OpenSPP.
13+
14+
## Out of Scope
15+
16+
- Assets or other equipment not owned by parties participating in this policy.
17+
18+
Vulnerabilities discovered or suspected in out-of-scope systems should be reported to the appropriate vendor
19+
or applicable authority.
20+
21+
## Our Commitments
22+
23+
When working with us, according to this policy, you can expect us to:
24+
25+
- Respond to your report promptly, and work with you to understand and validate your report;
26+
- Strive to keep you informed about the progress of a vulnerability as it is processed;
27+
- Work to remediate discovered vulnerabilities in a timely manner, within our operational constraints; and
28+
- Extend Safe Harbor for your vulnerability research that is related to this policy.
29+
30+
## Our Expectations
31+
32+
In participating in our vulnerability disclosure program in good faith, we ask that you:
33+
34+
- Play by the rules, including following this policy and any other relevant agreements. If there is any
35+
inconsistency between this policy and any other applicable terms, the terms of this policy will prevail;
36+
- Report any vulnerability you’ve discovered promptly;
37+
- Avoid violating the privacy of others, disrupting our systems, destroying data, and/or harming user
38+
experience;
39+
- Use only the Official Channels to discuss vulnerability information with us;
40+
- Provide us a reasonable amount of time (at least 120 days from the initial report) to resolve the issue
41+
before you disclose it publicly;
42+
- Perform testing only on in-scope systems, and respect systems and activities which are out-of-scope;
43+
- If a vulnerability provides unintended access to data: Limit the amount of data you access to the minimum
44+
required for effectively demonstrating a Proof of Concept; and cease testing and submit a report immediately
45+
if you encounter any user data during testing, such as Personally Identifiable Information (PII), Personal
46+
Healthcare Information (PHI), credit card data, or proprietary information;
47+
- You should only interact with test accounts you own or with explicit permission from the account holder; and
48+
- Do not engage in extortion.
49+
50+
## Official Channels
51+
52+
Please report security issues via email: [email protected], providing all relevant information. The more
53+
details you provide, the easier it will be for us to triage and fix the issue.
54+
55+
## Safe Harbor
56+
57+
When conducting vulnerability research, according to this policy, we consider this research conducted under
58+
this policy to be:
59+
60+
- Authorized concerning any applicable anti-hacking laws, and we will not initiate or support legal action
61+
against you for accidental, good-faith violations of this policy;
62+
- Authorized concerning any relevant anti-circumvention laws, and we will not bring a claim against you for
63+
circumvention of technology controls;
64+
- Exempt from restrictions in our Terms of Service (TOS) and/or Acceptable Usage Policy (AUP) that would
65+
interfere with conducting security research, and we waive those restrictions on a limited basis; and
66+
- Lawful, helpful to the overall security of the Internet, and conducted in good faith.
67+
68+
You are expected, as always, to comply with all applicable laws. If legal action is initiated by a third party
69+
against you and you have complied with this policy, we will take steps to make it known that your actions were
70+
conducted in compliance with this policy.
71+
72+
If at any time you have concerns or are uncertain whether your security research is consistent with this
73+
policy, please submit a report through one of our Official Channels before going any further.
74+
75+
> Note that the Safe Harbor applies only to legal claims under the control of the organization participating
76+
> in this policy, and that the policy does not bind independent third parties.

code_of_conduct.md

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
# Contributor Covenant Code of Conduct
2+
3+
## Our Pledge
4+
5+
We as members, contributors, and leaders pledge to make participation in our community a harassment-free
6+
experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex
7+
characteristics, gender identity and expression, level of experience, education, socio-economic status,
8+
nationality, personal appearance, race, caste, color, religion, or sexual identity and orientation.
9+
10+
We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy
11+
community.
12+
13+
## Our Standards
14+
15+
Examples of behavior that contributes to a positive environment for our community include:
16+
17+
- Demonstrating empathy and kindness toward other people
18+
- Being respectful of differing opinions, viewpoints, and experiences
19+
- Giving and gracefully accepting constructive feedback
20+
- Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
21+
- Focusing on what is best not just for us as individuals, but for the overall community
22+
23+
Examples of unacceptable behavior include:
24+
25+
- The use of sexualized language or imagery, and sexual attention or advances of any kind
26+
- Trolling, insulting or derogatory comments, and personal or political attacks
27+
- Public or private harassment
28+
- Publishing others' private information, such as a physical or email address, without their explicit
29+
permission
30+
- Other conduct which could reasonably be considered inappropriate in a professional setting
31+
32+
## Enforcement Responsibilities
33+
34+
Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will
35+
take appropriate and fair corrective action in response to any behavior that they deem inappropriate,
36+
threatening, offensive, or harmful.
37+
38+
Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki
39+
edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate
40+
reasons for moderation decisions when appropriate.
41+
42+
## Scope
43+
44+
This Code of Conduct applies within all community spaces, and also applies when an individual is officially
45+
representing the community in public spaces. Examples of representing our community include using an official
46+
e-mail address, posting via an official social media account, or acting as an appointed representative at an
47+
online or offline event.
48+
49+
## Enforcement
50+
51+
Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders
52+
responsible for enforcement. All complaints will be reviewed and investigated promptly and fairly.
53+
54+
All community leaders are obligated to respect the privacy and security of the reporter of any incident.
55+
56+
## Enforcement Guidelines
57+
58+
Community leaders will follow these Community Impact Guidelines in determining the consequences for any action
59+
they deem in violation of this Code of Conduct:
60+
61+
### 1. Correction
62+
63+
**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in
64+
the community.
65+
66+
**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the
67+
violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
68+
69+
### 2. Warning
70+
71+
**Community Impact**: A violation through a single incident or series of actions.
72+
73+
**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved,
74+
including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time.
75+
This includes avoiding interactions in community spaces as well as external channels like social media.
76+
Violating these terms may lead to a temporary or permanent ban.
77+
78+
### 3. Temporary Ban
79+
80+
**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
81+
82+
**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a
83+
specified period of time. No public or private interaction with the people involved, including unsolicited
84+
interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may
85+
lead to a permanent ban.
86+
87+
### 4. Permanent Ban
88+
89+
**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained
90+
inappropriate behavior, harassment of an individual, or aggression toward or disparagement of classes of
91+
individuals.
92+
93+
**Consequence**: A permanent ban from any sort of public interaction within the community.
94+
95+
## Attribution
96+
97+
This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.1, available at
98+
[https://www.contributor-covenant.org/version/2/1/code_of_conduct.html][v2.1].
99+
100+
Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder][mozilla coc].
101+
102+
For answers to common questions about this code of conduct, see the FAQ at
103+
[https://www.contributor-covenant.org/faq][faq]. Translations are available at
104+
[https://www.contributor-covenant.org/translations][translations].
105+
106+
[homepage]: https://www.contributor-covenant.org
107+
[v2.1]: https://www.contributor-covenant.org/version/2/1/code_of_conduct.html
108+
[mozilla coc]: https://github.com/mozilla/diversity
109+
[faq]: https://www.contributor-covenant.org/faq
110+
[translations]: https://www.contributor-covenant.org/translations

spp_registry_group_hierarchy/README.rst

Whitespace-only changes.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
from . import models
Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
# Part of OpenSPP. See LICENSE file for full copyright and licensing details.
2+
3+
{
4+
"name": "SPP Registry Group Hierarchy",
5+
"category": "OpenSPP",
6+
"version": "17.0.1.0.0",
7+
"sequence": 1,
8+
"author": "OpenSPP.org",
9+
"website": "https://github.com/OpenSPP/openspp-modules",
10+
"license": "LGPL-3",
11+
"development_status": "Production/Stable",
12+
"maintainers": ["jeremi", "gonzalesedwin1123"],
13+
"depends": [
14+
"base",
15+
"g2p_registry_base",
16+
"g2p_registry_individual",
17+
"g2p_registry_group",
18+
"g2p_registry_membership",
19+
],
20+
"external_dependencies": {},
21+
"data": [
22+
"views/group_kind_views.xml",
23+
"views/group_membership_views.xml",
24+
"views/group_views.xml",
25+
],
26+
"assets": {},
27+
"demo": [],
28+
"images": [],
29+
"application": True,
30+
"installable": True,
31+
"auto_install": False,
32+
}
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from . import group_kind
2+
from . import group_membership
Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
from odoo import fields, models
2+
3+
4+
class SPPGroupKind(models.Model):
5+
_inherit = "g2p.group.kind"
6+
7+
allow_all_member_type = fields.Boolean("Allow group and individual members", default=False)

0 commit comments

Comments
 (0)