Skip to content

Commit

Permalink
Merge pull request #488 from nextcloud/merge-release/2.4-to-master
Browse files Browse the repository at this point in the history
Merge release/2.4 to master
  • Loading branch information
SwikritiT committed Sep 7, 2023
2 parents d9831c1 + 0a38687 commit e527cb6
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 9 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
APP_ID: integration_openproject
runs-on: ubuntu-latest
steps:
- name: Use Node 14
- name: Use Node 18
uses: actions/setup-node@v3
with:
node-version: 14
node-version: 18

- name: Set up npm
run: npm i -g npm
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ To set up or update the integration following data needs to be provided:
> - To set up the integration without `project folders` we need to set data `setup_project_folder=false` and `setup_app_password=false`
> - To set up the integration with `project folders` we need to set data `setup_project_folder=true` and `setup_app_password=true`, this will create a new user, group, and group folder named OpenProject if the system doesn't already have one or more of these present. Also, an application password will be provided for the user `OpenProject`
> - Once the `project folder` has already been set up, the created `OpenProject` user and group cannot be disabled or removed.
> - If there is any error related to `OpenProject` user, group, group folders when setting up the whole integration or if the admin user wants to remove those entities then this [troubleshooting guide](https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/) can be followed up on how to resolve it.
> - If there is any error related to `OpenProject` user, group, group folders when setting up the whole integration or if the admin user wants to remove those entities then this [troubleshooting guide](https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/#troubleshooting) can be followed up on how to resolve it.

1. **Set up the whole integration with a [POST] request**
Expand Down
10 changes: 7 additions & 3 deletions appinfo/info.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,19 @@ On the Nextcloud end, it allows users to:
* Find all work packages linked to a file or a folder
* View OpenProject notifications via the dashboard
* Search for work packages using Nextcloud's search bar
* Link work packages in rich text fields via Smart Picker
* Preview links to work packages in text fields
On the OpenProject end, users are able to:
* View all Nextcloud files and folders linked to a work package
* Download linked files or open them in Nextcloud to edit them
* Link work packages with files and folders in Nextcloud
* Upload and download files directly to Nextcloud from within a work package
* Open linked files in Nextcloud to edit them
* Let OpenProject create shared folders per project
For more information on how to set up and use the OpenProject application, please refer to [integration setup guide](https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/) for administrators and [the user guide](https://www.openproject.org/docs/user-guide/nextcloud-integration/).
]]></description>
<version>2.4.2</version>
<version>2.4.4</version>
<licence>agpl</licence>
<author>Julien Veyssier</author>
<namespace>OpenProject</namespace>
Expand Down
2 changes: 1 addition & 1 deletion integration_setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -181,7 +181,7 @@ then
deleteOPStorageAndPrintErrorResponse "$nextcloud_information_response"
log_info "Above response is missing one or more of nextcloud_client_id, nextcloud_client_secret, or openproject_user_app_password"
log_info "If the error response is related to project folder setup name 'OpenProject' (group, user, folder) then follow below link to resolve the error"
log_info "Visit this link to resolve the error manually https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/"
log_info "Visit this link to resolve the error manually https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/#troubleshooting"
exit 1
fi
else
Expand Down
2 changes: 1 addition & 1 deletion src/components/AdminSettings.vue
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ export default {
},
errorHintForProjectFolderConfigAlreadyExists() {
const linkText = t('integration_openproject', 'troubleshooting guide')
const htmlLink = `<a class="link" href="https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/" target="_blank" title="${linkText}">${linkText}</a>`
const htmlLink = `<a class="link" href="https://www.openproject.org/docs/system-admin-guide/integrations/nextcloud/#troubleshooting" target="_blank" title="${linkText}">${linkText}</a>`
return t('integration_openproject', 'Setting up the OpenProject user, group and group folder was not possible. Please check this {htmlLink} on how to resolve this situation.', { htmlLink }, null, { escape: false, sanitize: false })
},
isIntegrationComplete() {
Expand Down
1 change: 0 additions & 1 deletion src/components/tab/WorkPackage.vue
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,6 @@ export default {
.workpackage {
width: 100%;
padding: 15px 6px 0 10px;
border-bottom: 1px solid rgb(237 237 237);
.row {
display: flex;
Expand Down

0 comments on commit e527cb6

Please sign in to comment.