Skip to content

Commit ae5b31b

Browse files
authored
Merge branch '17.0' into 802-replace-icons
2 parents 3f07323 + 469bf38 commit ae5b31b

File tree

184 files changed

+1332
-3350
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

184 files changed

+1332
-3350
lines changed

.github/workflows/claude.yml

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
name: Claude PR Assistant
2+
3+
on:
4+
issue_comment:
5+
types: [created]
6+
pull_request_review_comment:
7+
types: [created]
8+
issues:
9+
types: [opened, assigned]
10+
pull_request_review:
11+
types: [submitted]
12+
13+
jobs:
14+
claude-code-action:
15+
if: |
16+
(github.event_name == 'issue_comment' && contains(github.event.comment.body, '@claude')) ||
17+
(github.event_name == 'pull_request_review_comment' && contains(github.event.comment.body, '@claude')) ||
18+
(github.event_name == 'pull_request_review' && contains(github.event.review.body, '@claude')) ||
19+
(github.event_name == 'issues' && contains(github.event.issue.body, '@claude'))
20+
runs-on: ubuntu-latest
21+
permissions:
22+
contents: read
23+
pull-requests: read
24+
issues: read
25+
id-token: write
26+
steps:
27+
- name: Checkout repository
28+
uses: actions/checkout@v4
29+
with:
30+
fetch-depth: 1
31+
32+
- name: Run Claude PR Action
33+
uses: jeremi/claude-code-action@main
34+
with:
35+
use_oauth: true
36+
claude_access_token: ${{ secrets.CLAUDE_ACCESS_TOKEN }}
37+
claude_refresh_token: ${{ secrets.CLAUDE_REFRESH_TOKEN }}
38+
claude_expires_at: ${{ secrets.CLAUDE_EXPIRES_AT }}
39+
40+
timeout_minutes: "60"
41+
# Optional: add custom trigger phrase (default: @claude)
42+
# trigger_phrase: "/claude"
43+
# Optional: add assignee trigger for issues
44+
# assignee_trigger: "claude"
45+
# Optional: add custom environment variables (YAML format)
46+
# claude_env: |
47+
# NODE_ENV: test
48+
# DEBUG: true
49+
# API_URL: https://api.example.com
50+
# Optional: limit the number of conversation turns
51+
# max_turns: "5"

.github/workflows/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ jobs:
1212
uses: actions/checkout@v2
1313

1414
- name: Set up Python
15-
uses: actions/setup-python@v2
15+
uses: actions/setup-python@v6
1616
with:
1717
python-version: '3.8'
1818

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ jobs:
77
runs-on: ubuntu-22.04
88
steps:
99
- uses: actions/checkout@v4
10-
- uses: actions/setup-python@v5
10+
- uses: actions/setup-python@v6
1111
with:
1212
python-version: "3.11"
1313
- name: Get python version

.github/workflows/stale.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
runs-on: ubuntu-latest
1010
steps:
1111
- name: Stale PRs and issues policy
12-
uses: actions/stale@v4
12+
uses: actions/stale@v10
1313
with:
1414
repo-token: ${{ secrets.GITHUB_TOKEN }}
1515
# General settings.
@@ -45,7 +45,7 @@ jobs:
4545
# * Issues that are pending more information
4646
# * Except Issues marked as "no stale"
4747
- name: Needs more information stale issues policy
48-
uses: actions/stale@v4
48+
uses: actions/stale@v10
4949
with:
5050
repo-token: ${{ secrets.GITHUB_TOKEN }}
5151
ascending: true

g2p_programs/i18n/g2p_programs.pot

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -630,11 +630,6 @@ msgstr ""
630630
msgid "Archived"
631631
msgstr ""
632632

633-
#. module: g2p_programs
634-
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__area_id
635-
msgid "Area"
636-
msgstr ""
637-
638633
#. module: g2p_programs
639634
#: model_terms:ir.ui.view,arch_db:g2p_programs.assign_to_program_wizard_form_view
640635
msgid "Assign"
@@ -2339,11 +2334,6 @@ msgstr ""
23392334
msgid "Entitlements Validated and Approved."
23402335
msgstr ""
23412336

2342-
#. module: g2p_programs
2343-
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__event_data_ids
2344-
msgid "Event Data IDs"
2345-
msgstr ""
2346-
23472337
#. module: g2p_programs
23482338
#: model:ir.model.fields,field_description:g2p_programs.field_g2p_program_membership__exit_date
23492339
#: model_terms:ir.ui.view,arch_db:g2p_programs.program_membership_filter

spp_api/controllers/pinguin.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def get_data_from_bearer_auth_header(header):
233233
normalized_token = header.replace("Bearer ", "").replace("\\n", "").encode("utf-8")
234234

235235
try:
236-
res = verify_and_decode_signature(normalized_token)
236+
res = verify_and_decode_signature(request.env, normalized_token)
237237
except OpenSPPOAuthJWTException as e:
238238
raise werkzeug.exceptions.HTTPException(response=error_response(*CODE__no_user_auth)) from e
239239

spp_api/wizards/res_users_bearer_token.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ class SppUsersBearerToken(models.TransientModel):
3232
def _compute_bearer_token(self):
3333
for rec in self:
3434
rec.calculated_token = calculate_signature(
35+
env=rec.env,
3536
header=None,
3637
payload={
3738
"database": rec.db_name,

spp_api/wizards/res_users_bearer_token_views.xml

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
<field name="arch" type="xml">
88
<form string="Users Bearer Token">
99
<sheet>
10-
<group>
11-
<field name="calculated_token" widget="CopyClipboardText" nolabel="1" />
12-
</group>
10+
<div>
11+
12+
<field name="calculated_token" widget="CopyClipboardText" nolabel="1" />
13+
</div>
1314
</sheet>
1415
<button string="Cancel" class="btn-secondary" special="cancel" data-hotkey="z" />
1516
</form>

spp_api_records/__manifest__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"category": "OpenSPP",
55
"version": "17.0.1.3.0",
66
"author": "OpenSPP.org",
7-
"development_status": "Beta",
7+
"development_status": "Production/Stable",
88
"maintainers": ["jeremi", "gonzalesedwin1123", "reichie020212"],
99
"website": "https://github.com/OpenSPP/openspp-modules",
1010
"license": "LGPL-3",

spp_area/__manifest__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
"g2p_registry_individual",
2020
"g2p_registry_group",
2121
"queue_job",
22+
"spp_registry_base",
2223
],
2324
"external_dependencies": {},
2425
"data": [

0 commit comments

Comments
 (0)