Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OP-1311 | Create 'oh_settings' controller for CRUD for enabled users #486

Open
wants to merge 19 commits into
base: develop
Choose a base branch
from

Conversation

SilverD3
Copy link
Contributor

@SilverD3 SilverD3 commented Oct 25, 2024

See OP-1312

This PR includes also integration tests for SettingController.
Paired with #1431

@SilverD3
Copy link
Contributor Author

@mwithi can you figure out what is going on? I'm using the same branch name as on the CORE, but it looks like develop branch is still used to run checks

@mwithi
Copy link
Member

mwithi commented Oct 28, 2024

@mwithi can you figure out what is going on? I'm using the same branch name as on the CORE, but it looks like develop branch is still used to run checks

The problem is that your branch is in your fork and not in the current repository, let me try to find a solution for this...
Anyway, if there are changes on CORE, why there's no PR yet paired with this one?

@mwithi
Copy link
Member

mwithi commented Oct 28, 2024

@mwithi can you figure out what is going on? I'm using the same branch name as on the CORE, but it looks like develop branch is still used to run checks

The problem is that your branch is in your fork and not in the current repository, let me try to find a solution for this... Anyway, if there are changes on CORE, why there's no PR yet paired with this one?

Please align with the latest develop, create a PR for CORE, and checks should pass

@SilverD3
Copy link
Contributor Author

Please align with the latest develop, create a PR for CORE, and checks should pass

@mwithi please what do you mean by "create a PR for CORE" ? There's already a PR on the CORE which is paired with this one (informatici/openhospital-core#1431)

@SilverD3
Copy link
Contributor Author

From checks:

Run git clone --depth=1 --no-single-branch https://github.com/informatici/openhospital-core.git openhospital-core
Cloning into 'openhospital-core'...
~/work/openhospital-api/openhospital-api/openhospital-core ~/work/openhospital-api/openhospital-api
fatal: 'origin/OP-1311_move_settings_to_db' is not a commit and a branch 'OP-1311_move_settings_to_db' cannot be created from it
Already on 'develop'
Your branch is up to date with 'origin/develop'.

@mwithi mwithi changed the title OP-1312 | Create 'oh_settings' controller for CRUD for enabled users OP-1311 | Create 'oh_settings' controller for CRUD for enabled users Oct 29, 2024
@mwithi
Copy link
Member

mwithi commented Oct 29, 2024

From checks:

Run git clone --depth=1 --no-single-branch https://github.com/informatici/openhospital-core.git openhospital-core
Cloning into 'openhospital-core'...
~/work/openhospital-api/openhospital-api/openhospital-core ~/work/openhospital-api/openhospital-api
fatal: 'origin/OP-1311_move_settings_to_db' is not a commit and a branch 'OP-1311_move_settings_to_db' cannot be created from it
Already on 'develop'
Your branch is up to date with 'origin/develop'.

it should not clone "informatici" but your fork... let me try to fix this

@mwithi
Copy link
Member

mwithi commented Oct 29, 2024

Please merge with develop

@mwithi
Copy link
Member

mwithi commented Oct 30, 2024

sorry, just merged #478, please resolve conflicts

@mwithi
Copy link
Member

mwithi commented Oct 30, 2024

Please align with develop, but checks now will fail because of:

@mwithi
Copy link
Member

mwithi commented Oct 30, 2024

Sorry, align with develop again...

@mwithi
Copy link
Member

mwithi commented Oct 30, 2024

please align again...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants