diff --git a/.dockerignore b/.dockerignore index a8ba0c44986..abe0a0be0be 100644 --- a/.dockerignore +++ b/.dockerignore @@ -22,11 +22,18 @@ browserslist !/docs/api/apiv3/tags !/docs/api/apiv3/components +# Ignore spec/** folders +spec/** +# Allow factories in case we use lookbook +!spec/factories +!spec/factories/** +!spec/support +!spec/support/** + extra features help log/*.log -spec /tmp frontend/.angular/cache frontend/node_modules diff --git a/.env.example b/.env.example index 0192ff3ca85..c31d0776cd6 100644 --- a/.env.example +++ b/.env.example @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2020 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/.env.test.local.example b/.env.test.local.example index 4c2682c3b12..4c6076b4ae0 100644 --- a/.env.test.local.example +++ b/.env.test.local.example @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2020 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs index 74ffad708a4..73c621a03c0 100644 --- a/.git-blame-ignore-revs +++ b/.git-blame-ignore-revs @@ -1,14 +1,12 @@ # .git-blame-ignore-revs -# lint with rubocop --autocorrect (safe cops only) -48a4f1b6adb1e847a90a61f2ab277f28bcd77608 -# Update copyright information for 2023 -21a696ef9b170e14ad2daf53364a4c2113822c2f -# Update copyright information for 2024 -c795874f7f281297bbd3bad2fdb58b24cb4ce624 # rubocop autocorrections +48a4f1b6adb1e847a90a61f2ab277f28bcd77608 f3c99ee5dded81ad55f2b6f3706216d5fa765677 5c72ea0046a6b5230bf456f55a296ed6fd579535 9e4934cd0a468f46d8f0fc0f11ebc2d4216f789c 6678cab48d443b5782fa93b171d62093819ee4fc fa5d03eae00bc8931f99598a74ffd76e0cbca3da b10e6d718cc49e3574837d97fab268e3ecb3fcbd +# accidental merge +7787e457a37d8d1ef5b6d0c2e326bdc42338ac7b +3b2121f7333f0ce7f3515b29c760c0580c31a245 diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 45cd46cc80a..a3cf31fc013 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -21,3 +21,9 @@ updates: target-branch: "dev" open-pull-requests-limit: 3 versioning-strategy: lockfile-only + - package-ecosystem: "github-actions" + directory: "/" + schedule: + interval: "weekly" + target-branch: "dev" + open-pull-requests-limit: 3 diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md new file mode 100644 index 00000000000..e945cf1b8c7 --- /dev/null +++ b/.github/pull_request_template.md @@ -0,0 +1,23 @@ +# Ticket + + + + + + +# What are you trying to accomplish? + + +## Screenshots + + +# What approach did you choose and why? + + +# Merge checklist + +- [ ] Added/updated tests +- [ ] Added/updated documentation in Lookbook (patterns, previews, etc) +- [ ] Tested major browsers (Chrome, Firefox, Edge, ...) diff --git a/.github/workflows/brakeman-scan-core.yml b/.github/workflows/brakeman-scan-core.yml index 3160d431daf..216690b7705 100644 --- a/.github/workflows/brakeman-scan-core.yml +++ b/.github/workflows/brakeman-scan-core.yml @@ -25,7 +25,7 @@ jobs: RUBY_GC_HEAP_INIT_SLOTS: 100000 steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Setup Ruby uses: ruby/setup-ruby@v1 @@ -44,6 +44,6 @@ jobs: --output output.sarif.json - name: Upload SARIF - uses: github/codeql-action/upload-sarif@v2 + uses: github/codeql-action/upload-sarif@v3 with: sarif_file: output.sarif.json diff --git a/.github/workflows/crowdin.yml b/.github/workflows/crowdin.yml index 3aed630b858..bfc94d1d796 100644 --- a/.github/workflows/crowdin.yml +++ b/.github/workflows/crowdin.yml @@ -41,7 +41,7 @@ jobs: - dev - "${{ needs.setup.outputs.latest_release_branch }}" steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: ref: ${{ matrix.branch }} fetch-depth: 1 @@ -65,7 +65,7 @@ jobs: bundle exec script/i18n/generate_seeders_i18n_source_file fi - name: "Crowdin: upload sources and download translations" - uses: crowdin/github-action@v1 + uses: crowdin/github-action@v2 with: # Upload current source files upload_sources: true diff --git a/.github/workflows/danger.yml b/.github/workflows/danger.yml index 841d0c523ac..eab13d3a371 100644 --- a/.github/workflows/danger.yml +++ b/.github/workflows/danger.yml @@ -17,8 +17,8 @@ jobs: - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: - ruby-version: '3.3.3' - - uses: MeilCli/danger-action@v5 + ruby-version: '3.3.4' + - uses: MeilCli/danger-action@v6 with: danger_file: 'Dangerfile' danger_id: 'danger-pr' diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index b0a0d0f7d91..3db90e894c3 100644 --- a/.github/workflows/docker.yml +++ b/.github/workflows/docker.yml @@ -85,10 +85,11 @@ jobs: ./docker/prod/setup/precompile-assets.sh # public/assets will be saved as artifact, so temporarily copying config file there as well cp config/frontend_assets.manifest.json public/assets/frontend_assets.manifest.json - - uses: actions/upload-artifact@v3 + - uses: actions/upload-artifact@v4 with: path: public/ name: public-assets-${{ github.sha }} + overwrite: true outputs: version: ${{ steps.extract_version.outputs.version }} checkout_ref: ${{ steps.extract_version.outputs.checkout_ref }} @@ -106,22 +107,27 @@ jobs: matrix: include: - platform: linux/amd64 + digest: amd64-slim bim_support: true target: slim runner: runner=4cpu-linux-x64 - platform: linux/arm64/v8 + digest: arm64-slim bim_support: false target: slim runner: runner=4cpu-linux-arm64 - platform: linux/amd64 + digest: amd64-aio bim_support: true target: all-in-one runner: runner=4cpu-linux-x64 - platform: linux/arm64/v8 + digest: arm64-aio bim_support: false target: all-in-one runner: runner=4cpu-linux-arm64 - platform: linux/ppc64le + digest: ppc-aio bim_support: false target: all-in-one runner: runner=4cpu-linux-x64 @@ -134,7 +140,7 @@ jobs: run: | cp ./docker/prod/Dockerfile ./Dockerfile - name: Download precompiled public assets - uses: actions/download-artifact@v3 + uses: actions/download-artifact@v4 with: name: public-assets-${{ github.sha }} path: public/ @@ -164,7 +170,7 @@ jobs: password: ${{ secrets.DOCKER_PASSWORD }} - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: context: git labels: | @@ -177,7 +183,7 @@ jobs: ${{ env.REGISTRY_IMAGE }} - name: Build image id: build - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . platforms: ${{ matrix.platform }} @@ -209,7 +215,7 @@ jobs: wget -O- --retry-on-http-error=503,502 --retry-connrefused http://localhost:8080/api/v3 - name: Push image id: push - uses: docker/build-push-action@v4 + uses: docker/build-push-action@v6 with: context: . platforms: ${{ matrix.platform }} @@ -226,9 +232,9 @@ jobs: digest="${{ steps.push.outputs.digest }}" touch "/tmp/digests/${digest#sha256:}" - name: Upload digest - uses: actions/upload-artifact@v3 + uses: actions/upload-artifact@v4 with: - name: digests-${{ matrix.target }} + name: digests-${{ matrix.target }}-${{ matrix.digest }} path: /tmp/digests/* if-no-files-found: error retention-days: 1 @@ -241,10 +247,16 @@ jobs: - setup - build steps: - - name: Download digests - uses: actions/download-artifact@v3 + - name: Merge digests + uses: actions/upload-artifact/merge@v4 with: - name: digests-${{ matrix.target }} + pattern: "digests-${{ matrix.target }}-*" + overwrite: true + name: "merged-digests-${{ matrix.target }}-${{ github.run_number }}-${{ github.run_attempt }}" + - name: Download digests + uses: actions/download-artifact@v4 + with: + name: "merged-digests-${{ matrix.target }}-${{ github.run_number }}-${{ github.run_attempt }}" path: /tmp/digests - name: Set suffix id: set_suffix @@ -256,7 +268,7 @@ jobs: uses: docker/setup-buildx-action@v3 - name: Docker meta id: meta - uses: docker/metadata-action@v4 + uses: docker/metadata-action@v5 with: images: ${{ env.REGISTRY_IMAGE }} labels: | diff --git a/.github/workflows/eslint-core.yml b/.github/workflows/eslint-core.yml index 4e4ede7f0a2..9c24db41635 100644 --- a/.github/workflows/eslint-core.yml +++ b/.github/workflows/eslint-core.yml @@ -14,10 +14,10 @@ jobs: name: eslint runs-on: ubuntu-latest steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 with: fetch-depth: 0 - - uses: actions/setup-node@v3 + - uses: actions/setup-node@v4 with: node-version: '18.13' cache: npm diff --git a/.github/workflows/i18n-tasks.yml b/.github/workflows/i18n-tasks.yml new file mode 100644 index 00000000000..fdc79ac2324 --- /dev/null +++ b/.github/workflows/i18n-tasks.yml @@ -0,0 +1,44 @@ +name: i18n-inconsistency-check + +on: + push: + branches: + - dev + - release/* + paths-ignore: + - 'docs/**' + - 'help/**' + pull_request: + types: [opened, reopened, synchronize] + paths-ignore: + - 'docs/**' + - 'help/**' + - 'packaging/**' + - '.pkgr.yml' + +permissions: + contents: read + +jobs: + i18n-tasks: + permissions: + contents: read + if: github.repository == 'opf/openproject' + name: I18n inconsistency check + runs-on: ubuntu-latest + steps: + - name: Checkout + uses: actions/checkout@v4 + + - name: Setup Ruby + uses: ruby/setup-ruby@v1 + + - name: Setup i18n-tasks + run: | + gem install i18n-tasks + + - name: Run inconsistent translations check + run: | + i18n-tasks \ + check-consistent-interpolations \ + --config config/i18n-tasks-all-files.yml diff --git a/.github/workflows/openapi.yaml b/.github/workflows/openapi.yaml index 8ff68ce878c..459376056b5 100644 --- a/.github/workflows/openapi.yaml +++ b/.github/workflows/openapi.yaml @@ -18,11 +18,11 @@ jobs: if: github.repository == 'opf/openproject' runs-on: [ubuntu-latest] steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - uses: ruby/setup-ruby@v1 with: bundler-cache: true - - uses: actions/setup-node@v2 + - uses: actions/setup-node@v4 with: node-version: '20' - run: ./script/api/validate_spec diff --git a/.github/workflows/pullpreview.yml b/.github/workflows/pullpreview.yml index ac546b1ff3f..ce7f0ba31dc 100644 --- a/.github/workflows/pullpreview.yml +++ b/.github/workflows/pullpreview.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest timeout-minutes: 60 steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Generate .env.pullpreview file run: | echo "OPENPROJECT_SEED_ADMIN_USER_PASSWORD_RESET=false" >> .env.pullpreview diff --git a/.github/workflows/rubocop-core.yml b/.github/workflows/rubocop-core.yml index 1cec9bf1086..ecd47277ae6 100644 --- a/.github/workflows/rubocop-core.yml +++ b/.github/workflows/rubocop-core.yml @@ -9,10 +9,8 @@ jobs: runs-on: ubuntu-latest steps: - uses: actions/checkout@v4 - - name: Fetch head commit of base branch - run: git fetch --depth 1 origin ${{ github.event.pull_request.base.sha }} - uses: ruby/setup-ruby@v1 - - uses: opf/action-rubocop@master + - uses: reviewdog/action-rubocop@v2 with: github_token: ${{ secrets.github_token }} rubocop_version: gemfile diff --git a/.github/workflows/test-core.yml b/.github/workflows/test-core.yml index e5b9afcf86e..30d3d658d32 100644 --- a/.github/workflows/test-core.yml +++ b/.github/workflows/test-core.yml @@ -27,6 +27,7 @@ jobs: labels: - runs-on - runner=32cpu-linux-x64 + - family=m7 - run-id=${{ github.run_id }} timeout-minutes: 40 env: diff --git a/.github/workflows/version-check.yml b/.github/workflows/version-check.yml new file mode 100644 index 00000000000..0405fd47f94 --- /dev/null +++ b/.github/workflows/version-check.yml @@ -0,0 +1,47 @@ +name: Check work package version + +on: + pull_request: + types: [labeled, synchronize] + +permissions: + contents: read # to fetch code (actions/checkout) + pull-requests: write # to comment on the PR + +jobs: + check-pr: + if: contains(github.event.pull_request.labels.*.name, 'needs review') + runs-on: ubuntu-latest + + steps: + - name: Checkout code + uses: actions/checkout@v4 + + - name: Set up Ruby + uses: ruby/setup-ruby@v1 + + - name: Verify linked version matches core version + id: version-check + run: ./script/ci/version_check.sh "${{ github.event.pull_request.body }}" + + - name: Add comment if versions differ + if: steps.version-check.outputs.version_mismatch == 'true' + uses: marocchino/sticky-pull-request-comment@v2 + with: + header: version-mismatch-comment + message: | + The provided work package version does not match the core version: + + - Work package URL: ${{ steps.version-check.outputs.wp_url }} + - Work package version: ${{steps.version-check.outputs.wp_version}} + - Core version: ${{steps.version-check.outputs.core_version}} + + Please make sure that: + + - The work package version OR your pull request target branch is correct + - name: Version check passed + if: steps.version-check.outputs.version_mismatch != 'true' + uses: marocchino/sticky-pull-request-comment@v2 + with: + header: version-mismatch-comment + delete: true diff --git a/.gitignore b/.gitignore index f258caa4173..0a27bf8e565 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/.pkgr.yml b/.pkgr.yml index ac00306c834..62354658845 100644 --- a/.pkgr.yml +++ b/.pkgr.yml @@ -49,7 +49,7 @@ wizards: - https://github.com/pkgr/addon-legacy-installer.git - ./packaging/addons/openproject-edition - https://github.com/pkgr/addon-postgres - - https://github.com/pkgr/addon-apache2.git + - https://github.com/pkgr/addon-apache2.git#set-host-header - ./packaging/addons/repositories - https://github.com/pkgr/addon-memcached.git - ./packaging/addons/openproject diff --git a/.rubocop.yml b/.rubocop.yml index 799e8c4def8..821c3902e52 100644 --- a/.rubocop.yml +++ b/.rubocop.yml @@ -143,7 +143,7 @@ Naming/VariableNumber: AllowedPatterns: - '\w_20\d\d' # allow dates like christmas_2022 or date_2034_04_12 - '\w\d++(_\d++)+' # allow hierarchical data like child1_2_5 (second + in regex is possessive qualifier) - + - 'custom_field_\d+' # allow custom field method names to be called with send :custom_field_1001 # There are valid cases in which to use methods like: # * update_all # * touch_all @@ -208,6 +208,17 @@ Rails/DynamicFindBy: - 'spec/features/**/*.rb' - 'spec/support/**/*.rb' - 'modules/*/spec/features/**/*.rb' + Whitelist: + - find_by_login + +# Allow reorder to prevent find each cop triggering +Rails/FindEach: + AllowedMethods: + - order + - reorder + - limit + - select + - lock # We have config.active_record.belongs_to_required_by_default = false , # which means, we do have to declare presence validators on belongs_to relations. @@ -236,6 +247,8 @@ RSpec/DescribeMethod: # Don't force the second argument of describe # to match the exact file name RSpec/SpecFilePathFormat: + CustomTransform: + OAuthClients: oauth_clients IgnoreMethods: true # Prevent "fit" or similar to be committed @@ -459,3 +472,10 @@ Style/HashTransformValues: Performance/Casecmp: Enabled: false + +OpenProject/AddPreviewForViewComponent: + Include: + - app/components/op_turbo/**.rb + - app/components/op_primer/**.rb + - app/components/open_project/**.rb + - app/components/concerns/**.rb diff --git a/.ruby-version b/.ruby-version index 619b5376684..a0891f563f3 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -3.3.3 +3.3.4 diff --git a/COPYRIGHT_short b/COPYRIGHT_short index f6628456eb3..d4773d9e476 100644 --- a/COPYRIGHT_short +++ b/COPYRIGHT_short @@ -1,5 +1,5 @@ OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/Gemfile b/Gemfile index 60f1c7aefff..46aa10862b5 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -61,9 +61,9 @@ gem "friendly_id", "~> 5.5.0" gem "acts_as_list", "~> 1.2.0" gem "acts_as_tree", "~> 2.9.0" -gem "awesome_nested_set", "~> 3.6.0" +gem "awesome_nested_set", "~> 3.7.0" gem "closure_tree", "~> 7.4.0" -gem "rubytree", "~> 2.0.0" +gem "rubytree", "~> 2.1.0" # Only used in down migrations now. # Is to be removed once the referencing migrations have been squashed. gem "typed_dag", "~> 2.0.2", require: false @@ -158,14 +158,14 @@ gem "structured_warnings", "~> 0.4.0" gem "airbrake", "~> 13.0.0", require: false gem "markly", "~> 0.10" # another markdown parser like commonmarker, but with AST support used in PDF export -gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "32603f09a249999a00e8ca23eb17215b46a26c0f" +gem "md_to_pdf", git: "https://github.com/opf/md-to-pdf", ref: "fe05b4f8bae8fd46f4fa93b8e0adee6295ef7388" gem "prawn", "~> 2.4" gem "ttfunk", "~> 1.7.0" # remove after https://github.com/prawnpdf/prawn/issues/1346 resolved. # prawn implicitly depends on matrix gem no longer in ruby core with 3.1 gem "matrix", "~> 0.4.2" -gem "meta-tags", "~> 2.21.0" +gem "meta-tags", "~> 2.22.0" gem "paper_trail", "~> 15.1.0" @@ -204,29 +204,32 @@ gem "plaintext", "~> 0.3.2" gem "ruby-progressbar", "~> 1.13.0", require: false -gem "mini_magick", "~> 4.13.0", require: false +gem "mini_magick", "~> 5.0.1", require: false gem "validate_url" # Storages support code +gem "dry-auto_inject" gem "dry-container" gem "dry-monads" +gem "dry-validation" # ActiveRecord extension which adds typecasting to store accessors gem "store_attribute", "~> 1.0" # Appsignal integration -gem "appsignal", "~> 3.8.1", require: false +gem "appsignal", "~> 3.10.0", require: false gem "view_component" # Lookbook gem "lookbook", "~> 2.3.0" # Require factory_bot for usage with openproject plugins testing -gem "factory_bot", "~> 6.4.0", require: false +gem "factory_bot", "~> 6.5.0", require: false # require factory_bot_rails for convenience in core development gem "factory_bot_rails", "~> 6.4.0", require: false +gem "turbo_power", "~> 0.6.2" gem "turbo-rails", "~> 2.0.0" gem "httpx" @@ -238,13 +241,13 @@ group :test do # Test prof provides factories from code # and other niceties - gem "test-prof", "~> 1.3.0" + gem "test-prof", "~> 1.4.0" gem "turbo_tests", github: "opf/turbo_tests", ref: "with-patches" gem "rack_session_access" gem "rspec", "~> 3.13.0" # also add to development group, so 'spec' rake task gets loaded - gem "rspec-rails", "~> 6.1.0", group: :development + gem "rspec-rails", "~> 7.0.0", group: :development # Retry failures within the same environment gem "retriable", "~> 3.1.1" @@ -272,7 +275,7 @@ group :test do gem "selenium-devtools" gem "selenium-webdriver", "~> 4.20" - gem "fuubar", "~> 2.5.0" + gem "fuubar", "~> 2.5.0", require: false gem "timecop", "~> 0.9.0" # Record your test suite's HTTP interactions and replay them during future test runs for fast, deterministic, accurate tests. @@ -319,6 +322,9 @@ group :development, :test do gem "ruby-prof", require: false gem "stackprof", require: false + # Output a stack trace anytime, useful when a process is stuck + gem "rbtrace" + # REPL with debug commands gem "debug" @@ -342,10 +348,10 @@ group :development, :test do gem "erblint-github", require: false # Brakeman scanner - gem "brakeman", "~> 6.1.0" + gem "brakeman", "~> 6.2.0" # i18n-tasks helps find and manage missing and unused translations. - gem "i18n-tasks", "~> 1.0.13" + gem "i18n-tasks", "~> 1.0.13", require: false end gem "bootsnap", "~> 1.18.0", require: false @@ -390,6 +396,6 @@ gemfiles.each do |file| send(:eval_gemfile, file) if File.readable?(file) end -gem "openproject-octicons", "~>19.15.0" -gem "openproject-octicons_helper", "~>19.15.0" -gem "openproject-primer_view_components", "~>0.36.0" +gem "openproject-octicons", "~>19.18.0" +gem "openproject-octicons_helper", "~>19.18.0" +gem "openproject-primer_view_components", "~>0.47.0" diff --git a/Gemfile.lock b/Gemfile.lock index 9effb3a5492..d2790851f0a 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -8,10 +8,10 @@ GIT GIT remote: https://github.com/opf/md-to-pdf - revision: 32603f09a249999a00e8ca23eb17215b46a26c0f - ref: 32603f09a249999a00e8ca23eb17215b46a26c0f + revision: fe05b4f8bae8fd46f4fa93b8e0adee6295ef7388 + ref: fe05b4f8bae8fd46f4fa93b8e0adee6295ef7388 specs: - md_to_pdf (0.1.1) + md_to_pdf (0.1.2) color_conversion (~> 0.1) front_matter_parser (~> 1.0) json-schema (~> 4.3) @@ -206,7 +206,7 @@ PATH remote: modules/two_factor_authentication specs: openproject-two_factor_authentication (1.0.0) - aws-sdk-sns (~> 1.77.0) + aws-sdk-sns (~> 1.82.0) messagebird-rest (~> 1.4.2) rotp (~> 6.1) webauthn (~> 3.0) @@ -226,35 +226,35 @@ GEM remote: https://rubygems.org/ specs: Ascii85 (1.1.1) - actioncable (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + actioncable (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) nio4r (~> 2.0) websocket-driver (>= 0.6.1) zeitwerk (~> 2.6) - actionmailbox (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionmailbox (7.1.4) + actionpack (= 7.1.4) + activejob (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) mail (>= 2.7.1) net-imap net-pop net-smtp - actionmailer (7.1.3.4) - actionpack (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionmailer (7.1.4) + actionpack (= 7.1.4) + actionview (= 7.1.4) + activejob (= 7.1.4) + activesupport (= 7.1.4) mail (~> 2.5, >= 2.5.4) net-imap net-pop net-smtp rails-dom-testing (~> 2.2) - actionpack (7.1.3.4) - actionview (= 7.1.3.4) - activesupport (= 7.1.3.4) + actionpack (7.1.4) + actionview (= 7.1.4) + activesupport (= 7.1.4) nokogiri (>= 1.8.5) racc rack (>= 2.2.4) @@ -265,31 +265,31 @@ GEM actionpack-xml_parser (2.0.1) actionpack (>= 5.0) railties (>= 5.0) - actiontext (7.1.3.4) - actionpack (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + actiontext (7.1.4) + actionpack (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) globalid (>= 0.6.0) nokogiri (>= 1.8.5) - actionview (7.1.3.4) - activesupport (= 7.1.3.4) + actionview (7.1.4) + activesupport (= 7.1.4) builder (~> 3.1) erubi (~> 1.11) rails-dom-testing (~> 2.2) rails-html-sanitizer (~> 1.6) - activejob (7.1.3.4) - activesupport (= 7.1.3.4) + activejob (7.1.4) + activesupport (= 7.1.4) globalid (>= 0.3.6) - activemodel (7.1.3.4) - activesupport (= 7.1.3.4) + activemodel (7.1.4) + activesupport (= 7.1.4) activemodel-serializers-xml (1.0.2) activemodel (> 5.x) activesupport (> 5.x) builder (~> 3.1) - activerecord (7.1.3.4) - activemodel (= 7.1.3.4) - activesupport (= 7.1.3.4) + activerecord (7.1.4) + activemodel (= 7.1.4) + activesupport (= 7.1.4) timeout (>= 0.4.0) activerecord-import (1.7.0) activerecord (>= 4.2) @@ -302,13 +302,13 @@ GEM multi_json (~> 1.11, >= 1.11.2) rack (>= 2.0.8, < 4) railties (>= 6.1) - activestorage (7.1.3.4) - actionpack (= 7.1.3.4) - activejob (= 7.1.3.4) - activerecord (= 7.1.3.4) - activesupport (= 7.1.3.4) + activestorage (7.1.4) + actionpack (= 7.1.4) + activejob (= 7.1.4) + activerecord (= 7.1.4) + activesupport (= 7.1.4) marcel (~> 1.0) - activesupport (7.1.3.4) + activesupport (7.1.4) base64 bigdecimal concurrent-ruby (~> 1.0, >= 1.0.2) @@ -318,7 +318,7 @@ GEM minitest (>= 5.1) mutex_m tzinfo (~> 2.0) - acts_as_list (1.2.1) + acts_as_list (1.2.2) activerecord (>= 6.1) activesupport (>= 6.1) acts_as_tree (2.9.1) @@ -332,39 +332,39 @@ GEM airbrake-ruby (6.2.2) rbtree3 (~> 0.6) android_key_attestation (0.3.0) - appsignal (3.8.1) + appsignal (3.10.0) rack ast (2.4.2) attr_required (1.0.2) auto_strip_attributes (2.6.0) activerecord (>= 4.0) - awesome_nested_set (3.6.0) - activerecord (>= 4.0.0, < 7.2) + awesome_nested_set (3.7.0) + activerecord (>= 4.0.0, < 8.0) awrence (1.2.1) aws-eventstream (1.3.0) - aws-partitions (1.950.0) - aws-sdk-core (3.201.0) + aws-partitions (1.974.0) + aws-sdk-core (3.205.0) aws-eventstream (~> 1, >= 1.3.0) aws-partitions (~> 1, >= 1.651.0) - aws-sigv4 (~> 1.8) + aws-sigv4 (~> 1.9) jmespath (~> 1, >= 1.6.1) - aws-sdk-kms (1.88.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-kms (1.91.0) + aws-sdk-core (~> 3, >= 3.205.0) aws-sigv4 (~> 1.5) - aws-sdk-s3 (1.156.0) - aws-sdk-core (~> 3, >= 3.201.0) + aws-sdk-s3 (1.162.0) + aws-sdk-core (~> 3, >= 3.205.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.5) - aws-sdk-sns (1.77.0) - aws-sdk-core (~> 3, >= 3.197.0) - aws-sigv4 (~> 1.1) - aws-sigv4 (1.8.0) + aws-sdk-sns (1.82.0) + aws-sdk-core (~> 3, >= 3.201.0) + aws-sigv4 (~> 1.5) + aws-sigv4 (1.9.1) aws-eventstream (~> 1, >= 1.0.2) - axe-core-api (4.9.1) + axe-core-api (4.10.0) dumb_delegator virtus - axe-core-rspec (4.9.1) - axe-core-api (= 4.9.1) + axe-core-rspec (4.10.0) + axe-core-api (= 4.10.0) dumb_delegator virtus axiom-types (0.1.1) @@ -382,9 +382,9 @@ GEM smart_properties bigdecimal (3.1.8) bindata (2.5.0) - bootsnap (1.18.3) + bootsnap (1.18.4) msgpack (~> 1.2) - brakeman (6.1.2) + brakeman (6.2.1) racc browser (6.0.0) builder (3.3.0) @@ -411,7 +411,8 @@ GEM fog-aws cbor (0.5.9.8) cgi (0.4.1) - childprocess (5.0.0) + childprocess (5.1.0) + logger (~> 1.5) climate_control (1.2.0) closure_tree (7.4.0) activerecord (>= 4.2.10) @@ -419,16 +420,16 @@ GEM coderay (1.1.3) coercible (1.0.0) descendants_tracker (~> 0.0.1) - color_conversion (0.1.1) + color_conversion (0.1.2) colored2 (4.0.0) - commonmarker (1.1.4) + commonmarker (1.1.5) rb_sys (~> 0.9) compare-xml (0.66) nokogiri (~> 1.8) - concurrent-ruby (1.3.3) + concurrent-ruby (1.3.4) connection_pool (2.4.1) cookiejar (0.3.4) - cose (1.3.0) + cose (1.3.1) cbor (~> 0.5.9) openssl-signature_algorithm (~> 1.0) crack (1.0.0) @@ -466,12 +467,19 @@ GEM dotenv (= 3.1.2) railties (>= 6.1) drb (2.2.1) + dry-auto_inject (1.0.1) + dry-core (~> 1.0) + zeitwerk (~> 2.6) + dry-configurable (1.2.0) + dry-core (~> 1.0, < 2) + zeitwerk (~> 2.6) dry-container (0.11.0) concurrent-ruby (~> 1.0) dry-core (1.0.1) concurrent-ruby (~> 1.0) zeitwerk (~> 2.6) - dry-inflector (1.0.0) + dry-inflector (1.1.0) + dry-initializer (3.1.1) dry-logic (1.5.0) concurrent-ruby (~> 1.0) dry-core (~> 1.0, < 2) @@ -480,6 +488,14 @@ GEM concurrent-ruby (~> 1.0) dry-core (~> 1.0, < 2) zeitwerk (~> 2.6) + dry-schema (1.13.4) + concurrent-ruby (~> 1.0) + dry-configurable (~> 1.0, >= 1.0.1) + dry-core (~> 1.0, < 2) + dry-initializer (~> 3.0) + dry-logic (>= 1.4, < 2) + dry-types (>= 1.7, < 2) + zeitwerk (~> 2.6) dry-types (1.7.2) bigdecimal (~> 3.0) concurrent-ruby (~> 1.0) @@ -487,6 +503,12 @@ GEM dry-inflector (~> 1.0) dry-logic (~> 1.4) zeitwerk (~> 2.6) + dry-validation (1.10.0) + concurrent-ruby (~> 1.0) + dry-core (~> 1.0, < 2) + dry-initializer (~> 3.0) + dry-schema (>= 1.12, < 2) + zeitwerk (~> 2.6) dumb_delegator (1.0.0) em-http-request (1.1.7) addressable (>= 2.3.4) @@ -494,7 +516,8 @@ GEM em-socksify (>= 0.3) eventmachine (>= 1.0.3) http_parser.rb (>= 0.6.0) - em-socksify (0.3.2) + em-socksify (0.3.3) + base64 eventmachine (>= 1.0.0.beta.4) em-synchrony (1.0.6) eventmachine (>= 1.0.0.beta.1) @@ -502,12 +525,12 @@ GEM activemodel equivalent-xml (0.6.0) nokogiri (>= 1.4.3) - erb_lint (0.5.0) + erb_lint (0.6.0) activesupport better_html (>= 2.0.1) parser (>= 2.7.1.4) rainbow - rubocop + rubocop (>= 1) smart_properties erblint-github (1.0.1) erubi (1.13.0) @@ -516,17 +539,18 @@ GEM tzinfo eventmachine (1.2.7) eventmachine_httpserver (0.2.1) - excon (0.110.0) - factory_bot (6.4.6) + excon (0.111.0) + factory_bot (6.5.0) activesupport (>= 5.0.0) factory_bot_rails (6.4.3) factory_bot (~> 6.4) railties (>= 5.0.0) - faraday (2.9.2) + faraday (2.10.1) faraday-net_http (>= 2.0, < 3.2) + logger faraday-follow_redirects (0.3.0) faraday (>= 1, < 3) - faraday-net_http (3.1.0) + faraday-net_http (3.1.1) net-http fastimage (2.3.1) ferrum (0.15) @@ -536,11 +560,12 @@ GEM websocket-driver (~> 0.7) ffi (1.17.0) flamegraph (0.9.5) - fog-aws (3.23.0) + fog-aws (3.27.0) + base64 (~> 0.2.0) fog-core (~> 2.1) fog-json (~> 1.1) fog-xml (~> 0.1) - fog-core (2.4.0) + fog-core (2.5.0) builder excon (~> 0.71) formatador (>= 0.2, < 2.0) @@ -555,7 +580,7 @@ GEM friendly_id (5.5.1) activerecord (>= 4.0.0) front_matter_parser (1.0.1) - fugit (1.11.0) + fugit (1.11.1) et-orbi (~> 1, >= 1.2.11) raabro (~> 1.4) fuubar (2.5.1) @@ -576,14 +601,14 @@ GEM fugit (>= 1.1) railties (>= 6.0.0) thor (>= 0.14.1) - google-apis-core (0.15.0) + google-apis-core (0.15.1) addressable (~> 2.5, >= 2.5.1) googleauth (~> 1.9) - httpclient (>= 2.8.1, < 3.a) + httpclient (>= 2.8.3, < 3.a) mini_mime (~> 1.0) + mutex_m representable (~> 3.0) retriable (>= 2.0, < 4.a) - rexml google-apis-gmail_v1 (0.41.0) google-apis-core (>= 0.15.0, < 2.a) google-cloud-env (2.1.1) @@ -595,7 +620,7 @@ GEM multi_json (~> 1.11) os (>= 0.9, < 2.0) signet (>= 0.16, < 2.a) - grape (2.1.2) + grape (2.1.3) activesupport (>= 6) dry-types (>= 1.1) mustermann-grape (~> 1.1.0) @@ -606,21 +631,22 @@ GEM rack gravatar_image_tag (1.2.0) hana (1.3.7) - hashdiff (1.1.0) + hashdiff (1.1.1) hashery (2.1.2) hashie (3.6.0) - highline (3.0.1) + highline (3.1.1) + reline html-pipeline (2.14.3) activesupport (>= 2) nokogiri (>= 1.4) htmlbeautifier (1.4.3) htmldiff (0.0.1) htmlentities (4.3.4) - http-2-next (1.0.3) + http-2 (1.0.1) http_parser.rb (0.6.0) httpclient (2.8.3) - httpx (1.2.6) - http-2-next (>= 1.0.3) + httpx (1.3.1) + http-2 (>= 1.0.0) i18n (1.14.5) concurrent-ruby (~> 1.0) i18n-js (4.2.3) @@ -636,13 +662,13 @@ GEM rails-i18n rainbow (>= 2.2.2, < 4.0) terminal-table (>= 1.5.1) - icalendar (2.10.1) + icalendar (2.10.2) ice_cube (~> 0.16) - ice_cube (0.16.4) + ice_cube (0.17.0) ice_nine (0.11.2) interception (0.5) io-console (0.7.2) - irb (1.13.2) + irb (1.14.0) rdoc (>= 4.0.0) reline (>= 0.4.2) iso8601 (0.13.0) @@ -655,7 +681,7 @@ GEM bindata faraday (~> 2.0) faraday-follow_redirects - json-schema (4.3.0) + json-schema (4.3.1) addressable (>= 2.8) json_schemer (2.3.0) bigdecimal @@ -673,7 +699,7 @@ GEM launchy (3.0.1) addressable (~> 2.8) childprocess (~> 5.0) - lefthook (1.6.18) + lefthook (1.7.15) letter_opener (1.10.0) launchy (>= 2.2, < 4) letter_opener_web (3.0.0) @@ -688,7 +714,7 @@ GEM omniauth (~> 1.1) omniauth-openid-connect (>= 0.2.1) rails (>= 3.2.21) - logger (1.6.0) + logger (1.6.1) lograge (0.14.0) actionpack (>= 4) activesupport (>= 4) @@ -715,29 +741,29 @@ GEM net-pop net-smtp marcel (1.0.4) - markly (0.10.0) + markly (0.12.1) matrix (0.4.2) messagebird-rest (1.4.2) - meta-tags (2.21.0) - actionpack (>= 6.0.0, < 7.2) + meta-tags (2.22.0) + actionpack (>= 6.0.0, < 8.1) method_source (1.1.0) mime-types (3.5.2) mime-types-data (~> 3.2015) - mime-types-data (3.2024.0604) - mini_magick (4.13.1) + mime-types-data (3.2024.0903) + mini_magick (5.0.1) mini_mime (1.1.5) mini_portile2 (2.8.7) - minitest (5.24.1) + minitest (5.25.1) msgpack (1.7.2) multi_json (1.15.0) - mustermann (3.0.0) + mustermann (3.0.3) ruby2_keywords (~> 0.0.1) mustermann-grape (1.1.0) mustermann (>= 1.0.0) mutex_m (0.2.0) net-http (0.4.1) uri - net-imap (0.4.13) + net-imap (0.4.14) date net-protocol net-ldap (0.19.0) @@ -748,11 +774,12 @@ GEM net-smtp (0.5.0) net-protocol nio4r (2.7.3) - nokogiri (1.16.6) + nokogiri (1.16.7) mini_portile2 (~> 2.8.2) racc (~> 1.4) - oj (3.16.4) + oj (3.16.6) bigdecimal (>= 3.0) + ostruct (>= 0.2) okcomputer (1.18.5) omniauth-saml (1.10.3) omniauth (~> 1.3, >= 1.3.2) @@ -771,30 +798,32 @@ GEM validate_email validate_url webfinger (~> 2.0) - openproject-octicons (19.15.0) - openproject-octicons_helper (19.15.0) + openproject-octicons (19.18.0) + openproject-octicons_helper (19.18.0) actionview - openproject-octicons (= 19.15.0) + openproject-octicons (= 19.18.0) railties - openproject-primer_view_components (0.36.0) + openproject-primer_view_components (0.47.0) actionview (>= 5.0.0) activesupport (>= 5.0.0) - openproject-octicons (>= 19.15.0) + openproject-octicons (>= 19.17.0) view_component (>= 3.1, < 4.0) openproject-token (4.0.0) activemodel openssl (3.2.0) openssl-signature_algorithm (1.3.0) openssl (> 2.0) + optimist (3.1.0) os (1.1.4) + ostruct (0.6.0) ox (2.14.18) paper_trail (15.1.0) activerecord (>= 6.1) request_store (~> 1.4) - parallel (1.25.1) - parallel_tests (4.7.1) + parallel (1.26.3) + parallel_tests (4.7.2) parallel - parser (3.3.3.0) + parser (3.3.5.0) ast (~> 2.4.1) racc pdf-core (0.9.0) @@ -806,7 +835,7 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.5.6) + pg (1.5.8) plaintext (0.3.4) activesupport (> 2.2.1) nokogiri (~> 1.10, >= 1.10.4) @@ -832,7 +861,7 @@ GEM pry (>= 0.12.0) psych (5.1.2) stringio - public_suffix (6.0.0) + public_suffix (6.0.1) puffing-billy (4.0.0) addressable (~> 2.5) em-http-request (~> 1.1, >= 1.1.0) @@ -846,7 +875,7 @@ GEM puma-plugin-statsd (2.6.0) puma (>= 5.0, < 7) raabro (1.4.0) - racc (1.8.0) + racc (1.8.1) rack (2.2.9) rack-attack (6.7.0) rack (>= 1.0, < 4) @@ -875,20 +904,20 @@ GEM rackup (1.0.0) rack (< 3) webrick - rails (7.1.3.4) - actioncable (= 7.1.3.4) - actionmailbox (= 7.1.3.4) - actionmailer (= 7.1.3.4) - actionpack (= 7.1.3.4) - actiontext (= 7.1.3.4) - actionview (= 7.1.3.4) - activejob (= 7.1.3.4) - activemodel (= 7.1.3.4) - activerecord (= 7.1.3.4) - activestorage (= 7.1.3.4) - activesupport (= 7.1.3.4) + rails (7.1.4) + actioncable (= 7.1.4) + actionmailbox (= 7.1.4) + actionmailer (= 7.1.4) + actionpack (= 7.1.4) + actiontext (= 7.1.4) + actionview (= 7.1.4) + activejob (= 7.1.4) + activemodel (= 7.1.4) + activerecord (= 7.1.4) + activestorage (= 7.1.4) + activesupport (= 7.1.4) bundler (>= 1.15.0) - railties (= 7.1.3.4) + railties (= 7.1.4) rails-controller-testing (1.0.5) actionpack (>= 5.0.1.rc1) actionview (>= 5.0.1.rc1) @@ -903,9 +932,9 @@ GEM rails-i18n (7.0.9) i18n (>= 0.7, < 2) railties (>= 6.0.0, < 8) - railties (7.1.3.4) - actionpack (= 7.1.3.4) - activesupport (= 7.1.3.4) + railties (7.1.4) + actionpack (= 7.1.4) + activesupport (= 7.1.4) irb rackup (>= 1.0.0) rake (>= 12.2) @@ -916,7 +945,11 @@ GEM rb-fsevent (0.11.2) rb-inotify (0.11.1) ffi (~> 1.0) - rb_sys (0.9.97) + rb_sys (0.9.102) + rbtrace (0.5.1) + ffi (>= 1.0.6) + msgpack (>= 0.4.3) + optimist (>= 3.0.0) rbtree3 (0.7.1) rdoc (6.7.0) psych (>= 4.0.0) @@ -927,7 +960,7 @@ GEM redis-client (0.22.2) connection_pool regexp_parser (2.9.2) - reline (0.5.9) + reline (0.5.10) io-console (~> 0.5) representable (3.2.0) declarative (< 0.1.0) @@ -939,8 +972,7 @@ GEM actionpack (>= 5.2) railties (>= 5.2) retriable (3.1.2) - rexml (3.3.1) - strscan + rexml (3.3.7) rinku (2.0.6) roar (1.2.0) representable (~> 3.1) @@ -950,18 +982,18 @@ GEM rspec-core (~> 3.13.0) rspec-expectations (~> 3.13.0) rspec-mocks (~> 3.13.0) - rspec-core (3.13.0) + rspec-core (3.13.1) rspec-support (~> 3.13.0) - rspec-expectations (3.13.1) + rspec-expectations (3.13.3) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) rspec-mocks (3.13.1) diff-lcs (>= 1.2.0, < 2.0) rspec-support (~> 3.13.0) - rspec-rails (6.1.3) - actionpack (>= 6.1) - activesupport (>= 6.1) - railties (>= 6.1) + rspec-rails (7.0.1) + actionpack (>= 7.0) + activesupport (>= 7.0) + railties (>= 7.0) rspec-core (~> 3.13) rspec-expectations (~> 3.13) rspec-mocks (~> 3.13) @@ -969,18 +1001,17 @@ GEM rspec-retry (0.6.2) rspec-core (> 3.3) rspec-support (3.13.1) - rubocop (1.64.1) + rubocop (1.66.1) json (~> 2.3) language_server-protocol (>= 3.17.0) parallel (~> 1.10) parser (>= 3.3.0.2) rainbow (>= 2.2.2, < 4.0) - regexp_parser (>= 1.8, < 3.0) - rexml (>= 3.2.5, < 4.0) - rubocop-ast (>= 1.31.1, < 2.0) + regexp_parser (>= 2.4, < 3.0) + rubocop-ast (>= 1.32.2, < 2.0) ruby-progressbar (~> 1.7) unicode-display_width (>= 2.4.0, < 3.0) - rubocop-ast (1.31.3) + rubocop-ast (1.32.3) parser (>= 3.3.1.0) rubocop-capybara (2.21.0) rubocop (~> 1.41) @@ -988,15 +1019,15 @@ GEM rubocop (~> 1.61) rubocop-openproject (0.1.0) rubocop - rubocop-performance (1.21.1) + rubocop-performance (1.22.0) rubocop (>= 1.48.1, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rails (2.25.1) + rubocop-rails (2.26.1) activesupport (>= 4.2.0) rack (>= 1.1) - rubocop (>= 1.33.0, < 2.0) + rubocop (>= 1.52.0, < 2.0) rubocop-ast (>= 1.31.1, < 2.0) - rubocop-rspec (3.0.2) + rubocop-rspec (3.0.5) rubocop (~> 1.61) rubocop-rspec_rails (2.30.0) rubocop (~> 1.61) @@ -1009,22 +1040,22 @@ GEM ruby-prof (1.7.0) ruby-progressbar (1.13.0) ruby-rc4 (0.1.5) - ruby-saml (1.16.0) + ruby-saml (1.17.0) nokogiri (>= 1.13.10) rexml ruby2_keywords (0.0.5) - rubytree (2.0.3) + rubytree (2.1.0) json (~> 2.0, > 2.3.1) rubyzip (2.3.2) safety_net_attestation (0.4.0) jwt (~> 2.0) - sanitize (6.1.1) + sanitize (6.1.3) crass (~> 1.0.2) nokogiri (>= 1.12.0) secure_headers (6.5.0) - selenium-devtools (0.126.0) + selenium-devtools (0.128.0) selenium-webdriver (~> 4.2) - selenium-webdriver (4.22.0) + selenium-webdriver (4.24.0) base64 (~> 0.2) logger (~> 1.4) rexml (~> 3.2, >= 3.2.5) @@ -1032,7 +1063,7 @@ GEM websocket (~> 1.0) semantic (1.6.1) shoulda-context (2.0.0) - shoulda-matchers (6.2.0) + shoulda-matchers (6.4.0) activesupport (>= 5.2.0) signet (0.19.0) addressable (~> 2.8) @@ -1049,21 +1080,20 @@ GEM spring (>= 0.9.1) spring-commands-rubocop (0.4.0) spring (>= 1.0) - sprockets (3.7.3) + sprockets (3.7.4) base64 concurrent-ruby (~> 1.0) rack (> 1, < 3) - sprockets-rails (3.5.1) + sprockets-rails (3.5.2) actionpack (>= 6.1) activesupport (>= 6.1) sprockets (>= 3.0.0) ssrf_filter (1.0.8) stackprof (0.2.26) - store_attribute (1.2.0) - activerecord (>= 6.0) + store_attribute (1.3.0) + activerecord (>= 6.1) stringex (2.8.6) stringio (3.1.1) - strscan (3.1.0) structured_warnings (0.4.0) svg-graph (2.2.2) swd (2.0.3) @@ -1076,39 +1106,42 @@ GEM table_print (1.5.7) terminal-table (3.0.2) unicode-display_width (>= 1.1.1, < 3) - test-prof (1.3.3.1) + test-prof (1.4.2) text-hyphen (1.5.0) - thor (1.3.1) + thor (1.3.2) thread_safe (0.3.6) timecop (0.9.10) timeout (0.4.1) - tpm-key_attestation (0.12.0) + tpm-key_attestation (0.12.1) bindata (~> 2.4) openssl (> 2.0) openssl-signature_algorithm (~> 1.0) trailblazer-option (0.1.2) ttfunk (1.7.0) - turbo-rails (2.0.5) + turbo-rails (2.0.6) actionpack (>= 6.0.0) activejob (>= 6.0.0) railties (>= 6.0.0) + turbo_power (0.6.2) + turbo-rails (>= 1.3.0) typed_dag (2.0.2) rails (>= 5.0.4) tzinfo (2.0.6) concurrent-ruby (~> 1.0) - tzinfo-data (1.2024.1) + tzinfo-data (1.2024.2) tzinfo (>= 1.0.0) uber (0.1.0) - unicode-display_width (2.5.0) - uri (0.13.0) + unicode-display_width (2.6.0) + uri (0.13.1) validate_email (0.1.6) activemodel (>= 3.0) mail (>= 2.2.5) validate_url (1.0.15) activemodel (>= 3.0.0) public_suffix - vcr (6.2.0) - view_component (3.12.1) + vcr (6.3.1) + base64 + view_component (3.14.0) activesupport (>= 5.2.0, < 8.0) concurrent-ruby (~> 1.0) method_source (~> 1.0) @@ -1138,7 +1171,7 @@ GEM crack (>= 0.3.2) hashdiff (>= 0.4.0, < 2.0.0) webrick (1.8.1) - websocket (1.2.10) + websocket (1.2.11) websocket-driver (0.7.6) websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) @@ -1148,8 +1181,8 @@ GEM zeitwerk (>= 2.6) xpath (3.2.0) nokogiri (~> 1.8) - yard (0.9.36) - zeitwerk (2.6.16) + yard (0.9.37) + zeitwerk (2.6.18) PLATFORMS ruby @@ -1164,15 +1197,15 @@ DEPENDENCIES acts_as_tree (~> 2.9.0) addressable (~> 2.8.0) airbrake (~> 13.0.0) - appsignal (~> 3.8.1) + appsignal (~> 3.10.0) auto_strip_attributes (~> 2.5) - awesome_nested_set (~> 3.6.0) + awesome_nested_set (~> 3.7.0) aws-sdk-core (~> 3.107) aws-sdk-s3 (~> 1.91) axe-core-rspec bcrypt (~> 3.1.6) bootsnap (~> 1.18.0) - brakeman (~> 6.1.0) + brakeman (~> 6.2.0) browser (~> 6.0.0) budgets! capybara (~> 3.40.0) @@ -1197,14 +1230,16 @@ DEPENDENCIES disposable (~> 0.6.2) doorkeeper (~> 5.7.0) dotenv-rails + dry-auto_inject dry-container dry-monads + dry-validation email_validator (~> 2.2.3) equivalent-xml (~> 0.6) erb_lint erblint-github escape_utils (~> 1.3) - factory_bot (~> 6.4.0) + factory_bot (~> 6.5.0) factory_bot_rails (~> 6.4.0) ffi (~> 1.15) flamegraph @@ -1236,8 +1271,8 @@ DEPENDENCIES markly (~> 0.10) matrix (~> 0.4.2) md_to_pdf! - meta-tags (~> 2.21.0) - mini_magick (~> 4.13.0) + meta-tags (~> 2.22.0) + mini_magick (~> 5.0.1) multi_json (~> 1.15.0) my_page! net-ldap (~> 0.19.0) @@ -1263,10 +1298,10 @@ DEPENDENCIES openproject-job_status! openproject-ldap_groups! openproject-meeting! - openproject-octicons (~> 19.15.0) - openproject-octicons_helper (~> 19.15.0) + openproject-octicons (~> 19.18.0) + openproject-octicons_helper (~> 19.18.0) openproject-openid_connect! - openproject-primer_view_components (~> 0.36.0) + openproject-primer_view_components (~> 0.47.0) openproject-recaptcha! openproject-reporting! openproject-storages! @@ -1300,6 +1335,7 @@ DEPENDENCIES rails (~> 7.1.3) rails-controller-testing (~> 1.0.2) rails-i18n (~> 7.0.0) + rbtrace rdoc (>= 2.4.2) redis (~> 5.2.0) request_store (~> 1.7.0) @@ -1309,7 +1345,7 @@ DEPENDENCIES roar (~> 1.2.0) rouge (~> 4.3.0) rspec (~> 3.13.0) - rspec-rails (~> 6.1.0) + rspec-rails (~> 7.0.0) rspec-retry (~> 0.6.1) rubocop rubocop-capybara @@ -1322,7 +1358,7 @@ DEPENDENCIES ruby-duration (~> 3.2.0) ruby-prof ruby-progressbar (~> 1.13.0) - rubytree (~> 2.0.0) + rubytree (~> 2.1.0) sanitize (~> 6.1.0) secure_headers (~> 6.5.0) selenium-devtools @@ -1342,10 +1378,11 @@ DEPENDENCIES svg-graph (~> 2.2.0) sys-filesystem (~> 1.5.0) table_print (~> 1.5.6) - test-prof (~> 1.3.0) + test-prof (~> 1.4.0) timecop (~> 0.9.0) ttfunk (~> 1.7.0) turbo-rails (~> 2.0.0) + turbo_power (~> 0.6.2) turbo_tests! typed_dag (~> 2.0.2) tzinfo-data (~> 1.2024.1) @@ -1359,7 +1396,7 @@ DEPENDENCIES with_advisory_lock (~> 5.1.0) RUBY VERSION - ruby 3.3.3p89 + ruby 3.3.4p94 BUNDLED WITH 2.5.13 diff --git a/Guardfile b/Guardfile index 83e8583758b..4d787422605 100644 --- a/Guardfile +++ b/Guardfile @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/Rakefile b/Rakefile index 30e586c3e06..829f4601de6 100755 --- a/Rakefile +++ b/Rakefile @@ -1,7 +1,7 @@ #!/usr/bin/env rake #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/assets/images/enterprise/attribute-help-texts.png b/app/assets/images/enterprise/attribute-help-texts.png deleted file mode 100644 index 58fa216c7a9..00000000000 Binary files a/app/assets/images/enterprise/attribute-help-texts.png and /dev/null differ diff --git a/app/assets/images/installation_alerts.svg b/app/assets/images/installation_alerts.svg index bcd280fda89..836f8650ae1 100644 --- a/app/assets/images/installation_alerts.svg +++ b/app/assets/images/installation_alerts.svg @@ -1,148 +1,16 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + diff --git a/app/assets/images/professional_support.svg b/app/assets/images/professional_support.svg new file mode 100644 index 00000000000..176f092f0b5 --- /dev/null +++ b/app/assets/images/professional_support.svg @@ -0,0 +1,31 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/security_alerts.jpg b/app/assets/images/security_alerts.jpg deleted file mode 100644 index fc3b6f1b877..00000000000 Binary files a/app/assets/images/security_alerts.jpg and /dev/null differ diff --git a/app/assets/images/security_alerts.svg b/app/assets/images/security_alerts.svg new file mode 100644 index 00000000000..85eb34b8b54 --- /dev/null +++ b/app/assets/images/security_alerts.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/app/assets/images/system_maintenance.jpg b/app/assets/images/system_maintenance.jpg deleted file mode 100644 index f0b1155d91a..00000000000 Binary files a/app/assets/images/system_maintenance.jpg and /dev/null differ diff --git a/app/components/_index.sass b/app/components/_index.sass index a05d3e6b1e6..d20f0a29e39 100644 --- a/app/components/_index.sass +++ b/app/components/_index.sass @@ -1,7 +1,11 @@ @import "shares/modal_body_component" @import "shares/invite_user_form_component" +@import "work_packages/details/tab_component" @import "work_packages/progress/modal_body_component" +@import "work_packages/split_view_component" @import "open_project/common/attribute_component" +@import "open_project/common/submenu_component" @import "filter/filters_component" @import "projects/row_component" -@import "settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component" +@import "op_primer/border_box_table_component" +@import "work_packages/exports/modal_dialog_component" diff --git a/app/components/activities/days_component.html.erb b/app/components/activities/days_component.html.erb index c0fd1098bf5..ced326e3a91 100644 --- a/app/components/activities/days_component.html.erb +++ b/app/components/activities/days_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/activities/days_component.rb b/app/components/activities/days_component.rb index fe76971cb6c..cdd9303991e 100644 --- a/app/components/activities/days_component.rb +++ b/app/components/activities/days_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/activities/item_component.html.erb b/app/components/activities/item_component.html.erb index 5237f1ba1f9..540337fc93d 100644 --- a/app/components/activities/item_component.html.erb +++ b/app/components/activities/item_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/activities/item_component.rb b/app/components/activities/item_component.rb index 485b46ae02d..2b95b2d0107 100644 --- a/app/components/activities/item_component.rb +++ b/app/components/activities/item_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/activities/item_subtitle_component.html.erb b/app/components/activities/item_subtitle_component.html.erb index 2b9edbce4e7..05b60d4a1af 100644 --- a/app/components/activities/item_subtitle_component.html.erb +++ b/app/components/activities/item_subtitle_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/activities/item_subtitle_component.rb b/app/components/activities/item_subtitle_component.rb index f27954e1cd3..81de3fd04be 100644 --- a/app/components/activities/item_subtitle_component.rb +++ b/app/components/activities/item_subtitle_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/add_button_component.rb b/app/components/add_button_component.rb index 956d16c5fec..a2b91bc9206 100644 --- a/app/components/add_button_component.rb +++ b/app/components/add_button_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/admin/attachments_settings_header_component.html.erb b/app/components/admin/attachments_settings_header_component.html.erb index 9374b9a49ad..a264231f9aa 100644 --- a/app/components/admin/attachments_settings_header_component.html.erb +++ b/app/components/admin/attachments_settings_header_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -29,7 +29,7 @@ See COPYRIGHT and LICENSE files for more details. <% helpers.html_title t(:label_administration), @title %> -<%= render(Primer::OpenProject::PageHeader.new(border_bottom: 0)) do |header| +<%= render(Primer::OpenProject::PageHeader.new) do |header| header.with_title { t(:"attributes.attachments") } header.with_breadcrumbs([{ href: admin_index_path, text: t("label_administration") }, { href: admin_settings_storages_path, text: t("project_module_storages") }, diff --git a/app/components/admin/attachments_settings_header_component.rb b/app/components/admin/attachments_settings_header_component.rb index 88d13b0c180..af967d00555 100644 --- a/app/components/admin/attachments_settings_header_component.rb +++ b/app/components/admin/attachments_settings_header_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/admin/backups/show_page_header_component.html.erb b/app/components/admin/backups/show_page_header_component.html.erb new file mode 100644 index 00000000000..4b1ddcd8bca --- /dev/null +++ b/app/components/admin/backups/show_page_header_component.html.erb @@ -0,0 +1,65 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { t(:label_backup) } + header.with_breadcrumbs([{ href: admin_index_path, text: t(:label_administration) }, + t(:label_backup)]) + + header.with_action_button(tag: :a, + scheme: button_scheme, + mobile_label: button_title, + mobile_icon: button_icon, + size: :medium, + href: reset_token_admin_backups_path, + aria: { label: button_title }, + title: button_title) do |button| + button.with_leading_visual_icon(icon: button_icon) + button_title + end + + if @backup_token.present? + header.with_action_button(tag: :a, + scheme: :danger, + mobile_icon: :trash, + mobile_label: t("backup.label_delete_token"), + size: :medium, + href: delete_token_admin_backups_path, + aria: { label: I18n.t("backup.label_delete_token") }, + data: { + confirm: I18n.t(:text_are_you_sure), + method: :post + }, + title: I18n.t(:button_delete)) do |button| + button.with_leading_visual_icon(icon: :trash) + t("backup.label_delete_token") + end + end + end +%> diff --git a/app/components/admin/backups/show_page_header_component.rb b/app/components/admin/backups/show_page_header_component.rb new file mode 100644 index 00000000000..3b7dc6f70b9 --- /dev/null +++ b/app/components/admin/backups/show_page_header_component.rb @@ -0,0 +1,61 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Admin + module Backups + class ShowPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + + def initialize(backup_token:) + super + @backup_token = backup_token + end + + def breadcrumb_items + [{ href: admin_index_path, text: t(:label_administration) }, + t(:label_backup)] + end + + def button_title + button_action = @backup_token.present? ? "reset" : "create" + t("backup.label_#{button_action}_token") + end + + def button_icon + @backup_token.present? ? :"op-reload" : :plus + end + + def button_scheme + @backup_token.present? ? :default : :primary + end + end + end +end diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_form_component.html.erb b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.html.erb similarity index 82% rename from app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_form_component.html.erb rename to app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.html.erb index eaf048dfd0f..a7596230ea1 100644 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_form_component.html.erb +++ b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -30,20 +30,20 @@ See COPYRIGHT and LICENSE files for more details. <%= component_wrapper do primer_form_with( - class: "op-new-project-mapping-form", - model: @project_mapping, - url: link_admin_settings_project_custom_field_path(@project_custom_field), + model: , + url:, data: { turbo: true }, method: :post ) do |form| concat(render(Primer::Alpha::Dialog::Body.new( - id: DIALOG_BODY_ID, test_selector: DIALOG_BODY_ID, aria: { label: title }, + id: dialog_body_id, test_selector: dialog_body_id, aria: { label: title }, style: "min-height: 300px" )) do - render(Projects::CustomFields::CustomFieldMappingForm.new(form, project_mapping: @project_mapping)) + render(Projects::CustomFields::CustomFieldMappingForm.new(form, project_mapping: @custom_field_project_mapping)) end) + concat(render(Primer::Alpha::Dialog::Footer.new(show_divider: false)) do - concat(render(Primer::ButtonComponent.new(data: { 'close-dialog-id': DIALOG_ID })) { cancel_button_text }) + concat(render(Primer::ButtonComponent.new(data: { 'close-dialog-id': dialog_id })) { cancel_button_text }) concat(render(Primer::ButtonComponent.new(scheme: :primary, type: :submit)) { submit_button_text }) end) end diff --git a/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.rb b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.rb new file mode 100644 index 00000000000..647e2fec7ac --- /dev/null +++ b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_form_modal_component.rb @@ -0,0 +1,70 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Admin + module CustomFields + module CustomFieldProjects + class NewCustomFieldProjectsFormModalComponent < ApplicationComponent + include OpTurbo::Streamable + + DIALOG_ID = "new-custom-field-projects-modal".freeze + DIALOG_BODY_ID = "new-custom-field-projects-modal-body".freeze + + def initialize(custom_field_project_mapping:, custom_field:, **) + @custom_field_project_mapping = custom_field_project_mapping + @custom_field = custom_field + + super(@custom_field_project_mapping, **) + end + + private + + def url + url_helpers.custom_field_projects_path(@custom_field) + end + + def dialog_id = DIALOG_ID + def dialog_body_id = DIALOG_BODY_ID + + attr_reader :custom_field_project_mapping, :custom_field + + def title + I18n.t(:label_add_projects) + end + + def cancel_button_text + I18n.t("button_cancel") + end + + def submit_button_text + I18n.t("button_add") + end + end + end + end +end diff --git a/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_modal_component.html.erb b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_modal_component.html.erb new file mode 100644 index 00000000000..346ef80311d --- /dev/null +++ b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_modal_component.html.erb @@ -0,0 +1,18 @@ +<%= + render( + Primer::Alpha::Dialog.new( + id: dialog_id, + title:, + test_selector: dialog_id, + size: :large + ) + ) do |dialog| + dialog.with_header( + show_divider: false, + visually_hide_title: false, + variant: :large + ) + + render(form_modal_component) + end +%> diff --git a/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_modal_component.rb b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_modal_component.rb new file mode 100644 index 00000000000..e264b251323 --- /dev/null +++ b/app/components/admin/custom_fields/custom_field_projects/new_custom_field_projects_modal_component.rb @@ -0,0 +1,64 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Admin + module CustomFields + module CustomFieldProjects + class NewCustomFieldProjectsModalComponent < ApplicationComponent + include OpTurbo::Streamable + + def initialize(custom_field_project_mapping:, custom_field:, **) + @custom_field_project_mapping = custom_field_project_mapping + @custom_field = custom_field + super(@custom_field_project_mapping, **) + end + + def render? + !custom_field.is_for_all? + end + + private + + attr_reader :custom_field_project_mapping, :custom_field + + def dialog_id = NewCustomFieldProjectsFormModalComponent::DIALOG_ID + def dialog_body_id = NewCustomFieldProjectsFormModalComponent::DIALOG_BODY_ID + + def title + I18n.t(:label_add_projects) + end + + def form_modal_component + Admin::CustomFields::CustomFieldProjects::NewCustomFieldProjectsFormModalComponent.new( + custom_field_project_mapping:, custom_field: + ) + end + end + end + end +end diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/row_component.html.erb b/app/components/admin/custom_fields/custom_field_projects/row_component.html.erb similarity index 97% rename from app/components/settings/project_custom_fields/project_custom_field_mapping/row_component.html.erb rename to app/components/admin/custom_fields/custom_field_projects/row_component.html.erb index 097b38764a0..cf694aa0c31 100644 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/row_component.html.erb +++ b/app/components/admin/custom_fields/custom_field_projects/row_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/admin/custom_fields/custom_field_projects/row_component.rb b/app/components/admin/custom_fields/custom_field_projects/row_component.rb new file mode 100644 index 00000000000..fe94c8e9f65 --- /dev/null +++ b/app/components/admin/custom_fields/custom_field_projects/row_component.rb @@ -0,0 +1,45 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Admin + module CustomFields + module CustomFieldProjects + class RowComponent < Projects::RowComponent + include OpTurbo::Streamable + + def wrapper_uniq_by + "project-#{project.id}" + end + + def more_menu_items + [] + end + end + end + end +end diff --git a/app/components/admin/custom_fields/custom_field_projects/table_component.rb b/app/components/admin/custom_fields/custom_field_projects/table_component.rb new file mode 100644 index 00000000000..9ef7650dab1 --- /dev/null +++ b/app/components/admin/custom_fields/custom_field_projects/table_component.rb @@ -0,0 +1,62 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Admin + module CustomFields + module CustomFieldProjects + class TableComponent < Projects::TableComponent + include OpTurbo::Streamable + + def columns + @columns ||= query.selects.reject { |select| select.is_a?(Queries::Selects::NotExistingSelect) } + end + + def sortable? + false + end + + # @override optional_pagination_options are passed to the pagination_options + # which are passed to #pagination_links_full in pagination_helper.rb + # + # In Turbo streamable components, we need to be able to specify the url_for(action:) so that links are + # generated in the context of the component index action, instead of any turbo stream actions performing + # partial updates on the page. + # + # params[:url_for_action] is passed to the pagination_options making it's way down to any pagination links + # that are generated via link_to which calls url_for which uses the params[:url_for_action] to specify + # the controller action that link_to should use. + # + def optional_pagination_options + return super unless params[:url_for_action] + + super.merge(params: { action: params[:url_for_action] }) + end + end + end + end +end diff --git a/app/components/admin/custom_fields/edit_form_header_component.html.erb b/app/components/admin/custom_fields/edit_form_header_component.html.erb new file mode 100644 index 00000000000..140535ca0d4 --- /dev/null +++ b/app/components/admin/custom_fields/edit_form_header_component.html.erb @@ -0,0 +1,52 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render(Primer::OpenProject::PageHeader.new(test_selector: "custom-fields--page-header")) do |header| + header.with_title { @custom_field.name } + + header.with_breadcrumbs(breadcrumbs_items) + + header.with_tab_nav(label: nil, test_selector: :custom_field_detail_header) do |tab_nav| + tab_nav.with_tab( + selected: tab_selected?(:edit), + href: edit_custom_field_path(@custom_field) + ) do |tab| + tab.with_text { t(:label_details) } + end + + tab_nav.with_tab( + selected: tab_selected?(:custom_field_projects), + href: custom_field_projects_path(@custom_field) + ) do |tab| + tab.with_text { t(:label_project_plural) } + end + end + end +%> diff --git a/app/components/admin/custom_fields/edit_form_header_component.rb b/app/components/admin/custom_fields/edit_form_header_component.rb new file mode 100644 index 00000000000..c64d79dc8c5 --- /dev/null +++ b/app/components/admin/custom_fields/edit_form_header_component.rb @@ -0,0 +1,57 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Admin + module CustomFields + class EditFormHeaderComponent < ApplicationComponent + TAB_NAVS = %i[ + edit + custom_field_projects + ].freeze + + def initialize(custom_field:, selected:, **) + @custom_field = custom_field + @selected = selected + super(custom_field, **) + end + + def tab_selected?(tab_name) + TAB_NAVS.include?(tab_name) && tab_name == @selected + end + + private + + def breadcrumbs_items + [{ href: admin_index_path, text: t(:label_administration) }, + { href: custom_fields_path, text: t(:label_custom_field_plural) }, + { href: custom_fields_path(tab: @custom_field.type), text: I18n.t(@custom_field.type_name) }, + @custom_field.name] + end + end + end +end diff --git a/app/components/admin/quarantined_attachments/row_component.rb b/app/components/admin/quarantined_attachments/row_component.rb index 0af393a4b4d..5d83c4926be 100644 --- a/app/components/admin/quarantined_attachments/row_component.rb +++ b/app/components/admin/quarantined_attachments/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/admin/quarantined_attachments/table_component.rb b/app/components/admin/quarantined_attachments/table_component.rb index 7ea4e52020f..a05f3617087 100644 --- a/app/components/admin/quarantined_attachments/table_component.rb +++ b/app/components/admin/quarantined_attachments/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/application_component.rb b/app/components/application_component.rb index e603d119458..53dc6caf507 100644 --- a/app/components/application_component.rb +++ b/app/components/application_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/attribute_groups/attribute_group_component.html.erb b/app/components/attribute_groups/attribute_group_component.html.erb index 36c6ad38aa4..f539a04a85b 100644 --- a/app/components/attribute_groups/attribute_group_component.html.erb +++ b/app/components/attribute_groups/attribute_group_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/attribute_groups/attribute_group_component.rb b/app/components/attribute_groups/attribute_group_component.rb index ec401d6d7ca..df5e418a729 100644 --- a/app/components/attribute_groups/attribute_group_component.rb +++ b/app/components/attribute_groups/attribute_group_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/attribute_groups/attribute_group_header_component.html.erb b/app/components/attribute_groups/attribute_group_header_component.html.erb index b93babe89bd..720bc5fad9c 100644 --- a/app/components/attribute_groups/attribute_group_header_component.html.erb +++ b/app/components/attribute_groups/attribute_group_header_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/attribute_groups/attribute_group_header_component.rb b/app/components/attribute_groups/attribute_group_header_component.rb index dc74e61d38a..ae2d8299430 100644 --- a/app/components/attribute_groups/attribute_group_header_component.rb +++ b/app/components/attribute_groups/attribute_group_header_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/attribute_groups/attribute_key_value_component.html.erb b/app/components/attribute_groups/attribute_key_value_component.html.erb index a36d9c5defd..2bbbfc1a62a 100644 --- a/app/components/attribute_groups/attribute_key_value_component.html.erb +++ b/app/components/attribute_groups/attribute_key_value_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/attribute_groups/attribute_key_value_component.rb b/app/components/attribute_groups/attribute_key_value_component.rb index f96b6c92cbc..0f98310bb0e 100644 --- a/app/components/attribute_groups/attribute_key_value_component.rb +++ b/app/components/attribute_groups/attribute_key_value_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/views/placeholder_users/_toolbar.html.erb b/app/components/attribute_help_texts/index_page_header_component.html.erb similarity index 68% rename from app/views/placeholder_users/_toolbar.html.erb rename to app/components/attribute_help_texts/index_page_header_component.html.erb index 47de2c2c7ae..602390526de 100644 --- a/app/views/placeholder_users/_toolbar.html.erb +++ b/app/components/attribute_help_texts/index_page_header_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -26,14 +26,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See COPYRIGHT and LICENSE files for more details. ++#%> -<%= breadcrumb_toolbar(@placeholder_user.new_record? ? t(:label_placeholder_user_new) : @placeholder_user.name) do %> - <% unless @placeholder_user.new_record? %> -
  • - <%= link_to placeholder_user_path(@placeholder_user), class: 'button' do %> - <%= op_icon('button--icon icon-user') %> - <%= t(:label_profile) %> - <% end %> -
    • - <%= render partial: 'placeholder_users/toolbar_delete' %> - <% end %> -<% end %> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { I18n.t(:"attribute_help_texts.label_plural") } + header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: :normal) + + header.with_tab_nav(label: nil) do |tab_nav| + @tabs.each do |tab| + tab_nav.with_tab(selected: currently_selected_tab == tab, href: tab[:path]) do |t| + t.with_text { I18n.t(tab[:label]) } + end + end + end if @tabs.present? + end +%> diff --git a/app/components/attribute_help_texts/index_page_header_component.rb b/app/components/attribute_help_texts/index_page_header_component.rb new file mode 100644 index 00000000000..0e0637a472e --- /dev/null +++ b/app/components/attribute_help_texts/index_page_header_component.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +class AttributeHelpTexts::IndexPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + include TabsHelper + + def initialize(tabs: nil) + super + @tabs = tabs + end + + def breadcrumb_items + [{ href: admin_index_path, text: t("label_administration") }, + I18n.t("menus.breadcrumb.nested_element", section_header: t(:"attribute_help_texts.label_plural"), + title: I18n.t(currently_selected_tab[:label].to_s)).html_safe] + end + + def currently_selected_tab + @currently_selected_tab ||= selected_tab(@tabs) + end +end diff --git a/app/components/colors/edit_page_header_component.html.erb b/app/components/colors/edit_page_header_component.html.erb new file mode 100644 index 00000000000..55dde57ac10 --- /dev/null +++ b/app/components/colors/edit_page_header_component.html.erb @@ -0,0 +1,52 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { @color.name } + header.with_breadcrumbs(breadcrumb_items) + + if @color.persisted? + header.with_action_button(tag: :a, + scheme: :danger, + mobile_icon: :trash, + mobile_label: t(:button_delete), + size: :medium, + href: color_path(@color), + aria: { label: I18n.t(:button_delete) }, + data: { + confirm: I18n.t(:text_are_you_sure), + method: :delete + }, + title: I18n.t(:button_delete)) do |button| + button.with_leading_visual_icon(icon: :trash) + t(:button_delete) + end + end + end +%> diff --git a/app/components/colors/edit_page_header_component.rb b/app/components/colors/edit_page_header_component.rb new file mode 100644 index 00000000000..e02859a411e --- /dev/null +++ b/app/components/colors/edit_page_header_component.rb @@ -0,0 +1,49 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Colors + class EditPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + + def initialize(color:) + super + @color = color + end + + def breadcrumb_items + [ + { href: admin_index_path, text: t(:label_administration) }, + { href: colors_path, text: t(:label_color_plural) }, + @color.name + ] + end + end +end diff --git a/app/components/components/on_off_status_component.html.erb b/app/components/components/on_off_status_component.html.erb index 4a805303bbf..4a64e60e31f 100644 --- a/app/components/components/on_off_status_component.html.erb +++ b/app/components/components/on_off_status_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/components/on_off_status_component.rb b/app/components/components/on_off_status_component.rb index 439a23248a7..cc87876539b 100644 --- a/app/components/components/on_off_status_component.rb +++ b/app/components/components/on_off_status_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/concerns/op_turbo/streamable.rb b/app/components/concerns/op_turbo/streamable.rb index 000bdc1088c..dfad026a782 100644 --- a/app/components/concerns/op_turbo/streamable.rb +++ b/app/components/concerns/op_turbo/streamable.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -32,6 +32,8 @@ module OpTurbo class MissingComponentWrapper < StandardError; end # rubocop:enable OpenProject/AddPreviewForViewComponent + INLINE_ACTIONS = %i[dialog flash].freeze + extend ActiveSupport::Concern class_methods do @@ -43,7 +45,7 @@ module OpTurbo included do def render_as_turbo_stream(view_context:, action: :update) case action - when :update, :dialog + when :update, *INLINE_ACTIONS @inner_html_only = true template = render_in(view_context) when :replace @@ -56,7 +58,7 @@ module OpTurbo raise ArgumentError, "Unsupported action #{action}" end - if action != :dialog && !wrapped? + if INLINE_ACTIONS.exclude?(action) && !wrapped? raise MissingComponentWrapper, "Wrap your component in a `component_wrapper` block in order to use turbo-stream methods" end diff --git a/app/components/custom_actions/row_component.rb b/app/components/custom_actions/row_component.rb index a8f2f3586ce..9a51a70d1c1 100644 --- a/app/components/custom_actions/row_component.rb +++ b/app/components/custom_actions/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/custom_actions/table_component.rb b/app/components/custom_actions/table_component.rb index 0c7dfe58fd4..4d5d9bf8709 100644 --- a/app/components/custom_actions/table_component.rb +++ b/app/components/custom_actions/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/views/workflows/_toolbar.html.erb b/app/components/custom_fields/index_page_header_component.html.erb similarity index 67% rename from app/views/workflows/_toolbar.html.erb rename to app/components/custom_fields/index_page_header_component.html.erb index aae1f2430f3..f91e3f13d79 100644 --- a/app/views/workflows/_toolbar.html.erb +++ b/app/components/custom_fields/index_page_header_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -26,18 +26,17 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See COPYRIGHT and LICENSE files for more details. ++#%> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { I18n.t(:label_custom_field_plural) } + header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: :normal) -<%= toolbar title: title do %> -
  • - <%= link_to({ action: 'copy' }, class: 'button') do %> - <%= op_icon('button--icon icon-copy') %> - <%= t(:button_copy) %> - <% end %> -
    • -
  • - <%= link_to({ action: 'show' }, class: 'button') do %> - <%= op_icon('button--icon icon-info1') %> - <%= t(:label_workflow_summary) %> - <% end %> -
    • -<% end %> + header.with_tab_nav(label: nil, test_selector: "custom-fields--tab-nav") do |tab_nav| + @tabs.each do |tab| + tab_nav.with_tab(selected: currently_selected_tab == tab, href: tab[:path]) do |t| + t.with_text { I18n.t(tab[:label]) } + end + end + end if @tabs.present? + end +%> diff --git a/app/components/custom_fields/index_page_header_component.rb b/app/components/custom_fields/index_page_header_component.rb new file mode 100644 index 00000000000..bfefb5b22ec --- /dev/null +++ b/app/components/custom_fields/index_page_header_component.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +class CustomFields::IndexPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + include TabsHelper + + def initialize(tabs: nil) + super + @tabs = tabs + end + + def breadcrumb_items + [{ href: admin_index_path, text: t("label_administration") }, + I18n.t("menus.breadcrumb.nested_element", section_header: t(:label_custom_field_plural), + title: I18n.t(currently_selected_tab[:label].to_s)).html_safe] + end + + def currently_selected_tab + @currently_selected_tab ||= selected_tab(@tabs) + end +end diff --git a/app/components/enumerations/row_component.rb b/app/components/enumerations/row_component.rb index 9c885f3a375..4ba4c7f21dd 100644 --- a/app/components/enumerations/row_component.rb +++ b/app/components/enumerations/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/enumerations/table_component.rb b/app/components/enumerations/table_component.rb index bba8eff05e1..177f8510186 100644 --- a/app/components/enumerations/table_component.rb +++ b/app/components/enumerations/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/filter/filter_button_component.html.erb b/app/components/filter/filter_button_component.html.erb index 2b624db592d..f17a4b500bd 100644 --- a/app/components/filter/filter_button_component.html.erb +++ b/app/components/filter/filter_button_component.html.erb @@ -1,8 +1,10 @@ -<%= render(Primer::Beta::Button.new(scheme: :secondary, +<%= component_wrapper tag: "turbo-frame" do %> + <%= render(Primer::Beta::Button.new(scheme: :secondary, disabled:, data: { "filter--filters-form-target": "filterFormToggle", action: "filter--filters-form#toggleDisplayFilters" }, test_selector: "filter-component-toggle")) do |button| %> - <% button.with_trailing_visual_counter(count: filters_count, test_selector: "filters-button-counter") %> - <%= t(:label_filter) %> + <% button.with_trailing_visual_counter(count: filters_count, test_selector: "filters-button-counter") %> + <%= t(:label_filter) %> + <% end %> <% end %> diff --git a/app/components/filter/filter_button_component.rb b/app/components/filter/filter_button_component.rb index 4df3f77cbba..7b065bde8c7 100644 --- a/app/components/filter/filter_button_component.rb +++ b/app/components/filter/filter_button_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -31,11 +31,17 @@ module Filter # rubocop:disable OpenProject/AddPreviewForViewComponent class FilterButtonComponent < ApplicationComponent # rubocop:enable OpenProject/AddPreviewForViewComponent + include OpTurbo::Streamable + options :query options :disabled def filters_count @filters_count ||= query.filters.count end + + def wrapper_key + "filter-button" + end end end diff --git a/app/components/filter/filter_component.html.erb b/app/components/filter/filter_component.html.erb index 0d4759bebca..00705953975 100644 --- a/app/components/filter/filter_component.html.erb +++ b/app/components/filter/filter_component.html.erb @@ -17,8 +17,8 @@ <% autocomplete_filter = additional_options.key?(:autocomplete_options) %>
    • - <% unless EnterpriseToken.allows_to?(:custom_fields_in_projects_list)%> - <%= - helpers.angular_component_tag 'op-enterprise-banner', - inputs: { - collapsible: true, - textMessage: t('ee.upsale.project_filters.description_html'), - moreInfoLink: OpenProject::Static::Links.links[:enterprise_docs][:custom_field_projects][:href], - } - %> - <% end %> <% end %> diff --git a/app/components/filter/filter_component.rb b/app/components/filter/filter_component.rb index 01f58a5bdf5..6b625627b2d 100644 --- a/app/components/filter/filter_component.rb +++ b/app/components/filter/filter_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -51,7 +51,7 @@ module Filter def allowed_filters query - .available_filters + .available_advanced_filters end protected @@ -65,7 +65,8 @@ module Filter # @return [Hash] the additional attributes for the filter, that will be yielded in the each_filter method def additional_filter_attributes(filter) case filter - when Queries::Filters::Shared::ProjectFilter + when Queries::Filters::Shared::ProjectFilter::Required, + Queries::Filters::Shared::ProjectFilter::Optional { autocomplete_options: { component: "opce-project-autocompleter", diff --git a/app/components/groups/edit_page_header_component.html.erb b/app/components/groups/edit_page_header_component.html.erb new file mode 100644 index 00000000000..62302ef4d8f --- /dev/null +++ b/app/components/groups/edit_page_header_component.html.erb @@ -0,0 +1,71 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { @group.name } + header.with_breadcrumbs(breadcrumb_items) + + header.with_action_button(tag: :a, + mobile_icon: :person, + mobile_label: t(:label_profile), + size: :medium, + href: show_group_path(@group), + aria: { label: I18n.t(:label_profile) }, + title: I18n.t(:label_profile)) do |button| + button.with_leading_visual_icon(icon: :person) + t(:label_profile) + end + + if @current_user.admin? + header.with_action_button(tag: :a, + scheme: :danger, + mobile_icon: :trash, + mobile_label: t(:button_delete), + size: :medium, + href: group_path(@group), + aria: { label: I18n.t(:button_delete) }, + data: { + confirm: t(:text_are_you_sure), + method: :delete, + }, + title: I18n.t(:button_delete)) do |button| + button.with_leading_visual_icon(icon: :trash) + t(:button_delete) + end + end + + header.with_tab_nav(label: nil) do |tab_nav| + @tabs.each do |tab| + tab_nav.with_tab(selected: selected_tab(@tabs) == tab, href: tab[:path]) do |t| + t.with_text { I18n.t("js.#{tab[:label]}") } + end + end + end if @tabs.present? + end +%> diff --git a/app/components/groups/edit_page_header_component.rb b/app/components/groups/edit_page_header_component.rb new file mode 100644 index 00000000000..89e0fbf6a06 --- /dev/null +++ b/app/components/groups/edit_page_header_component.rb @@ -0,0 +1,51 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Groups + class EditPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + include TabsHelper + + def initialize(group:, current_user:, tabs: nil) + super + @group = group + @tabs = tabs + @current_user = current_user + end + + def breadcrumb_items + [{ href: admin_index_path, text: t("label_administration") }, + { href: admin_settings_users_path, text: t(:label_user_and_permission) }, + { href: groups_path, text: t(:label_group_plural) }, + @group.name] + end + end +end diff --git a/app/components/groups/show_page_header_component.html.erb b/app/components/groups/show_page_header_component.html.erb new file mode 100644 index 00000000000..f42886dfed3 --- /dev/null +++ b/app/components/groups/show_page_header_component.html.erb @@ -0,0 +1,64 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title(test_selector: "groups--title") { @group.name } + header.with_breadcrumbs(breadcrumb_items) + + if @current_user.admin? + header.with_action_button(tag: :a, + mobile_icon: :pencil, + mobile_label: t(:button_edit), + size: :medium, + href: edit_group_path(@group), + aria: { label: I18n.t(:button_edit) }, + data: { "test-selector": "groups--edit-group-button" }, + title: I18n.t(:button_edit)) do |button| + button.with_leading_visual_icon(icon: :pencil) + t(:button_edit) + end + + header.with_action_button(tag: :a, + scheme: :danger, + mobile_icon: :trash, + mobile_label: t(:button_delete), + size: :medium, + href: group_path(@group), + aria: { label: I18n.t(:button_delete) }, + data: { + confirm: t(:text_are_you_sure), + method: :delete, + }, + title: I18n.t(:button_delete)) do |button| + button.with_leading_visual_icon(icon: :trash) + t(:button_delete) + end + end + end +%> diff --git a/app/components/groups/show_page_header_component.rb b/app/components/groups/show_page_header_component.rb new file mode 100644 index 00000000000..14a34d03869 --- /dev/null +++ b/app/components/groups/show_page_header_component.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Groups + class ShowPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + + def initialize(group:, current_user:) + super + @group = group + @current_user = current_user + end + + def breadcrumb_items + [{ href: groups_path, text: t(:label_group_plural) }, + @group.name] + end + end +end diff --git a/app/components/individual_principal_base_filter_component.html.erb b/app/components/individual_principal_base_filter_component.html.erb index 265c4a8ad61..4c7b44a7154 100644 --- a/app/components/individual_principal_base_filter_component.html.erb +++ b/app/components/individual_principal_base_filter_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/individual_principal_base_filter_component.rb b/app/components/individual_principal_base_filter_component.rb index b82f9f6bd26..7e1291b6cfe 100644 --- a/app/components/individual_principal_base_filter_component.rb +++ b/app/components/individual_principal_base_filter_component.rb @@ -2,13 +2,13 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/components/ldap_auth_sources/row_component.rb b/app/components/ldap_auth_sources/row_component.rb index 975c87e4625..f1ee95ed1a9 100644 --- a/app/components/ldap_auth_sources/row_component.rb +++ b/app/components/ldap_auth_sources/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/ldap_auth_sources/table_component.rb b/app/components/ldap_auth_sources/table_component.rb index ffbf507c6b3..fd174d9a938 100644 --- a/app/components/ldap_auth_sources/table_component.rb +++ b/app/components/ldap_auth_sources/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/mailer/label_component.html.erb b/app/components/mailer/label_component.html.erb index 6458d760521..dfb09abfc2d 100644 --- a/app/components/mailer/label_component.html.erb +++ b/app/components/mailer/label_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/mailer/label_component.rb b/app/components/mailer/label_component.rb index ac7f62c3285..14ac26f9e4a 100644 --- a/app/components/mailer/label_component.rb +++ b/app/components/mailer/label_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/delete_member_dialog_component.html.erb b/app/components/members/delete_member_dialog_component.html.erb index b64bc38eea4..fa1b200f681 100644 --- a/app/components/members/delete_member_dialog_component.html.erb +++ b/app/components/members/delete_member_dialog_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/delete_member_dialog_component.rb b/app/components/members/delete_member_dialog_component.rb index bb8cf602d9a..881fd94ba33 100644 --- a/app/components/members/delete_member_dialog_component.rb +++ b/app/components/members/delete_member_dialog_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/delete_work_package_shares_dialog_component.html.erb b/app/components/members/delete_work_package_shares_dialog_component.html.erb index ebd80af1a1c..202e3bc69e7 100644 --- a/app/components/members/delete_work_package_shares_dialog_component.html.erb +++ b/app/components/members/delete_work_package_shares_dialog_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/delete_work_package_shares_dialog_component.rb b/app/components/members/delete_work_package_shares_dialog_component.rb index 27cc84d2d37..c651329c92f 100644 --- a/app/components/members/delete_work_package_shares_dialog_component.rb +++ b/app/components/members/delete_work_package_shares_dialog_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/index_page_header_component.rb b/app/components/members/index_page_header_component.rb index 167c97d4ad3..c0df1b1bbd9 100644 --- a/app/components/members/index_page_header_component.rb +++ b/app/components/members/index_page_header_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/index_sub_header_component.rb b/app/components/members/index_sub_header_component.rb index 1ee814e243f..1f4efa876b5 100644 --- a/app/components/members/index_sub_header_component.rb +++ b/app/components/members/index_sub_header_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/role_form_component.html.erb b/app/components/members/role_form_component.html.erb index eb562af91c9..b0b1112f1e7 100644 --- a/app/components/members/role_form_component.html.erb +++ b/app/components/members/role_form_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/role_form_component.rb b/app/components/members/role_form_component.rb index c207c31c03d..ae11149e7db 100644 --- a/app/components/members/role_form_component.rb +++ b/app/components/members/role_form_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/row_component.rb b/app/components/members/row_component.rb index 41b96e6a06b..5820e45f88a 100644 --- a/app/components/members/row_component.rb +++ b/app/components/members/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/table_component.rb b/app/components/members/table_component.rb index 9ab1fc921b0..4b4c4895263 100644 --- a/app/components/members/table_component.rb +++ b/app/components/members/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/members/user_filter_component.rb b/app/components/members/user_filter_component.rb index 0ef24a8de7f..87eee13dd37 100644 --- a/app/components/members/user_filter_component.rb +++ b/app/components/members/user_filter_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/my/access_token/access_token_created_dialog_component.html.erb b/app/components/my/access_token/access_token_created_dialog_component.html.erb new file mode 100644 index 00000000000..cd773f77eda --- /dev/null +++ b/app/components/my/access_token/access_token_created_dialog_component.html.erb @@ -0,0 +1,63 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render(Primer::OpenProject::FeedbackDialog.new( + id:, + title: nil, + size: :large + )) do |dialog| + dialog.with_feedback_message do |message| + message.with_heading(tag: :h2) { I18n.t("my.access_token.create_dialog.header", type: "API") } + end + + dialog.with_additional_content do + flex_layout do |flex| + flex.with_row(mb: 2) do + render(Primer::OpenProject::InputGroup.new) do |input_group| + input_group.with_text_input(name: :openproject_api_access_token, + label: Token::API.model_name.human, + visually_hide_label: false, + value: @token_value) + input_group.with_trailing_action_clipboard_copy_button( + value: @token_value, + aria: { + label: I18n.t('button_copy_to_clipboard') + }) + end + end + flex.with_row do + render(Primer::Alpha::Banner.new(scheme: :warning, icon: :alert)) do + I18n.t("my.access_token.create_dialog.warning") + end + end + end + end + end +%> diff --git a/app/components/my/access_token/access_token_created_dialog_component.rb b/app/components/my/access_token/access_token_created_dialog_component.rb new file mode 100644 index 00000000000..4dce63aade4 --- /dev/null +++ b/app/components/my/access_token/access_token_created_dialog_component.rb @@ -0,0 +1,47 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +# This component renders a dialog with the new access token which the user has to copy. +module My + module AccessToken + class AccessTokenCreatedDialogComponent < ApplicationComponent + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers + + def initialize(token_value:) + super + + @token_value = token_value + end + + def id + "access-token-created-dialog" + end + end + end +end diff --git a/app/components/my/access_token/api/row_component.rb b/app/components/my/access_token/api/row_component.rb new file mode 100644 index 00000000000..70641421e9c --- /dev/null +++ b/app/components/my/access_token/api/row_component.rb @@ -0,0 +1,73 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module My + module AccessToken + module API + class RowComponent < ::RowComponent + def api_token + model + end + + def token_name + if api_token.token_name.nil? + t("my_account.access_tokens.api.static_token_name") + else + api_token.token_name + end + end + + def created_at + helpers.format_time(api_token.created_at) + end + + def expires_on + I18n.t("my_account.access_tokens.indefinite_expiration") + end + + def button_links + [delete_link].compact + end + + def delete_link + link_to "", + { + controller: :my, + action: "revoke_api_key", + token_id: api_token.id + }, + method: :delete, + data: { confirm: t("my_account.access_tokens.simple_revoke_confirmation"), test_selector: "api-token-revoke" }, + class: "icon icon-delete" + end + end + end + end +end diff --git a/app/components/my/access_token/api/table_component.rb b/app/components/my/access_token/api/table_component.rb new file mode 100644 index 00000000000..dc0cd690e53 --- /dev/null +++ b/app/components/my/access_token/api/table_component.rb @@ -0,0 +1,57 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module My + module AccessToken + module API + class TableComponent < ::TableComponent + def initial_sort + %i[id asc] + end + + def sortable? + false + end + + def headers + [ + ["token_name", { caption: I18n.t("attributes.name") }], + ["created_at", { caption: User.human_attribute_name(:created_at) }], + ["expires_on", { caption: I18n.t("my_account.access_tokens.headers.expiration") }] + ] + end + + def columns + headers.map(&:first) + end + end + end + end +end diff --git a/app/components/my/access_token/api_tokens_section_component.html.erb b/app/components/my/access_token/api_tokens_section_component.html.erb new file mode 100644 index 00000000000..cd6206d5638 --- /dev/null +++ b/app/components/my/access_token/api_tokens_section_component.html.erb @@ -0,0 +1,57 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= component_wrapper do %> +
    +
    +
    +

    <%= t("my_account.access_tokens.api.title") %>

    +
    +
    +
    +

    + <%= t("my_account.access_tokens.api.text_hint") %> +

    + <% if Setting.rest_api_enabled? %> + <% if @api_tokens.any? %> + <%= render My::AccessToken::API::TableComponent.new(rows: @api_tokens) %> + <% end %> + <%= render My::AccessToken::NewAccessTokenComponent.new %> + <% else %> +
    + +
    + <% end %> +
    +
    +<% end %> diff --git a/app/components/my/access_token/api_tokens_section_component.rb b/app/components/my/access_token/api_tokens_section_component.rb new file mode 100644 index 00000000000..e6aa64c2835 --- /dev/null +++ b/app/components/my/access_token/api_tokens_section_component.rb @@ -0,0 +1,47 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +# This components renders a dialog to confirm the deletion of a project from a storage. +module My + module AccessToken + class APITokensSectionComponent < ::ApplicationComponent + include OpTurbo::Streamable + include Redmine::I18n + + def initialize(api_tokens:) + super + + @api_tokens = api_tokens + end + + def id + "api-tokens-section-component" + end + end + end +end diff --git a/app/components/my/access_token/new_access_token_component.html.erb b/app/components/my/access_token/new_access_token_component.html.erb index e7eaae379dc..fcda19cf2ea 100644 --- a/app/components/my/access_token/new_access_token_component.html.erb +++ b/app/components/my/access_token/new_access_token_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/my/access_token/new_access_token_component.rb b/app/components/my/access_token/new_access_token_component.rb index 3c80550c9c5..45e15b3a213 100644 --- a/app/components/my/access_token/new_access_token_component.rb +++ b/app/components/my/access_token/new_access_token_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/my/access_token/new_access_token_form.rb b/app/components/my/access_token/new_access_token_form.rb index 93d78649488..398e481a363 100644 --- a/app/components/my/access_token/new_access_token_form.rb +++ b/app/components/my/access_token/new_access_token_form.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/my/access_token/new_access_token_form_component.html.erb b/app/components/my/access_token/new_access_token_form_component.html.erb index 90c080753f0..e179d484ec2 100644 --- a/app/components/my/access_token/new_access_token_form_component.html.erb +++ b/app/components/my/access_token/new_access_token_form_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/my/access_token/new_access_token_form_component.rb b/app/components/my/access_token/new_access_token_form_component.rb index d6b8a91ebd6..8a38ec8aac5 100644 --- a/app/components/my/access_token/new_access_token_form_component.rb +++ b/app/components/my/access_token/new_access_token_form_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/notifications/index_page_header_component.html.erb b/app/components/notifications/index_page_header_component.html.erb new file mode 100644 index 00000000000..2c56ef78df3 --- /dev/null +++ b/app/components/notifications/index_page_header_component.html.erb @@ -0,0 +1,15 @@ +<%= render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { page_title } + header.with_breadcrumbs(breadcrumb_items) + + header.with_action_button(tag: :a, + mobile_icon: :gear, + mobile_label: I18n.t(:label_setting_plural), + href: my_notifications_path, + size: :medium, + target: "_blank", + aria: { label: I18n.t("js.notifications.settings.title") }) do |button| + button.with_leading_visual_icon(icon: :gear) + I18n.t(:label_setting_plural) + end +end %> diff --git a/app/components/notifications/index_page_header_component.rb b/app/components/notifications/index_page_header_component.rb new file mode 100644 index 00000000000..2589da0ccec --- /dev/null +++ b/app/components/notifications/index_page_header_component.rb @@ -0,0 +1,53 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2010-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Notifications + class IndexPageHeaderComponent < ApplicationComponent + include ApplicationHelper + + def initialize(project: nil) + super + @project = project + end + + def page_title + I18n.t("js.notifications.title") + end + + def breadcrumb_items + [parent_element, + page_title] + end + + def parent_element + { href: home_path, text: I18n.t(:label_home) } + end + end +end diff --git a/app/components/notifications/index_sub_header_component.html.erb b/app/components/notifications/index_sub_header_component.html.erb new file mode 100644 index 00000000000..3554007d2c7 --- /dev/null +++ b/app/components/notifications/index_sub_header_component.html.erb @@ -0,0 +1,25 @@ +<%= render(Primer::OpenProject::SubHeader.new) do |subheader| + subheader.with_filter_component do + render(Primer::Alpha::SegmentedControl.new("aria-label": I18n.t(:label_filter_plural))) do |control| + control.with_item(tag: :a, + href: notifications_path(facet: nil, **current_filters), + label: t("notifications.facets.unread"), + title: t("notifications.facets.unread_title"), + selected: @facet != "all") + control.with_item(tag: :a, + href: notifications_path(facet: "all", **current_filters), + label: t("notifications.facets.all"), + title: t("notifications.facets.all_title"), + selected: @facet == "all") + end + end + + subheader.with_action_button(tag: :a, + href: mark_all_read_notifications_path(**current_filters), + data: { method: :post }, + size: :medium, + aria: { label: I18n.t("js.notifications.center.mark_all_read") }) do |button| + button.with_leading_visual_icon(icon: :'op-read-all') + I18n.t("js.notifications.center.mark_all_read") + end +end %> diff --git a/app/components/notifications/index_sub_header_component.rb b/app/components/notifications/index_sub_header_component.rb new file mode 100644 index 00000000000..6ee231797e4 --- /dev/null +++ b/app/components/notifications/index_sub_header_component.rb @@ -0,0 +1,49 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2010-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Notifications + class IndexSubHeaderComponent < ApplicationComponent + include ApplicationHelper + + attr_reader :facet, :filter_type, :filter_name + + def initialize(project: nil, facet: nil, filter_type: nil, filter_name: nil) + super + @project = project + @facet = facet + @filter_type = filter_type + @filter_name = filter_name + end + + def current_filters + @current_filters ||= { filter: @filter_type, name: @filter_name }.compact + end + end +end diff --git a/app/components/oauth/applications/application_row_component.html.erb b/app/components/oauth/applications/application_row_component.html.erb new file mode 100644 index 00000000000..0a7e9787336 --- /dev/null +++ b/app/components/oauth/applications/application_row_component.html.erb @@ -0,0 +1,43 @@ +<%= + component_wrapper(data: { 'test-selector': "op-admin-oauth--application" }) do + flex_layout(align_items: :center, justify_content: :space_between) do |oauth_application_container| + oauth_application_container.with_column(flex_layout: true) do |application_information| + application_information.with_column(mr: 2) do + render(Primer::Beta::Link.new(href: oauth_application_path(@application), font_weight: :bold)) do + @application.name + end + end + + application_information.with_column(mr: 2) do + render(Primer::Beta::Text.new(font_size: :small, color: :subtle)) do + if @application.builtin? + t("oauth.application.builtin") + else + t(:label_created_by, user: @application.owner) + end + end + end + + unless @application.builtin? + application_information.with_column do + render(Primer::Beta::Label.new) do + @application.confidential? ? t("oauth.application.confidential") : t("oauth.application.non_confidential") + end + end + end + end + + # Actions + oauth_application_container.with_column do + render(Primer::Alpha::ToggleSwitch.new( + src: toggle_oauth_application_path(@application), + csrf_token: form_authenticity_token, + checked: @application.enabled?, + data: { + 'test-selector': "op-admin-oauth--application-enabled-toggle-switch" + } + )) + end + end + end +%> diff --git a/app/components/oauth/applications/application_row_component.rb b/app/components/oauth/applications/application_row_component.rb new file mode 100644 index 00000000000..8ee4387de71 --- /dev/null +++ b/app/components/oauth/applications/application_row_component.rb @@ -0,0 +1,43 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OAuth + module Applications + class ApplicationRowComponent < ApplicationComponent + include ApplicationHelper + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + + def initialize(application:) + @application = application + + super + end + end + end +end diff --git a/app/components/oauth/applications/index_component.html.erb b/app/components/oauth/applications/index_component.html.erb new file mode 100644 index 00000000000..e5f0d0b4bee --- /dev/null +++ b/app/components/oauth/applications/index_component.html.erb @@ -0,0 +1,55 @@ +<%= + component_wrapper do + flex_layout do |index_container| + if OpenProject::FeatureDecisions.built_in_oauth_applications_active? + index_container.with_row do + render(border_box_container(mb: 4, data: { + 'test-selector': "op-admin-oauth--built-in-applications" + })) do |component| + component.with_header(font_weight: :bold) do + render(Primer::Beta::Text.new) do + t("oauth.header.builtin_applications") + end + end + + if @built_in_applications.empty? + component.with_row do + render(Primer::Beta::Text.new(data: { + 'test-selector': "op-admin-oauth--built-in-applications-placeholder" + })) do + t("oauth.empty_application_lists") + end + end + end + + @built_in_applications.each do |application| + component.with_row { render(OAuth::Applications::ApplicationRowComponent.new(application:)) } + end + end + end + end + + index_container.with_row do + render(border_box_container(mb: 4)) do |component| + component.with_header(font_weight: :bold) do + render(Primer::Beta::Text.new) do + t("oauth.header.other_applications") + end + end + + if @other_applications.empty? + component.with_row do + render(Primer::Beta::Text.new(data: { 'test-selector': "op-admin-oauth--applications-placeholder" })) do + t("oauth.empty_application_lists") + end + end + end + + @other_applications.each do |application| + component.with_row { render(OAuth::Applications::ApplicationRowComponent.new(application:)) } + end + end + end + end + end +%> diff --git a/spec/support/pages/notifications/split_screen.rb b/app/components/oauth/applications/index_component.rb similarity index 74% rename from spec/support/pages/notifications/split_screen.rb rename to app/components/oauth/applications/index_component.rb index 0f8c943c0bf..81027eea51f 100644 --- a/spec/support/pages/notifications/split_screen.rb +++ b/app/components/oauth/applications/index_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,17 +26,18 @@ # See COPYRIGHT and LICENSE files for more details. #++ -require "support/pages/page" -require "support/pages/work_packages/split_work_package" +module OAuth + module Applications + class IndexComponent < ApplicationComponent + include ApplicationHelper + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable -module Pages - module Notifications - class SplitScreen < ::Pages::SplitWorkPackage - include ::Components::Autocompleter::NgSelectAutocompleteHelpers + def initialize(oauth_applications:) + @built_in_applications = oauth_applications.select(&:builtin?) + @other_applications = oauth_applications.reject(&:builtin?) - def initialize(work_package, project = nil) super - @selector = ".work-packages--details" end end end diff --git a/app/components/oauth/applications/table_component.rb b/app/components/oauth/applications/table_component.rb deleted file mode 100644 index 144742596aa..00000000000 --- a/app/components/oauth/applications/table_component.rb +++ /dev/null @@ -1,76 +0,0 @@ -# frozen_string_literal: true - -#-- copyright -# OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License version 3. -# -# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2013 Jean-Philippe Lang -# Copyright (C) 2010-2013 the ChiliProject Team -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License -# as published by the Free Software Foundation; either version 2 -# of the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -# -# See COPYRIGHT and LICENSE files for more details. -#++ - -module OAuth - module Applications - class TableComponent < ::TableComponent - class << self - def row_class - ::OAuth::Applications::RowComponent - end - end - - def initial_sort - %i[id asc] - end - - def sortable? - false - end - - def columns - headers.map(&:first) - end - - def inline_create_link - link_to new_oauth_application_path, - aria: { label: t("oauth.application.new") }, - class: "wp-inline-create--add-link", - title: t("oauth.application.new") do - helpers.op_icon("icon icon-add") - end - end - - def empty_row_message - I18n.t :no_results_title_text - end - - def headers - [ - ["name", { caption: ::Doorkeeper::Application.human_attribute_name(:name) }], - ["owner", { caption: ::Doorkeeper::Application.human_attribute_name(:owner) }], - ["client_credentials", { caption: I18n.t("oauth.client_credentials") }], - ["redirect_uri", { caption: ::Doorkeeper::Application.human_attribute_name(:redirect_uri) }], - ["confidential", { caption: ::Doorkeeper::Application.human_attribute_name(:confidential) }] - ] - end - end - end -end diff --git a/app/components/oauth/show_page_header_component.html.erb b/app/components/oauth/show_page_header_component.html.erb new file mode 100644 index 00000000000..8bb3d06627e --- /dev/null +++ b/app/components/oauth/show_page_header_component.html.erb @@ -0,0 +1,64 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render Primer::OpenProject::PageHeader.new do |header| + header.with_title { h(@application.name) } + header.with_breadcrumbs(breadcrumb_items) + + unless @application.builtin? + header.with_action_button(tag: :a, + mobile_icon: :pencil, + mobile_label: t(:button_edit), + size: :medium, + href: edit_oauth_application_path(@application), + aria: { label: I18n.t(:button_edit) }, + title: I18n.t(:button_edit)) do |button| + button.with_leading_visual_icon(icon: :pencil) + t(:button_edit) + end + + header.with_action_button(tag: :a, + scheme: :danger, + mobile_icon: :trash, + mobile_label: t(:button_delete), + size: :medium, + href: oauth_application_path(@application), + aria: { label: I18n.t(:button_delete) }, + data: { + confirm: I18n.t(:text_are_you_sure), + method: :delete + }, + title: I18n.t(:button_delete)) do |button| + button.with_leading_visual_icon(icon: :trash) + t(:button_delete) + end + end + end +%> diff --git a/app/components/oauth/show_page_header_component.rb b/app/components/oauth/show_page_header_component.rb new file mode 100644 index 00000000000..531ff53dfb4 --- /dev/null +++ b/app/components/oauth/show_page_header_component.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class OAuth::ShowPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + + def initialize(application:) + super + @application = application + end + + def breadcrumb_items + [{ href: admin_index_path, text: t(:label_administration) }, + { href: admin_settings_authentication_path, text: t(:label_authentication) }, + { href: oauth_applications_path, text: t("oauth.application.plural") }, + h(@application.name)] + end +end diff --git a/app/views/placeholder_users/_toolbar_delete.html.erb b/app/components/op_primer/border_box_row_component.html.erb similarity index 62% rename from app/views/placeholder_users/_toolbar_delete.html.erb rename to app/components/op_primer/border_box_row_component.html.erb index db90328a763..f2ffcf6ad83 100644 --- a/app/views/placeholder_users/_toolbar_delete.html.erb +++ b/app/components/op_primer/border_box_row_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -27,22 +27,22 @@ See COPYRIGHT and LICENSE files for more details. ++#%> -<% if can_delete_placeholder_user?(@placeholder_user) %> -
  • - <%= link_to deletion_info_placeholder_user_path(@placeholder_user), - class: 'button' do %> - <%= op_icon('button--icon icon-delete') %> - <%= t(:button_delete) %> - <% end %> -
    • -<% else %> -
  • - <%= content_tag :span, title: I18n.t('placeholder_users.right_to_manage_members_missing') do %> - <%= link_to '#', - class: 'button -disabled' do %> - <%= op_icon('button--icon icon-delete') %> - <%= t(:button_delete) %> +<%= + render Primer::BaseComponent.new( + tag: :div, + id: row_css_id, + classes: "#{table.grid_class} #{row_css_class}", + ) do %> + <% columns.each do |column| %> + <%= render(Primer::BaseComponent.new(tag: :div, classes: column_css_class(column), **column_args(column))) { column_value(column) } %> + <% end %> + + <% if table.has_actions? %> + <%= flex_layout(align_items: :center, justify_content: :flex_end) do |flex| %> + <% button_links.each_with_index do |link, i| %> + <% args = i == (button_links.count - 1) ? {} : { mr: 1 } %> + <% flex.with_column(**args) { link } %> <% end %> <% end %> -
    • + <% end %> <% end %> diff --git a/app/components/op_primer/border_box_row_component.rb b/app/components/op_primer/border_box_row_component.rb new file mode 100644 index 00000000000..5c3b2112015 --- /dev/null +++ b/app/components/op_primer/border_box_row_component.rb @@ -0,0 +1,45 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpPrimer + class BorderBoxRowComponent < RowComponent # rubocop:disable OpenProject/AddPreviewForViewComponent + include ComponentHelpers + + def column_args(_column) + {} + end + + def checkmark(condition) + if condition + render(Primer::Beta::Octicon.new(icon: :check)) + end + end + end +end diff --git a/app/components/op_primer/border_box_table_component.html.erb b/app/components/op_primer/border_box_table_component.html.erb new file mode 100644 index 00000000000..6b28c0c49e1 --- /dev/null +++ b/app/components/op_primer/border_box_table_component.html.erb @@ -0,0 +1,53 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render( + border_box_container( + classes: container_class, + test_selector:, + )) do |component| + component.with_header(classes: grid_class, color: :muted) do + headers.each do |name, args| + caption = args.delete(:caption) + concat render(Primer::Beta::Text.new(font_weight: :semibold, **header_args(name))) { caption } + end + + if has_actions? + concat render(Primer::BaseComponent.new(tag: :div)) + end + end + + rows.each do |row| + component.with_row(scheme: :default) do + render(row_class.new(row:, table: self)) + end + end + end +%> diff --git a/modules/storages/app/common/storages/peripherals/storage_interaction/nextcloud/file_ids_query.rb b/app/components/op_primer/border_box_table_component.rb similarity index 70% rename from modules/storages/app/common/storages/peripherals/storage_interaction/nextcloud/file_ids_query.rb rename to app/components/op_primer/border_box_table_component.rb index 0335b6b6126..84f5dee8361 100644 --- a/modules/storages/app/common/storages/peripherals/storage_interaction/nextcloud/file_ids_query.rb +++ b/app/components/op_primer/border_box_table_component.rb @@ -1,6 +1,8 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,24 +28,31 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Storages::Peripherals::StorageInteraction::Nextcloud - class FileIdsQuery - def initialize(storage) - @query = ::Storages::Peripherals::StorageInteraction::Nextcloud::Internal::PropfindQueryLegacy.new(storage) +module OpPrimer + class BorderBoxTableComponent < TableComponent + include ComponentHelpers + + def before_render + raise ArgumentError, "BorderBoxTableComponent cannot be #sortable?" if sortable? + + super end - def self.call(storage:, path:) - new(storage).call(path:) + def header_args(_column) + {} end - def call(path:) - query_params = { - depth: "1", - path:, - props: %w[oc:fileid] - } + # Default grid class with equal weights + def grid_class + "op-border-box-grid" + end - @query.call(**query_params) + def has_actions? + false + end + + def sortable? + false end end end diff --git a/app/components/op_primer/border_box_table_component.sass b/app/components/op_primer/border_box_table_component.sass new file mode 100644 index 00000000000..254c212dffc --- /dev/null +++ b/app/components/op_primer/border_box_table_component.sass @@ -0,0 +1,7 @@ +.op-border-box-grid + display: grid + justify-content: flex-start + align-items: center + // Distribute columns evenly by default + grid-auto-columns: minmax(0, 1fr) + grid-auto-flow: column diff --git a/app/components/op_primer/box_collection_component.html.erb b/app/components/op_primer/box_collection_component.html.erb index bb48bb9b959..7a001ae20a0 100644 --- a/app/components/op_primer/box_collection_component.html.erb +++ b/app/components/op_primer/box_collection_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_primer/box_collection_component.rb b/app/components/op_primer/box_collection_component.rb index 91cc31be24b..5f3dc5b2940 100644 --- a/app/components/op_primer/box_collection_component.rb +++ b/app/components/op_primer/box_collection_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_primer/component_collection_component.html.erb b/app/components/op_primer/component_collection_component.html.erb index 6eda7cd0f6e..634948f2cf2 100644 --- a/app/components/op_primer/component_collection_component.html.erb +++ b/app/components/op_primer/component_collection_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_primer/component_collection_component.rb b/app/components/op_primer/component_collection_component.rb index 7ff21122438..2d1018b2ab2 100644 --- a/app/components/op_primer/component_collection_component.rb +++ b/app/components/op_primer/component_collection_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_primer/component_helpers.rb b/app/components/op_primer/component_helpers.rb index 79a91a46ba0..affe44f5945 100644 --- a/app/components/op_primer/component_helpers.rb +++ b/app/components/op_primer/component_helpers.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_primer/expandable_list_component.html.erb b/app/components/op_primer/expandable_list_component.html.erb index d404045d160..b997e9f6fe5 100644 --- a/app/components/op_primer/expandable_list_component.html.erb +++ b/app/components/op_primer/expandable_list_component.html.erb @@ -1,8 +1,8 @@ <%= component_wrapper(data: wrapper_data_attributes) do if elements.count == 0 - render(Primer::Beta::Text.new(color: :subtle)) { t("label_meeting_no_items") } - elsif elements.count <= @cutoff_limit + render(Primer::Beta::Text.new(color: :subtle)) { t("label_meeting_no_participants") } + elsif @cutoff_limit.nil? || elements.count <= @cutoff_limit flex_layout do |list| elements.each do |item| list.with_row(mt: 1) { item.to_s } @@ -13,26 +13,26 @@ elements.take(@cutoff_limit).each do |item| list.with_row(mt: 1) { item.to_s } end - - list.with_row do - flex_layout do |flex| - flex.with_row(display: :none, data: { 'expandable-list-target': "hiddenElements" }) do - flex_layout do |hidden_user_list| - elements[@cutoff_limit..].each do |item| - hidden_user_list.with_row(mt: 1) { item.to_s } - end - end + list.with_row(display: :none, data: { "expandable-list-target": "hiddenElements" }) do + flex_layout do |hidden_user_list| + elements[@cutoff_limit..].each do |item| + hidden_user_list.with_row(mt: 1) { item.to_s } end - flex.with_row(mt: 1) do + hidden_user_list.with_row(mt: 2) do render(Primer::Beta::Button.new( - scheme: :link, - data: { 'expandable-list-target': "showHideButton", - action: 'click->expandable-list#showhiddenElements keydown.enter->expandable-list#showhiddenElements' - } - )) { I18n.t('label_show_hide_n_items', count: elements.count - @cutoff_limit) } + scheme: :link, + data: { action: "expandable-list#hideElements" } + )) { I18n.t("label_show_less") } end end end + list.with_row(mt: 2) do + render(Primer::Beta::Button.new( + scheme: :link, + data: { "expandable-list-target": "showButton", + action: "expandable-list#showElements" } + )) { I18n.t("label_show_n_more", count: elements.count - @cutoff_limit) } + end end end end diff --git a/app/components/op_primer/expandable_list_component.rb b/app/components/op_primer/expandable_list_component.rb index 9378b0b479a..ead8cdf208a 100644 --- a/app/components/op_primer/expandable_list_component.rb +++ b/app/components/op_primer/expandable_list_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_primer/form_helpers.rb b/app/components/op_primer/form_helpers.rb new file mode 100644 index 00000000000..fb742d2a5d4 --- /dev/null +++ b/app/components/op_primer/form_helpers.rb @@ -0,0 +1,97 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpPrimer + module FormHelpers + # Renders an inline form without needing a dedicated form class. + # + # This method dynamically creates a form class based on the provided block + # and renders it. The form is instantiated with the provided form builder + # which comes from a `primer_form_with` call. + # + # It is meant to avoid boilerplate classes for simple forms. + # + # @example + # primer_form_with(action: :update) do |form_builder| + # render_inline_form(form_builder) do |form| + # form.text_field( + # name: :ultimate_answer, + # label: "Ultimate answer", + # required: true, + # caption: "The answer to life, the universe, and everything" + # ) + # form.submit(name: :submit, label: "Submit") + # end + # end + # + # @param form_builder [Object] The form builder object to be used for the form. + # @param blk [Proc] A block that defines the form structure. + def render_inline_form(form_builder, &blk) + form_class = Class.new(ApplicationForm) do + form(&blk) + end + render(form_class.new(form_builder)) + end + + # Renders an inline settings form without needing a dedicated form class. + # + # This method dynamically creates a form class based on the provided block + # and renders it. The form is instantiated with the provided form builder + # which comes from a `primer_form_with` call, and decorated with the + # `settings_form` method. + # + # The settings form is providing helpers to render settings in a standard + # way by reading their value, rendering labels from their name, and checking + # if they are writable. + # + # It is meant to avoid boilerplate code. + # + # @example + # primer_form_with(action: :update) do |f| + # render_inline_settings_form(f) do |form| + # form.text_field(name: :attachment_max_size) + # form.radio_button_group( + # name: "work_package_done_ratio", + # values: WorkPackage::DONE_RATIO_OPTIONS + # ) + # form.submit + # end + # end + # + # @param form_builder [Object] The form builder object to be used for the form. + # @param blk [Proc] A block that defines the form structure. + def render_inline_settings_form(form_builder, &blk) + form_class = Class.new(ApplicationForm) do + settings_form(&blk) + end + render(form_class.new(form_builder)) + end + end +end diff --git a/app/components/op_primer/relative_time_component.rb b/app/components/op_primer/relative_time_component.rb index 3171ef824cd..109e4df6488 100644 --- a/app/components/op_primer/relative_time_component.rb +++ b/app/components/op_primer/relative_time_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_turbo/frame_component.html.erb b/app/components/op_turbo/frame_component.html.erb index 2d564a06837..fe5c2885888 100644 --- a/app/components/op_turbo/frame_component.html.erb +++ b/app/components/op_turbo/frame_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_turbo/frame_component.rb b/app/components/op_turbo/frame_component.rb index 29eafe07379..b92c1f565db 100644 --- a/app/components/op_turbo/frame_component.rb +++ b/app/components/op_turbo/frame_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_turbo/stream_component.html.erb b/app/components/op_turbo/stream_component.html.erb index 67e4445ee76..bac890e181e 100644 --- a/app/components/op_turbo/stream_component.html.erb +++ b/app/components/op_turbo/stream_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/op_turbo/stream_component.rb b/app/components/op_turbo/stream_component.rb index 1db75dd0138..2fb2ecef982 100644 --- a/app/components/op_turbo/stream_component.rb +++ b/app/components/op_turbo/stream_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/open_project/common/attribute_component.rb b/app/components/open_project/common/attribute_component.rb index 97b38a35e7f..b6ddf5ef662 100644 --- a/app/components/open_project/common/attribute_component.rb +++ b/app/components/open_project/common/attribute_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/open_project/common/divider_component.rb b/app/components/open_project/common/divider_component.rb new file mode 100644 index 00000000000..841af321efe --- /dev/null +++ b/app/components/open_project/common/divider_component.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ +# +module OpenProject + module Common + class DividerComponent < Primer::BaseComponent + def initialize(**system_arguments) + system_arguments[:tag] = :hr + system_arguments[:mt] = system_arguments.fetch(:mt, 3) + system_arguments[:mb] = system_arguments.fetch(:mb, 3) + super(**system_arguments) # rubocop:disable Style/SuperArguments + end + end + end +end diff --git a/app/components/open_project/common/duration_component.rb b/app/components/open_project/common/duration_component.rb index 45bd009080f..bbf2b7a16f3 100644 --- a/app/components/open_project/common/duration_component.rb +++ b/app/components/open_project/common/duration_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/open_project/common/submenu_component.html.erb b/app/components/open_project/common/submenu_component.html.erb index a76df1ea59f..ee79a844bec 100644 --- a/app/components/open_project/common/submenu_component.html.erb +++ b/app/components/open_project/common/submenu_component.html.erb @@ -1,22 +1,22 @@ -
    +
    <% if @searchable %> -
    +
    <%= render Primer::Alpha::TextField.new(name: "search", label: I18n.t("label_search"), - placeholder: I18n.t("label_search"), + placeholder: I18n.t("label_search_by_name"), leading_visual: { icon: :search }, visually_hide_label: true, - classes: "op-sidebar--search-input", + classes: "op-submenu--search-input", data: { action: "input->filter--filter-list#filterLists", "filter--filter-list-target": "filter", - "test-selector": "op-sidebar--search-input" + "test-selector": "op-submenu--search-input" },) %> <%= render Primer::Beta::Text.new(display: :none, - classes: "op-sidebar--search-no-results-container", + classes: "op-submenu--search-no-results-container", data: { - "test-selector": "op-sidebar--search-no-results", + "test-selector": "op-submenu--search-no-results", "filter--filter-list-target": "noResultsText", }) do I18n.t("js.autocompleter.notFoundText") @@ -24,46 +24,70 @@
    <% end %> -
    +
    <% if top_level_sidebar_menu_items.any? %> -
    -
      - <% top_level_sidebar_menu_items.first.children.each do |menu_item| %> -
    • - <% selected = menu_item.selected ? 'selected' : '' %> - - <%= menu_item.title %> - -
      • - <% end %> -
    -
    + <% end %> <% nested_sidebar_menu_items.each do |menu_item| %> -
    - -
    <% if @create_btn_options.present? %> -
    +
    <%= render Primer::Beta::Button.new(scheme: :primary, tag: :a, href: @create_btn_options[:href], test_selector: "#{@create_btn_options[:module_key]}--create-button", - classes: "op-sidebar--footer-action") do |button| + classes: "op-submenu--footer-action") do |button| button.with_leading_visual_icon(icon: "plus") if @create_btn_options[:btn_text].present? @create_btn_options[:btn_text] diff --git a/app/components/open_project/common/submenu_component.rb b/app/components/open_project/common/submenu_component.rb index e0cdcf88ea1..5db1ec4816e 100644 --- a/app/components/open_project/common/submenu_component.rb +++ b/app/components/open_project/common/submenu_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/frontend/src/global_styles/content/_sidemenu.sass b/app/components/open_project/common/submenu_component.sass similarity index 61% rename from frontend/src/global_styles/content/_sidemenu.sass rename to app/components/open_project/common/submenu_component.sass index 019ef72b898..75c6649e68c 100644 --- a/frontend/src/global_styles/content/_sidemenu.sass +++ b/app/components/open_project/common/submenu_component.sass @@ -1,4 +1,40 @@ -.op-sidemenu +.op-submenu + height: 100% + display: flex + flex-direction: column + overflow: hidden + + &--search + margin: 12px + color: var(--main-menu-font-color) + display: flex + flex-direction: column + row-gap: 16px + + &--search-input + // Overriding the defult input styles, because of the default dark background of the sidebar + color: var(--main-menu-font-color) !important + border-color: var(--borderColor-muted) !important + + &--body + flex-grow: 1 + overflow: auto + @include styled-scroll-bar + + &:only-child + padding-bottom: 10px + + &--footer + display: grid + text-align: center + padding: 1rem + + @supports (-webkit-touch-callout: none) + padding: 1rem 1rem 5rem + + .button .spot-icon + margin-right: 0.5rem + &--title display: flex justify-content: space-between @@ -46,16 +82,10 @@ padding-left: 12px &--item-title + flex-grow: 1 display: inline-block overflow: hidden text-overflow: ellipsis white-space: nowrap line-height: 30px text-decoration: none - - &--item-icon - font-size: 24px - margin-right: 8px - - &--item-mark - margin-left: 8px diff --git a/app/components/placeholder_users/edit_page_header_component.html.erb b/app/components/placeholder_users/edit_page_header_component.html.erb new file mode 100644 index 00000000000..71e44dd5e5a --- /dev/null +++ b/app/components/placeholder_users/edit_page_header_component.html.erb @@ -0,0 +1,70 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { title } + header.with_breadcrumbs(breadcrumb_items) + + unless new_record? + header.with_action_button(tag: :a, + mobile_icon: :person, + mobile_label: t(:label_profile), + size: :medium, + href: placeholder_user_path(@placeholder_user), + aria: { label: I18n.t(:label_profile) }, + title: I18n.t(:label_profile)) do |button| + button.with_leading_visual_icon(icon: :person) + t(:label_profile) + end + + header.with_action_button(tag: :a, + scheme: :danger, + mobile_icon: :trash, + mobile_label: t(:button_delete), + size: :medium, + disabled: !deletable?, + href: delete_button_href, + aria: { label: I18n.t(:button_delete) }, + data: { "test-selector": "placeholder-user--delete-button" }, + title: delete_button_title) do |button| + button.with_leading_visual_icon(icon: :trash) + t(:button_delete) + end + end + + header.with_tab_nav(label: nil) do |tab_nav| + @tabs.each do |tab| + tab_nav.with_tab(selected: selected_tab(@tabs) == tab, href: tab[:path]) do |t| + t.with_text { I18n.t("js.#{tab[:label]}") } + end + end + end if @tabs.present? + end +%> diff --git a/app/components/placeholder_users/edit_page_header_component.rb b/app/components/placeholder_users/edit_page_header_component.rb new file mode 100644 index 00000000000..756f6efee85 --- /dev/null +++ b/app/components/placeholder_users/edit_page_header_component.rb @@ -0,0 +1,79 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module PlaceholderUsers + class EditPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + include TabsHelper + include PlaceholderUsersHelper + + def initialize(placeholder_user:, tabs: nil) + super + @placeholder_user = placeholder_user + @tabs = tabs + end + + def breadcrumb_items + [{ href: admin_index_path, text: t("label_administration") }, + { href: admin_settings_users_path, text: t(:label_user_and_permission) }, + { href: placeholder_users_path, text: t(:label_placeholder_user_plural) }, + title] + end + + def new_record? + @placeholder_user.new_record? + end + + def title + new_record? ? t(:label_placeholder_user_new) : @placeholder_user.name + end + + def deletable? + can_delete_placeholder_user?(@placeholder_user) + end + + def delete_button_href + if deletable? + deletion_info_placeholder_user_path(@placeholder_user) + else + "#" + end + end + + def delete_button_title + if deletable? + I18n.t(:button_delete) + else + I18n.t("placeholder_users.right_to_manage_members_missing") + end + end + end +end diff --git a/app/components/placeholder_users/placeholder_user_filter_component.rb b/app/components/placeholder_users/placeholder_user_filter_component.rb index a9d999197f9..7188d1b20d8 100644 --- a/app/components/placeholder_users/placeholder_user_filter_component.rb +++ b/app/components/placeholder_users/placeholder_user_filter_component.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/components/placeholder_users/row_component.rb b/app/components/placeholder_users/row_component.rb index e419ddeb435..a3521b287f5 100644 --- a/app/components/placeholder_users/row_component.rb +++ b/app/components/placeholder_users/row_component.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/components/placeholder_users/show_page_header_component.html.erb b/app/components/placeholder_users/show_page_header_component.html.erb new file mode 100644 index 00000000000..2541493523e --- /dev/null +++ b/app/components/placeholder_users/show_page_header_component.html.erb @@ -0,0 +1,62 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { "#{avatar @placeholder_user} #{h(@placeholder_user.name)}".html_safe } + header.with_breadcrumbs(breadcrumb_items) + + if @current_user.allowed_globally?(:manage_placeholder_user) + header.with_action_button(tag: :a, + mobile_icon: :pencil, + mobile_label: t(:button_edit), + size: :medium, + accesskey: accesskey(:edit), + href: edit_placeholder_user_path(@placeholder_user), + aria: { label: I18n.t(:button_edit) }, + title: I18n.t(:button_edit)) do |button| + button.with_leading_visual_icon(icon: :pencil) + t(:button_edit) + end + end + + header.with_action_button(tag: :a, + scheme: :danger, + mobile_icon: :trash, + mobile_label: t(:button_delete), + size: :medium, + disabled: !deletable?, + href: delete_button_href, + aria: { label: I18n.t(:button_delete) }, + data: { "test-selector": "placeholder-user--delete-button" }, + title: delete_button_title) do |button| + button.with_leading_visual_icon(icon: :trash) + t(:button_delete) + end + end +%> diff --git a/app/components/placeholder_users/show_page_header_component.rb b/app/components/placeholder_users/show_page_header_component.rb new file mode 100644 index 00000000000..20489a0b6cb --- /dev/null +++ b/app/components/placeholder_users/show_page_header_component.rb @@ -0,0 +1,71 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module PlaceholderUsers + class ShowPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + include PlaceholderUsersHelper + include AvatarHelper + + def initialize(placeholder_user:, current_user:) + super + @placeholder_user = placeholder_user + @current_user = current_user + end + + def breadcrumb_items + [ + { href: placeholder_user_path, text: t(:label_placeholder_user_plural) }, + @placeholder_user.name + ] + end + + def deletable? + can_delete_placeholder_user?(@placeholder_user) + end + + def delete_button_href + if deletable? + deletion_info_placeholder_user_path(@placeholder_user) + else + "#" + end + end + + def delete_button_title + if deletable? + I18n.t(:button_delete) + else + I18n.t("placeholder_users.right_to_manage_members_missing") + end + end + end +end diff --git a/app/components/placeholder_users/table_component.rb b/app/components/placeholder_users/table_component.rb index cebf3a43a88..d43d368a3c3 100644 --- a/app/components/placeholder_users/table_component.rb +++ b/app/components/placeholder_users/table_component.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/components/projects/configure_view_modal_component.html.erb b/app/components/projects/configure_view_modal_component.html.erb index 6c8ea75bfbe..691908997ac 100644 --- a/app/components/projects/configure_view_modal_component.html.erb +++ b/app/components/projects/configure_view_modal_component.html.erb @@ -10,13 +10,14 @@ <%= primer_form_with( url: projects_path, id: QUERY_FORM_ID, + data: { "turbo-stream" => false }, method: :get ) do |form| %> <% helpers.projects_query_params.except(:columns, :sortBy).each do |name, value| %> <%= hidden_field_tag name, value %> <% end %> <%= render(Primer::Alpha::TabPanels.new(label: "label")) do |tab_panel| %> - <% tab_panel.with_tab(selected: true, id: "tab-selects") do |tab| %> + <% tab_panel.with_tab(selected: true, id: "tab-selects--columns") do |tab| %> <% tab.with_text { I18n.t("label_columns") } %> <% tab.with_panel do %> <%= helpers.angular_component_tag 'opce-draggable-autocompleter', @@ -25,7 +26,9 @@ selected: selected_columns, protected: helpers.protected_projects_columns_options, name: COLUMN_HTML_NAME, - id: 'columns-select', + id: COLUMN_HTML_ID, + dragAreaName: "#{COLUMN_HTML_ID}_dragarea", + formControlId: "#{COLUMN_HTML_ID}_autocompleter", inputLabel: I18n.t(:'queries.configure_view.columns.input_label'), inputPlaceholder: I18n.t(:'queries.configure_view.columns.input_placeholder'), dragAreaLabel: I18n.t(:'queries.configure_view.columns.drag_area_label'), @@ -33,7 +36,7 @@ }%> <% end %> <% end %> - <% tab_panel.with_tab(id: "tab-selects") do |tab| %> + <% tab_panel.with_tab(id: "tab-selects--sorting") do |tab| %> <% tab.with_text { I18n.t("label_sort") }%> <% tab.with_panel do %> <%= render(Queries::SortByComponent.new(query: query, selectable_columns:)) %> diff --git a/app/components/projects/configure_view_modal_component.rb b/app/components/projects/configure_view_modal_component.rb index 8c68d157629..d802e188e9c 100644 --- a/app/components/projects/configure_view_modal_component.rb +++ b/app/components/projects/configure_view_modal_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,9 +29,12 @@ # ++ class Projects::ConfigureViewModalComponent < ApplicationComponent + include OpTurbo::Streamable + MODAL_ID = "op-project-list-configure-dialog" QUERY_FORM_ID = "op-project-list-configure-query-form" COLUMN_HTML_NAME = "columns" + COLUMN_HTML_ID = "columns-select" options :query diff --git a/app/components/projects/delete_list_modal_component.rb b/app/components/projects/delete_list_modal_component.rb index d8ba7523c3a..ef0720edd10 100644 --- a/app/components/projects/delete_list_modal_component.rb +++ b/app/components/projects/delete_list_modal_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,7 +28,9 @@ # See COPYRIGHT and LICENSE files for more details. # ++ -class Projects::DeleteListModalComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent +class Projects::DeleteListModalComponent < ApplicationComponent + include OpTurbo::Streamable + MODAL_ID = "op-project-list-delete-dialog" options :query diff --git a/app/components/projects/disk_usage_information_component.rb b/app/components/projects/disk_usage_information_component.rb index a3cbd00e5ef..c8a18303c79 100644 --- a/app/components/projects/disk_usage_information_component.rb +++ b/app/components/projects/disk_usage_information_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/projects/export_list_modal_component.rb b/app/components/projects/export_list_modal_component.rb index e540403fbd9..28085a486ff 100644 --- a/app/components/projects/export_list_modal_component.rb +++ b/app/components/projects/export_list_modal_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,7 +28,8 @@ # See COPYRIGHT and LICENSE files for more details. # ++ -class Projects::ExportListModalComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent +class Projects::ExportListModalComponent < ApplicationComponent + include OpTurbo::Streamable MODAL_ID = "op-project-list-export-dialog" options :query diff --git a/app/components/projects/index_page_header_component.html.erb b/app/components/projects/index_page_header_component.html.erb index e9a98772215..2d4bdb4e166 100644 --- a/app/components/projects/index_page_header_component.html.erb +++ b/app/components/projects/index_page_header_component.html.erb @@ -1,7 +1,18 @@ -<% if show_state? %> +<%= component_wrapper(tag: 'turbo-frame') do %> <%= - render(Primer::OpenProject::PageHeader.new) do |header| - header.with_title(data: { 'test-selector': 'project-query-name' }) { page_title } + render(Primer::OpenProject::PageHeader.new(state: @state)) do |header| + header.with_title(data: { 'test-selector': 'project-query-name' }) do |title| + title.with_editable_form(model: query, + update_path: @query.new_record? ? project_queries_path(projects_query_params) : project_query_path(@query, projects_query_params), + method: @query.new_record? ? :post : :put, + cancel_path: projects_path(**projects_query_params, **{ query_id: query.id }.compact), + input_name: "name", + label: ProjectQuery.human_attribute_name(:name), + placeholder: I18n.t(:"projects.lists.new.placeholder"), + scope: 'query', + id: 'project-save-form') + page_title + end header.with_breadcrumbs(breadcrumb_items, selected_item_font_weight: current_breadcrumb_element == page_title ? :bold : :normal) if can_save? @@ -28,7 +39,7 @@ icon: "share-android", mobile_icon: "share-android", label: t(:label_share), - data: { controller: "async-dialog" } + data: { controller: "async-dialog", test_selector: "toggle-share-dialog-button" } ) end @@ -89,7 +100,8 @@ menu.with_item( tag: :a, label: t(:label_overall_activity), - href: activities_path + href: activities_path, + content_arguments: { rel: "nofollow" } ) do |item| item.with_leading_visual_icon(icon: 'tasklist') end @@ -112,24 +124,30 @@ end menu.with_item( + tag: :a, label: t('js.label_export'), - content_arguments: { 'data-show-dialog-id': Projects::ExportListModalComponent::MODAL_ID } + href: export_list_modal_projects_path(projects_query_params), + content_arguments: { data: { controller: "async-dialog" }, rel: "nofollow" } ) do |item| item.with_leading_visual_icon(icon: 'sign-out') end menu.with_item( + tag: :a, label: t(:'queries.configure_view.heading'), - content_arguments: { 'data-show-dialog-id': Projects::ConfigureViewModalComponent::MODAL_ID } + href: configure_view_modal_project_queries_path(projects_query_params), + content_arguments: { data: { controller: "async-dialog" }} ) do |item| item.with_leading_visual_icon(icon: :gear) end if query.persisted? menu.with_item( + tag: :a, label: t(:button_delete), scheme: :danger, - content_arguments: { 'data-show-dialog-id': Projects::DeleteListModalComponent::MODAL_ID } + href: destroy_confirmation_modal_project_query_path(query.id), + content_arguments: { data: { controller: "async-dialog" }} ) do |item| item.with_leading_visual_icon(icon: 'trash') end @@ -137,26 +155,4 @@ end end %> - <%= render(Projects::ConfigureViewModalComponent.new(query:)) %> - <%= render(Projects::DeleteListModalComponent.new(query:)) if query.persisted? %> - <%= render(Projects::ExportListModalComponent.new(query:)) %> -<% else %> - <%= - render(Primer::OpenProject::PageHeader.new) do |header| - header.with_title(data: { 'test-selector': 'project-query-name' }) do - primer_form_with(model: query, - url: @query.new_record? ? project_queries_path(projects_query_params) : project_query_path(@query, projects_query_params), - scope: 'query', - id: 'project-save-form') do |f| - render( - Queries::Projects::Form.new( - f, - cancel_url: projects_path(**projects_query_params, **{ query_id: query.id }.compact) - ) - ) - end - end - header.with_breadcrumbs(breadcrumb_items) - end - %> <% end %> diff --git a/app/components/projects/index_page_header_component.rb b/app/components/projects/index_page_header_component.rb index 3754115e832..d11e0064213 100644 --- a/app/components/projects/index_page_header_component.rb +++ b/app/components/projects/index_page_header_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -31,25 +31,36 @@ class Projects::IndexPageHeaderComponent < ApplicationComponent include OpPrimer::ComponentHelpers include Primer::FetchOrFallbackHelper + include OpTurbo::Streamable attr_accessor :current_user, :query, :state, :params - STATE_OPTIONS = %i[show edit rename].freeze + STATE_DEFAULT = :show + STATE_EDIT = :edit delegate :projects_query_params, to: :helpers - def initialize(current_user:, query:, params:, state: :show) + def initialize(current_user:, query:, params:, state: STATE_DEFAULT) super self.current_user = current_user self.query = query - self.state = fetch_or_fallback(STATE_OPTIONS, state) + self.state = case state + when :edit, :rename + STATE_EDIT + else + STATE_DEFAULT + end self.params = params end + def self.wrapper_key + "projects-index-page-header" + end + def gantt_portfolio_query_link generator = ::Projects::GanttQueryGeneratorService.new(gantt_portfolio_project_ids) gantt_index_path query_props: generator.call @@ -59,9 +70,8 @@ class Projects::IndexPageHeaderComponent < ApplicationComponent @gantt_portfolio_project_ids ||= @query .results .where(active: true) - .select(:id) - .uniq .pluck(:id) + .uniq end def page_title @@ -93,7 +103,7 @@ class Projects::IndexPageHeaderComponent < ApplicationComponent end def can_access_shares? - query.persisted? && OpenProject::FeatureDecisions.project_list_sharing_active? + query.persisted? end def can_toggle_favor? = query.persisted? @@ -132,7 +142,8 @@ class Projects::IndexPageHeaderComponent < ApplicationComponent mobile_icon: nil, # Do not show on mobile as it is already part of the menu mobile_label: nil, href:, - data: { method: } + data: { "turbo-stream": true, method: }, + target: "" ) do render( Primer::Beta::Octicon.new( @@ -150,7 +161,7 @@ class Projects::IndexPageHeaderComponent < ApplicationComponent label:, href:, content_arguments: { - data: { method: } + data: { "turbo-stream": true, method: } } ) do |item| item.with_leading_visual_icon(icon: :"op-save") diff --git a/app/components/projects/index_sub_header_component.html.erb b/app/components/projects/index_sub_header_component.html.erb index 82dc0143343..354a7e3b152 100644 --- a/app/components/projects/index_sub_header_component.html.erb +++ b/app/components/projects/index_sub_header_component.html.erb @@ -1,23 +1,33 @@ -<%= render(Primer::OpenProject::SubHeader.new(data: { - controller: "filter--filters-form", - "application-target": "dynamic", - })) do |subheader| - subheader.with_filter_component do - render(Filter::FilterButtonComponent.new(query: @query, disabled: @disable_buttons)) - end +<%= component_wrapper(tag: 'turbo-frame') do %> + <%= render(Primer::OpenProject::SubHeader.new(data: sub_header_data_attributes)) do |subheader| + subheader.with_filter_input(name: "name_and_identifier", + label: t('projects.index.search.label'), + value: filter_input_value, + placeholder: t('projects.index.search.placeholder'), + leading_visual: { + icon: :search, + size: :small + }, + clear_button_id: clear_button_id, + data: filter_input_data_attributes) - subheader.with_action_button(tag: :a, - href: new_project_path, - scheme: :primary, - disabled: @disable_buttons, - size: :medium, - aria: { label: I18n.t(:label_project_new) }, - data: { 'test-selector': 'project-new-button' }) do |button| - button.with_leading_visual_icon(icon: :plus) - Project.model_name.human - end if @current_user.allowed_globally?(:add_project) + subheader.with_filter_component do + render(Projects::ProjectFilterButtonComponent.new(query: @query, disabled: @disable_buttons)) + end - subheader.with_bottom_pane_component(mt: 0) do - render(Projects::ProjectsFiltersComponent.new(query: @query)) - end - end %> + subheader.with_action_button(tag: :a, + href: new_project_path, + scheme: :primary, + disabled: @disable_buttons, + size: :medium, + aria: { label: I18n.t(:label_project_new) }, + data: { 'test-selector': 'project-new-button' }) do |button| + button.with_leading_visual_icon(icon: :plus) + Project.model_name.human + end if @current_user.allowed_globally?(:add_project) + + subheader.with_bottom_pane_component(mt: 0) do + render(Projects::ProjectsFiltersComponent.new(query: @query)) + end + end %> +<% end %> diff --git a/app/components/projects/index_sub_header_component.rb b/app/components/projects/index_sub_header_component.rb index cbd16be7fa4..1daa917a087 100644 --- a/app/components/projects/index_sub_header_component.rb +++ b/app/components/projects/index_sub_header_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -33,6 +33,7 @@ module Projects class IndexSubHeaderComponent < ApplicationComponent # rubocop:enable OpenProject/AddPreviewForViewComponent include ApplicationHelper + include OpTurbo::Streamable def initialize(query:, current_user:, disable_buttons: nil) super @@ -40,5 +41,35 @@ module Projects @current_user = current_user @disable_buttons = disable_buttons end + + def self.wrapper_key + "projects-index-sub-header" + end + + def filter_input_value + @query.find_active_filter(:name_and_identifier)&.values&.first + end + + def sub_header_data_attributes + { + controller: "filter--filters-form", + "application-target": "dynamic", + "filter--filters-form-perform-turbo-requests-value": true, + "filter--filters-form-clear-button-id-value": clear_button_id + } + end + + def filter_input_data_attributes + { + "filter-name": "name_and_identifier", + "filter-type": "string", + "filter-operator": "~", + "filter--filters-form-target": "simpleFilter filterValueContainer simpleValue" + } + end + + def clear_button_id + "project-filters-form-clear-button" + end end end diff --git a/app/components/projects/project_filter_button_component.rb b/app/components/projects/project_filter_button_component.rb new file mode 100644 index 00000000000..0c39c6c83b7 --- /dev/null +++ b/app/components/projects/project_filter_button_component.rb @@ -0,0 +1,39 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ +module Projects + # rubocop:disable OpenProject/AddPreviewForViewComponent + class ProjectFilterButtonComponent < Filter::FilterButtonComponent + # rubocop:enable OpenProject/AddPreviewForViewComponent + + def filters_count + @filters_count ||= query.advanced_filters.count + end + end +end diff --git a/app/components/projects/projects_filters_component.html.erb b/app/components/projects/projects_filters_component.html.erb new file mode 100644 index 00000000000..96cba9e261d --- /dev/null +++ b/app/components/projects/projects_filters_component.html.erb @@ -0,0 +1,109 @@ +<%= form_tag({}, + method: :get, + class: "op-filters-form op-filters-form_top-margin #{show_filters_section? ? "-expanded" : ""}", + data: { + 'filter--filters-form-target': 'filterForm', + action: 'submit->filter--filters-form#sendForm:prevent' + }) do %> + <% operators_without_values = %w[* !* t w] %> +
    + + <%= t(:label_filter_plural) %> +
      + <% each_filter do |filter, filter_active, additional_options| %> + <% filter_boolean = filter.is_a?(Queries::Filters::Shared::BooleanFilter) %> + <% autocomplete_filter = additional_options.key?(:autocomplete_options) %> +
    • + + <% selected_operator = filter.operator || filter.default_operator.symbol %> + <%= content_tag :div, class: "advanced-filters--filter-operator", style: filter_boolean ? 'display:none' : '' do %> + <%= select_tag :operator, + options_from_collection_for_select( + filter.available_operators, + :symbol, + :human_name, + selected_operator), + class: 'advanced-filters--select', + data: { + action: 'change->filter--filters-form#setValueVisibility', + 'filter--filters-form-filter-name-param': filter.name, + 'filter--filters-form-target': 'operator', + 'filter-name': filter.name + } %> + <% end %> + <% value_visibility = operators_without_values.include?(selected_operator) ? 'hidden' : '' %> + <% if autocomplete_filter %> + <%= render partial: 'filters/autocomplete', + locals: { value_visibility: value_visibility, + filter: filter, + autocomplete_options: additional_options[:autocomplete_options] } %> + <% elsif filter_boolean %> + <%= render partial: 'filters/boolean', + locals: { value_visibility: value_visibility, + filter: filter } %> + <% elsif %i(list list_optional list_all).include? filter.type %> + <%= render partial: 'filters/list/input_options', + locals: { value_visibility: value_visibility, + filter: filter } %> + <% elsif [:datetime_past, :date].include? filter.type %> + <%= render partial: 'filters/date/input_options', + locals: { value_visibility: value_visibility, + filter: filter, + selected_operator: selected_operator } %> + <% else %> + <%# All other simple types %> + <%= render partial: 'filters/text', + locals: { value_visibility: value_visibility, + filter: filter } %> + <% end %> +
      + + <%= helpers.op_icon("icon-close advanced-filters--remove-filter-icon", title: I18n.t('js.button_delete')) %> + +
      +
      • + <% end %> +
    • +
    • + + + +
      + <%= select_tag 'add_filter_select', + options_from_collection_for_select( + allowed_filters, + :name, + :human_name, + disabled: query.filters.map(&:name) + ), + prompt: t(:actionview_instancetag_blank_option), + class: 'advanced-filters--select', + focus: "false", + 'aria-invalid': "false", + data: { + 'filter--filters-form-target': 'addFilterSelect', + action: 'change->filter--filters-form#addFilter:prevent' + } %> +
      +
      • +
    +
    +<% end %> diff --git a/app/components/projects/projects_filters_component.rb b/app/components/projects/projects_filters_component.rb index 6f902b19f54..0dbde255ca6 100644 --- a/app/components/projects/projects_filters_component.rb +++ b/app/components/projects/projects_filters_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -37,23 +37,28 @@ class Projects::ProjectsFiltersComponent < Filter::FilterComponent .sort_by(&:human_name) end + def turbo_requests? + true + end + private def allowed_filter?(filter) allowlist = [ + Queries::Filters::Shared::CustomFields::Base, Queries::Projects::Filters::ActiveFilter, - Queries::Projects::Filters::TemplatedFilter, - Queries::Projects::Filters::PublicFilter, - Queries::Projects::Filters::ProjectStatusFilter, - Queries::Projects::Filters::MemberOfFilter, Queries::Projects::Filters::CreatedAtFilter, + Queries::Projects::Filters::FavoredFilter, + Queries::Projects::Filters::IdFilter, Queries::Projects::Filters::LatestActivityAtFilter, + Queries::Projects::Filters::MemberOfFilter, Queries::Projects::Filters::NameAndIdentifierFilter, - Queries::Projects::Filters::TypeFilter, - Queries::Projects::Filters::FavoredFilter + Queries::Projects::Filters::ProjectStatusFilter, + Queries::Projects::Filters::PublicFilter, + Queries::Projects::Filters::TemplatedFilter, + Queries::Projects::Filters::TypeFilter ] - allowlist << Queries::Filters::Shared::CustomFields::Base if EnterpriseToken.allows_to?(:custom_fields_in_projects_list) - allowlist.detect { |clazz| filter.is_a? clazz } + allowlist.any? { |clazz| filter.is_a? clazz } end end diff --git a/app/components/projects/row_component.html.erb b/app/components/projects/row_component.html.erb index 8ed51f18924..20549168b15 100644 --- a/app/components/projects/row_component.html.erb +++ b/app/components/projects/row_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/projects/row_component.rb b/app/components/projects/row_component.rb index d3a8c9b6f32..bcfac8bb6aa 100644 --- a/app/components/projects/row_component.rb +++ b/app/components/projects/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,6 +30,7 @@ module Projects class RowComponent < ::RowComponent delegate :favored_project_ids, to: :table + delegate :identifier, to: :project def project model.first @@ -107,6 +108,10 @@ module Projects number_to_human_size(project.required_disk_space, precision: 2) end + def id + project.id.to_s + end + def name content = content_tag(:i, "", class: "projects-table--hierarchy-icon") @@ -116,7 +121,7 @@ module Projects end content << " " - content << helpers.link_to_project(project, {}, {}, false) + content << helpers.link_to_project(project, {}, { data: { turbo: false } }, false) content end @@ -342,7 +347,8 @@ module Projects scheme: :default, icon: :copy, label: I18n.t(:button_copy), - href: copy_project_path(project) + href: copy_project_path(project), + data: { turbo: false } } end end @@ -353,13 +359,14 @@ module Projects scheme: :danger, icon: :trash, label: I18n.t(:button_delete), - href: confirm_destroy_project_path(project) + href: confirm_destroy_project_path(project), + data: { turbo: false } } end end def user_can_view_project? - User.current.allowed_in_project?(:view_project, project) + User.current.allowed_in_project?(:view_project_attributes, project) end def custom_field_column?(column) diff --git a/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.rb b/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.rb index 3cb77666b6d..0b4e677bd9a 100644 --- a/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.rb +++ b/app/components/projects/settings/project_custom_field_sections/custom_field_row_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/projects/settings/project_custom_field_sections/index_component.rb b/app/components/projects/settings/project_custom_field_sections/index_component.rb index 73219fc542d..25b8a86e8b7 100644 --- a/app/components/projects/settings/project_custom_field_sections/index_component.rb +++ b/app/components/projects/settings/project_custom_field_sections/index_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb index 013625ee165..13014aae6aa 100644 --- a/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb +++ b/app/components/projects/settings/project_custom_field_sections/index_page_header_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/projects/settings/project_custom_field_sections/show_component.rb b/app/components/projects/settings/project_custom_field_sections/show_component.rb index df2b2c634ae..f8f0ad9d506 100644 --- a/app/components/projects/settings/project_custom_field_sections/show_component.rb +++ b/app/components/projects/settings/project_custom_field_sections/show_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/projects/table_component.html.erb b/app/components/projects/table_component.html.erb index ad70487606f..1b16267dd13 100644 --- a/app/components/projects/table_component.html.erb +++ b/app/components/projects/table_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -26,83 +26,83 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See COPYRIGHT and LICENSE files for more details. ++#%> - -
    -
    -
    -
    - > - - <% columns.each do |column| %> - > - <% end %> - - - - - <% columns.each do |column| %> - <% if column.attribute == :hierarchy %> - - <% elsif sortable_column?(column) %> - <%= build_sort_header column.attribute, - order_options(column) %> - <% elsif column.attribute == :favored %> - - <% else %> - +<%= component_wrapper(tag: 'turbo-frame') do %> +
    +
    +
    +
    +
    -
    -
    - <%= content_tag :a, - helpers.op_icon("icon-hierarchy"), - href: href_only_when_not_sort_lft, - class: "spot-link #{deactivate_class_on_lft_sort}", - title: t(:label_sort_by, value: %("#{t(:label_project_hierarchy)}")) %> -
    -
    -     		-
    -
    - - <%= render(Primer::Beta::Octicon.new(icon: "star-fill", color: :subtle, "aria-label": I18n.t(:label_favorite))) %> - -
    -
    -     		-
    -
    - - <%= column.caption %> - -
    -
    -
    > + + <% columns.each do |column| %> + > <% end %> - <% end %> - - - - - <% if rows.empty? %> - - - + + + + + <% columns.each do |column| %> + <% if column.attribute == :hierarchy %> + + <% elsif sortable_column?(column) %> + <%= build_sort_header column.attribute, order_options(column, turbo: true) %> + <% elsif column.attribute == :favored %> + + <% else %> + + <% end %> + <% end %> + + + + + <% if rows.empty? %> + + + + <% end %> + <%= render_collection rows %> + +
    -
    -
    -
    <%= empty_row_message %>
    +
    +
    + <%= content_tag :a, + helpers.op_icon("icon-hierarchy"), + href: href_only_when_not_sort_lft, + class: "spot-link #{deactivate_class_on_lft_sort}", + data: { "turbo-stream": true }, + title: t(:label_sort_by, value: %("#{t(:label_project_hierarchy)}")) %> +
    +
    +     		+
    +
    + + <%= render(Primer::Beta::Octicon.new(icon: "star-fill", color: :subtle, "aria-label": I18n.t(:label_favorite))) %> + +
    +
    +     		+
    +
    + + <%= column.caption %> + +
    +
    +     		+
    +
    +
    <%= empty_row_message %>
    + <% if inline_create_link && show_inline_create %> +
    + <%= inline_create_link %> +
    <% end %> - <%= render_collection rows %> - - - <% if inline_create_link && show_inline_create %> -
    - <%= inline_create_link %> -
    - <% end %> +
    -
    - -<% if paginated? %> - <%= helpers.pagination_links_full model, pagination_options %> + <% if paginated? %> + <%= helpers.pagination_links_full(model, pagination_options) %> + <% end %> <% end %> diff --git a/app/components/projects/table_component.rb b/app/components/projects/table_component.rb index e1244dd6003..751645cd2fb 100644 --- a/app/components/projects/table_component.rb +++ b/app/components/projects/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,6 +30,8 @@ module Projects class TableComponent < ::TableComponent + include OpTurbo::Streamable + options :params # We read collapsed state from params options :current_user # adds this option to those of the base class options :query @@ -47,6 +49,10 @@ module Projects %i[lft asc] end + def self.wrapper_key + "projects-table" + end + def table_id "project-table" end @@ -87,7 +93,10 @@ module Projects end def default_pagination_options - { allowed_params: %i[query_id filters columns sortBy] } + { + allowed_params: %i[query_id filters columns sortBy], + turbo: true + } end def optional_pagination_options @@ -109,10 +118,14 @@ module Projects end end - def order_options(select) - { - caption: select.caption - } + def order_options(select, turbo: false) + options = { caption: select.caption } + + if turbo + options[:data] = { "turbo-stream": true } + end + + options end def sortable_column?(select) diff --git a/app/components/queries/sort_by_component.rb b/app/components/queries/sort_by_component.rb index ec442d5d0ed..c5f2da7638b 100644 --- a/app/components/queries/sort_by_component.rb +++ b/app/components/queries/sort_by_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/queries/sort_by_field_component.rb b/app/components/queries/sort_by_field_component.rb index a482d31078b..b861d0669cb 100644 --- a/app/components/queries/sort_by_field_component.rb +++ b/app/components/queries/sort_by_field_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/row_component.html.erb b/app/components/row_component.html.erb index 8ed51f18924..20549168b15 100644 --- a/app/components/row_component.html.erb +++ b/app/components/row_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/row_component.rb b/app/components/row_component.rb index 2a17c54a822..092ac500996 100644 --- a/app/components/row_component.rb +++ b/app/components/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/numeric_setting_component.html.erb b/app/components/settings/numeric_setting_component.html.erb index 77005c385c0..2ee975c5ff0 100644 --- a/app/components/settings/numeric_setting_component.html.erb +++ b/app/components/settings/numeric_setting_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/numeric_setting_component.rb b/app/components/settings/numeric_setting_component.rb index 0883cfbabbe..d101d5476c2 100644 --- a/app/components/settings/numeric_setting_component.rb +++ b/app/components/settings/numeric_setting_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_field_sections/custom_field_row_component.html.erb b/app/components/settings/project_custom_field_sections/custom_field_row_component.html.erb index 7d87bb1dbc0..00ccbfbce0e 100644 --- a/app/components/settings/project_custom_field_sections/custom_field_row_component.html.erb +++ b/app/components/settings/project_custom_field_sections/custom_field_row_component.html.erb @@ -8,7 +8,6 @@ content_container.with_column(mr: 2) do render(Primer::Beta::Link.new( href: edit_admin_settings_project_custom_field_path(@project_custom_field), - scheme: :primary, underline: false, font_weight: :bold, data: { turbo: "false" } diff --git a/app/components/settings/project_custom_field_sections/custom_field_row_component.rb b/app/components/settings/project_custom_field_sections/custom_field_row_component.rb index 278207c506b..74cade38187 100644 --- a/app/components/settings/project_custom_field_sections/custom_field_row_component.rb +++ b/app/components/settings/project_custom_field_sections/custom_field_row_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_field_sections/dialog_body_form_component.rb b/app/components/settings/project_custom_field_sections/dialog_body_form_component.rb index 1e4243574b4..99bfb123e19 100644 --- a/app/components/settings/project_custom_field_sections/dialog_body_form_component.rb +++ b/app/components/settings/project_custom_field_sections/dialog_body_form_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_field_sections/index_component.rb b/app/components/settings/project_custom_field_sections/index_component.rb index 8693b2a586b..cb9c329a574 100644 --- a/app/components/settings/project_custom_field_sections/index_component.rb +++ b/app/components/settings/project_custom_field_sections/index_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_field_sections/show_component.rb b/app/components/settings/project_custom_field_sections/show_component.rb index cc1af53fa9c..d2e1ee86a50 100644 --- a/app/components/settings/project_custom_field_sections/show_component.rb +++ b/app/components/settings/project_custom_field_sections/show_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_fields/edit_form_header_component.html.erb b/app/components/settings/project_custom_fields/edit_form_header_component.html.erb index d4802f1b25f..808f78a5267 100644 --- a/app/components/settings/project_custom_fields/edit_form_header_component.html.erb +++ b/app/components/settings/project_custom_fields/edit_form_header_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2023 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_fields/edit_form_header_component.rb b/app/components/settings/project_custom_fields/edit_form_header_component.rb index 157bd85c452..451b9f55e8c 100644 --- a/app/components/settings/project_custom_fields/edit_form_header_component.rb +++ b/app/components/settings/project_custom_fields/edit_form_header_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_fields/header_component.rb b/app/components/settings/project_custom_fields/header_component.rb index 7299ecc409a..80ef7e28952 100644 --- a/app/components/settings/project_custom_fields/header_component.rb +++ b/app/components/settings/project_custom_fields/header_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_fields/new_form_header_component.html.erb b/app/components/settings/project_custom_fields/new_form_header_component.html.erb index ab077ccbee2..1b0bcb9ccb5 100644 --- a/app/components/settings/project_custom_fields/new_form_header_component.html.erb +++ b/app/components/settings/project_custom_fields/new_form_header_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2023 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_fields/new_form_header_component.rb b/app/components/settings/project_custom_fields/new_form_header_component.rb index de78e91c9a9..4fe97008843 100644 --- a/app/components/settings/project_custom_fields/new_form_header_component.rb +++ b/app/components/settings/project_custom_fields/new_form_header_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.html.erb b/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.html.erb deleted file mode 100644 index 6fe98a3cdc6..00000000000 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.html.erb +++ /dev/null @@ -1,18 +0,0 @@ -<%= - render( - Primer::Alpha::Dialog.new( - id: Settings::ProjectCustomFields::ProjectCustomFieldMapping::NewProjectMappingFormComponent::DIALOG_ID, - title:, - test_selector: Settings::ProjectCustomFields::ProjectCustomFieldMapping::NewProjectMappingFormComponent::DIALOG_ID, - size: :large - ) - ) do |dialog| - dialog.with_header( - show_divider: false, - visually_hide_title: false, - variant: :large - ) - - render(Settings::ProjectCustomFields::ProjectCustomFieldMapping::NewProjectMappingFormComponent.new(project_mapping: @project_mapping, project_custom_field: @project_custom_field)) - end -%> diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.rb b/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.rb index 6d721c4f0b6..1879fa8776b 100644 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.rb +++ b/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,23 +29,18 @@ module Settings module ProjectCustomFields module ProjectCustomFieldMapping - class NewProjectMappingComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent - include OpTurbo::Streamable - - def initialize(project_mapping:, project_custom_field:, **) - @project_mapping = project_mapping - @project_custom_field = project_custom_field - super(@project_mapping, **) - end - + class NewProjectMappingComponent < Admin::CustomFields::CustomFieldProjects::NewCustomFieldProjectsModalComponent def render? - !@project_custom_field.required? + !custom_field.required? end private - def title - I18n.t(:label_add_projects) + def form_modal_component + Settings::ProjectCustomFields::ProjectCustomFieldMapping::NewProjectMappingFormComponent.new( + custom_field_project_mapping:, + custom_field: + ) end end end diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.sass b/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.sass deleted file mode 100644 index 76511b9c5b3..00000000000 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_component.sass +++ /dev/null @@ -1,8 +0,0 @@ -@import 'helpers' - -.op-new-project-mapping-form - .ng-placeholder - @extend .icon-search - &:before - @include icon-font-common - margin-right: 10px diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_form_component.rb b/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_form_component.rb index 7a9123f455c..806ac8b223d 100644 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_form_component.rb +++ b/app/components/settings/project_custom_fields/project_custom_field_mapping/new_project_mapping_form_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,30 +29,11 @@ module Settings module ProjectCustomFields module ProjectCustomFieldMapping - class NewProjectMappingFormComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent - include OpTurbo::Streamable - - DIALOG_ID = "settings--new-project-custom-field-mapping-component".freeze - DIALOG_BODY_ID = "settings--new-project-custom-field-mapping-body-component".freeze - - def initialize(project_mapping:, project_custom_field:) - super - @project_mapping = project_mapping - @project_custom_field = project_custom_field - end - + class NewProjectMappingFormComponent < Admin::CustomFields::CustomFieldProjects::NewCustomFieldProjectsFormModalComponent private - def title - I18n.t(:label_add_projects) - end - - def cancel_button_text - I18n.t("button_cancel") - end - - def submit_button_text - I18n.t("button_add") + def url + url_helpers.link_admin_settings_project_custom_field_path(@custom_field) end end end diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/row_component.rb b/app/components/settings/project_custom_fields/project_custom_field_mapping/row_component.rb index 3fa86bf6f1e..f785bfd2d76 100644 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/row_component.rb +++ b/app/components/settings/project_custom_fields/project_custom_field_mapping/row_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,13 +29,7 @@ module Settings module ProjectCustomFields module ProjectCustomFieldMapping - class RowComponent < Projects::RowComponent # rubocop:disable OpenProject/AddPreviewForViewComponent - include OpTurbo::Streamable - - def wrapper_uniq_by - "project-#{project.id}" - end - + class RowComponent < Admin::CustomFields::CustomFieldProjects::RowComponent def more_menu_items @more_menu_items ||= [more_menu_detach_project].compact end @@ -48,7 +42,7 @@ module Settings { scheme: :default, icon: nil, - label: I18n.t("projects.settings.project_custom_fields.actions.deactivate_for_project"), + label: I18n.t("projects.settings.project_custom_fields.actions.remove_from_project"), href: unlink_admin_settings_project_custom_field_path( id: @table.params[:custom_field].id, project_custom_field_project_mapping: { project_id: project.id } diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/table_component.rb b/app/components/settings/project_custom_fields/project_custom_field_mapping/table_component.rb index 1128a73f46f..b63ca837dbc 100644 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/table_component.rb +++ b/app/components/settings/project_custom_fields/project_custom_field_mapping/table_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,33 +29,7 @@ module Settings module ProjectCustomFields module ProjectCustomFieldMapping - class TableComponent < Projects::TableComponent # rubocop:disable OpenProject/AddPreviewForViewComponent - include OpTurbo::Streamable - - def columns - @columns ||= query.selects.reject { |select| select.is_a?(Queries::Selects::NotExistingSelect) } - end - - def sortable? - false - end - - # @override optional_pagination_options are passed to the pagination_options - # which are passed to #pagination_links_full in pagination_helper.rb - # - # In Turbo streamable components, we need to be able to specify the url_for(action:) so that links are - # generated in the context of the component index action, instead of any turbo stream actions performing - # partial updates on the page. - # - # params[:url_for_action] is passed to the pagination_options making it's way down to any pagination links - # that are generated via link_to which calls url_for which uses the params[:url_for_action] to specify - # the controller action that link_to should use. - # - def optional_pagination_options - return super unless params[:url_for_action] - - super.merge(params: { action: params[:url_for_action] }) - end + class TableComponent < Admin::CustomFields::CustomFieldProjects::TableComponent end end end diff --git a/app/components/settings/text_setting_component.html.erb b/app/components/settings/text_setting_component.html.erb index 1fe3cf4789e..b03e90698f3 100644 --- a/app/components/settings/text_setting_component.html.erb +++ b/app/components/settings/text_setting_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/text_setting_component.rb b/app/components/settings/text_setting_component.rb index e757d2af1ea..402e0407f80 100644 --- a/app/components/settings/text_setting_component.rb +++ b/app/components/settings/text_setting_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/time_zone_setting_component.html.erb b/app/components/settings/time_zone_setting_component.html.erb index 543cf7e480f..b0b28be1576 100644 --- a/app/components/settings/time_zone_setting_component.html.erb +++ b/app/components/settings/time_zone_setting_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/time_zone_setting_component.rb b/app/components/settings/time_zone_setting_component.rb index 7cb43e8120d..674ad6a53ce 100644 --- a/app/components/settings/time_zone_setting_component.rb +++ b/app/components/settings/time_zone_setting_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/shares/bulk_permission_button_component.rb b/app/components/shares/bulk_permission_button_component.rb index b42c5de1dad..09674ac7a4f 100644 --- a/app/components/shares/bulk_permission_button_component.rb +++ b/app/components/shares/bulk_permission_button_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/shares/bulk_selection_counter_component.rb b/app/components/shares/bulk_selection_counter_component.rb index fc56f453cde..5547b060e1e 100644 --- a/app/components/shares/bulk_selection_counter_component.rb +++ b/app/components/shares/bulk_selection_counter_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/shares/counter_component.rb b/app/components/shares/counter_component.rb index c2581bfb5db..e0ddbabc2e7 100644 --- a/app/components/shares/counter_component.rb +++ b/app/components/shares/counter_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/shares/empty_state_component.rb b/app/components/shares/empty_state_component.rb index 1dda0facba9..1dc9e14d690 100644 --- a/app/components/shares/empty_state_component.rb +++ b/app/components/shares/empty_state_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/shares/invite_user_form_component.html.erb b/app/components/shares/invite_user_form_component.html.erb index 6cfe10cc506..dea952c59aa 100644 --- a/app/components/shares/invite_user_form_component.html.erb +++ b/app/components/shares/invite_user_form_component.html.erb @@ -1,7 +1,6 @@ <%= - component_wrapper do - if strategy.manageable? - primer_form_with( + component_wrapper(data_test_selector: 'invite-user-form') do + primer_form_with( model: new_share, url: url_for([entity, Member]), data: { controller: 'user-limit shares--user-selected', @@ -17,7 +16,7 @@ invite_form.with_area('permission') do render(Shares::PermissionButtonComponent.new( share: new_share, - available_roles: strategy.available_roles, + strategy: strategy, form_arguments: { builder: form, name: "role_id" }, data: { 'test-selector': 'op-share-dialog-invite-role' }) ) @@ -92,9 +91,6 @@ end end end - end - else - render(Primer::Alpha::Banner.new(icon: :info)) { I18n.t('sharing.denied', entities: entity.model_name.human(count: 2)) } end end %> diff --git a/app/components/shares/invite_user_form_component.rb b/app/components/shares/invite_user_form_component.rb index 92cd7bf922b..f8d40024bae 100644 --- a/app/components/shares/invite_user_form_component.rb +++ b/app/components/shares/invite_user_form_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/shares/manage_shares_component.html.erb b/app/components/shares/manage_shares_component.html.erb new file mode 100644 index 00000000000..9cca5dea7e5 --- /dev/null +++ b/app/components/shares/manage_shares_component.html.erb @@ -0,0 +1,109 @@ +<%= + if strategy.manageable? + modal_content.with_row do + render(Shares::InviteUserFormComponent.new(strategy:, errors: errors)) + end + end + + modal_content.with_row(data: { 'test-selector': 'op-share-dialog-active-list', + controller: 'shares--bulk-selection', + application_target: 'dynamic' }) do + render(border_box_container(list_id: insert_target_modifier_id)) do |border_box| + border_box.with_header(color: :muted, data: { 'test-selector': 'op-share-dialog-header' }) do + grid_layout('op-share-dialog-modal-body--header', tag: :div, align_items: :center) do |header_grid| + header_grid.with_area(:counter, tag: :div) do + render(Shares::CounterComponent.new(strategy:, count: strategy.shares.size)) + end + + header_grid.with_area(:actions, + tag: :div, + data: { 'shares--bulk-selection-target': 'defaultActions' }) do + flex_layout do |header_actions| + header_actions.with_column(mr: 2) do + render(Primer::Alpha::ActionMenu.new(anchor_align: :end, + select_variant: :single, + size: :small, + dynamic_label: true, + dynamic_label_prefix: I18n.t('sharing.filter.type'), + color: :muted, + data: { 'test-selector': 'op-share-dialog-filter-type' })) do |menu| + menu.with_show_button(scheme: :invisible, color: :muted, data: { 'test-selector': 'op-share-dialog-filter-type-button' }) do |button| + button.with_trailing_action_icon(icon: "triangle-down") + I18n.t('sharing.filter.type') + end + type_filter_options.each do |option| + menu.with_item(label: option[:label], + href: filter_url(type_option: option), + method: :get, + tag: :a, + active: type_filter_option_active?(option), + role: "menuitem") + end + end + end + + header_actions.with_column do + render(Primer::Alpha::ActionMenu.new(anchor_align: :end, + select_variant: :single, + size: :small, + dynamic_label: true, + dynamic_label_prefix: I18n.t('sharing.filter.role'), + color: :muted, + data: { 'test-selector': 'op-share-dialog-filter-role' })) do |menu| + menu.with_show_button(scheme: :invisible, color: :muted, data: { 'test-selector': 'op-share-dialog-filter-role-button' }) do |button| + button.with_trailing_action_icon(icon: "triangle-down") + I18n.t('sharing.filter.role') + end + strategy.available_roles.each do |role_hash| + menu.with_item(label: role_hash[:label], + href: filter_url(role_option: role_hash), + method: :get, + tag: :a, + active: role_filter_option_active?(role_hash), + role: "menuitem") + end + end + end + end + end + + header_grid.with_area(:actions, + tag: :div, + hidden: true, # Prevent flicker on initial render + data: { 'shares--bulk-selection-target': 'bulkActions' }) do + if strategy.manageable? + concat(render(Shares::BulkPermissionButtonComponent.new(strategy:))) + + concat( + form_with(url: url_for([:bulk, entity, Member]), + method: :delete, + data: { 'shares--bulk-selection-target': 'bulkForm' }) do + render(Primer::Beta::IconButton.new(icon: "trash", + type: :submit, + scheme: :danger, + "aria-label": I18n.t('sharing.remove'), + test_selector: 'op-share-dialog--bulk-remove')) + end + ) + end + end + end + end + + if strategy.shares.none? + border_box.with_row do + if strategy.custom_empty_state_component? + render(strategy.empty_state_component.new(strategy: strategy)) + else + render(Shares::EmptyStateComponent.new(strategy: strategy)) + end + end + else + strategy.shares.each do |share| + render(Shares::ShareRowComponent.new(share:, strategy:, container: border_box)) + end + end + end + end + +%> diff --git a/app/components/shares/manage_shares_component.rb b/app/components/shares/manage_shares_component.rb new file mode 100644 index 00000000000..fa61c6afdd5 --- /dev/null +++ b/app/components/shares/manage_shares_component.rb @@ -0,0 +1,189 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Shares + class ManageSharesComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent + include ApplicationHelper + include MemberHelper + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + + attr_reader :strategy, + :entity, + :errors, + :modal_content + + def initialize(strategy:, modal_content:, errors: nil) + super + + @strategy = strategy + @entity = strategy.entity + @errors = errors + @modal_content = modal_content + end + + def self.wrapper_key + "share_modal_management_table" + end + + private + + def project_scoped_entity? + entity.respond_to?(:project) + end + + def insert_target_modified? + true + end + + def insert_target_modifier_id + "op-share-dialog-active-shares" + end + + def type_filter_options + if project_scoped_entity? + [ + { label: I18n.t("sharing.filter.project_member"), + value: { principal_type: "User", project_member: true } }, + { label: I18n.t("sharing.filter.not_project_member"), + value: { principal_type: "User", project_member: false } }, + { label: I18n.t("sharing.filter.project_group"), + value: { principal_type: "Group", project_member: true } }, + { label: I18n.t("sharing.filter.not_project_group"), + value: { principal_type: "Group", project_member: false } } + ] + else + [ + { label: I18n.t("sharing.filter.user"), value: { principal_type: "User" } }, + { label: I18n.t("sharing.filter.group"), value: { principal_type: "Group" } } + ] + + end + end + + def type_filter_option_active?(option) # rubocop:disable Metrics/AbcSize + principal_type_filter_value = current_filter_value(params[:filters], "principal_type") + project_member_filter_value = current_filter_value(params[:filters], "also_project_member") + + return false if principal_type_filter_value.nil? + return false if project_scoped_entity? && project_member_filter_value.nil? + + principal_type_checked = + option[:value][:principal_type] == principal_type_filter_value + membership_selected = !project_scoped_entity? || + option[:value][:project_member] == ActiveRecord::Type::Boolean.new.cast(project_member_filter_value) + + principal_type_checked && membership_selected + end + + def role_filter_option_active?(option) + role_filter_value = current_filter_value(params[:filters], "role_id") + + return false if role_filter_value.nil? + + selected_role = strategy.available_roles.find { _1[:value] == option[:value] } + + selected_role[:value] == role_filter_value.to_i + end + + def filter_url(type_option: nil, role_option: nil) + return url_for([@entity, Member]) if type_option.nil? && role_option.nil? + + args = {} + filter = [] + + filter += apply_role_filter(role_option) + filter += apply_type_filter(type_option) + + args[:filters] = filter.to_json unless filter.empty? + + url_for([@entity, Member, args]) + end + + def apply_role_filter(option) + current_role_filter_value = current_filter_value(params[:filters], "role_id") + filter = [] + + if option.nil? && current_role_filter_value.present? + # When there is already a role filter set and no new value passed, we want to keep that filter + filter = role_filter_for({ value: current_role_filter_value }) + elsif option.present? && !role_filter_option_active?(option) + # Only when the passed filter option is not the currently selected one, we apply the filter + filter = role_filter_for(option) + end + + filter + end + + def role_filter_for(option) + [ + { role_id: { operator: "=", values: [option[:value]] } } + ] + end + + def apply_type_filter(option) + current_type_filter_value = current_filter_value(params[:filters], "principal_type") + current_member_filter_value = current_filter_value(params[:filters], "also_project_member") + filter = [] + + if option.nil? && current_type_filter_value.present? && current_member_filter_value.present? + # When there is already a type filter set and no new value passed, we want to keep that filter + value = { value: { principal_type: current_type_filter_value, project_member: current_member_filter_value } } + filter = type_filter_for(value) + elsif option.present? && !type_filter_option_active?(option) + # Only when the passed filter option is not the currently selected one, we apply the filter + filter = type_filter_for(option) + end + + filter + end + + def type_filter_for(option) + filter = [ + { principal_type: { operator: "=", values: [option[:value][:principal_type]] } } + ] + + if project_scoped_entity? + if ActiveRecord::Type::Boolean.new.cast(option[:value][:project_member]) + filter.push({ also_project_member: { operator: "=", values: [OpenProject::Database::DB_VALUE_TRUE] } }) + else + filter.push({ also_project_member: { operator: "=", values: [OpenProject::Database::DB_VALUE_FALSE] } }) + end + end + + filter + end + + def current_filter_value(filters, filter_key) + return nil if filters.nil? + + given_filters = JSON.parse(filters).find { |key| key.key?(filter_key) } + given_filters ? given_filters[filter_key]["values"].first : nil + end + end +end diff --git a/app/components/shares/modal_body_component.html.erb b/app/components/shares/modal_body_component.html.erb index a4cf6c39cb9..86aa24b5490 100644 --- a/app/components/shares/modal_body_component.html.erb +++ b/app/components/shares/modal_body_component.html.erb @@ -1,117 +1,13 @@ <%= component_wrapper(tag: 'turbo-frame') do - flex_layout(data: { turbo: true }, - classes: "op-share-dialog-modal-body--row-container") do |modal_content| + flex_layout(data: { turbo: true }, classes: "op-share-dialog-modal-body--row-container") do |modal_content| if strategy.custom_body_components? strategy.additional_body_components.each do |component| render(component.new(strategy: strategy, modal_body_container: modal_content)) end end - modal_content.with_row do - render(Shares::InviteUserFormComponent.new(strategy:, errors: errors)) - end - - modal_content.with_row(data: { 'test-selector': 'op-share-dialog-active-list', - controller: 'shares--bulk-selection', - application_target: 'dynamic' }) do - render(border_box_container(list_id: insert_target_modifier_id)) do |border_box| - border_box.with_header(color: :muted, data: { 'test-selector': 'op-share-dialog-header' }) do - grid_layout('op-share-dialog-modal-body--header', tag: :div, align_items: :center) do |header_grid| - header_grid.with_area(:counter, tag: :div) do - render(Shares::CounterComponent.new(strategy:, count: @shares.size)) - end - - header_grid.with_area(:actions, - tag: :div, - data: { 'shares--bulk-selection-target': 'defaultActions' }) do - flex_layout do |header_actions| - header_actions.with_column(mr: 2) do - render(Primer::Alpha::ActionMenu.new(anchor_align: :end, - select_variant: :single, - size: :small, - dynamic_label: true, - dynamic_label_prefix: I18n.t('sharing.filter.type'), - color: :muted, - data: { 'test-selector': 'op-share-dialog-filter-type' })) do |menu| - menu.with_show_button(scheme: :invisible, color: :muted, data: { 'test-selector': 'op-share-dialog-filter-type-button' }) do |button| - button.with_trailing_action_icon(icon: "triangle-down") - I18n.t('sharing.filter.type') - end - type_filter_options.each do |option| - menu.with_item(label: option[:label], - href: filter_url(type_option: option), - method: :get, - tag: :a, - active: type_filter_option_active?(option), - role: "menuitem") - end - end - end - - header_actions.with_column do - render(Primer::Alpha::ActionMenu.new(anchor_align: :end, - select_variant: :single, - size: :small, - dynamic_label: true, - dynamic_label_prefix: I18n.t('sharing.filter.role'), - color: :muted, - data: { 'test-selector': 'op-share-dialog-filter-role' })) do |menu| - menu.with_show_button(scheme: :invisible, color: :muted, data: { 'test-selector': 'op-share-dialog-filter-role-button' }) do |button| - button.with_trailing_action_icon(icon: "triangle-down") - I18n.t('sharing.filter.role') - end - strategy.available_roles.each do |role_hash| - menu.with_item(label: role_hash[:label], - href: filter_url(role_option: role_hash), - method: :get, - tag: :a, - active: role_filter_option_active?(role_hash), - role: "menuitem") - end - end - end - end - end - - header_grid.with_area(:actions, - tag: :div, - hidden: true, # Prevent flicker on initial render - data: { 'shares--bulk-selection-target': 'bulkActions' }) do - if strategy.manageable? - concat(render(Shares::BulkPermissionButtonComponent.new(strategy:))) - - concat( - form_with(url: url_for([:bulk, entity, Member]), - method: :delete, - data: { 'shares--bulk-selection-target': 'bulkForm' }) do - render(Primer::Beta::IconButton.new(icon: "trash", - type: :submit, - scheme: :danger, - "aria-label": I18n.t('sharing.remove'), - test_selector: 'op-share-dialog--bulk-remove')) - end - ) - end - end - end - end - - if @shares.none? - border_box.with_row do - if strategy.custom_empty_state_component? - render(strategy.empty_state_component.new(strategy: strategy)) - else - render(Shares::EmptyStateComponent.new(strategy: strategy)) - end - end - else - @shares.each do |share| - render(Shares::ShareRowComponent.new(share:, strategy:, container: border_box)) - end - end - end - end + render(strategy.manage_shares_component(modal_content:, errors:)) end end %> diff --git a/app/components/shares/modal_body_component.rb b/app/components/shares/modal_body_component.rb index 231cb4bd070..d617510e58a 100644 --- a/app/components/shares/modal_body_component.rb +++ b/app/components/shares/modal_body_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,162 +28,21 @@ module Shares class ModalBodyComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent - include ApplicationHelper - include MemberHelper include OpTurbo::Streamable include OpPrimer::ComponentHelpers attr_reader :strategy, - :entity, - :shares, :errors - def initialize(strategy:, shares:, errors: nil) + def initialize(strategy:, errors: nil) super @strategy = strategy - @entity = strategy.entity - @shares = shares @errors = errors end def self.wrapper_key - "share_list" - end - - private - - def project_scoped_entity? - entity.respond_to?(:project) - end - - def insert_target_modified? - true - end - - def insert_target_modifier_id - "op-share-dialog-active-shares" - end - - def type_filter_options - if project_scoped_entity? - [ - { label: I18n.t("sharing.filter.project_member"), - value: { principal_type: "User", project_member: true } }, - { label: I18n.t("sharing.filter.not_project_member"), - value: { principal_type: "User", project_member: false } }, - { label: I18n.t("sharing.filter.project_group"), - value: { principal_type: "Group", project_member: true } }, - { label: I18n.t("sharing.filter.not_project_group"), - value: { principal_type: "Group", project_member: false } } - ] - else - [ - { label: I18n.t("sharing.filter.user"), value: { principal_type: "User" } }, - { label: I18n.t("sharing.filter.group"), value: { principal_type: "Group" } } - ] - - end - end - - def type_filter_option_active?(option) # rubocop:disable Metrics/AbcSize - principal_type_filter_value = current_filter_value(params[:filters], "principal_type") - project_member_filter_value = current_filter_value(params[:filters], "also_project_member") - - return false if principal_type_filter_value.nil? - return false if project_scoped_entity? && project_member_filter_value.nil? - - principal_type_checked = - option[:value][:principal_type] == principal_type_filter_value - membership_selected = !project_scoped_entity? || - option[:value][:project_member] == ActiveRecord::Type::Boolean.new.cast(project_member_filter_value) - - principal_type_checked && membership_selected - end - - def role_filter_option_active?(option) - role_filter_value = current_filter_value(params[:filters], "role_id") - - return false if role_filter_value.nil? - - selected_role = strategy.available_roles.find { _1[:value] == option[:value] } - - selected_role[:value] == role_filter_value.to_i - end - - def filter_url(type_option: nil, role_option: nil) - return url_for([@entity, Member]) if type_option.nil? && role_option.nil? - - args = {} - filter = [] - - filter += apply_role_filter(role_option) - filter += apply_type_filter(type_option) - - args[:filters] = filter.to_json unless filter.empty? - - url_for([@entity, Member, args]) - end - - def apply_role_filter(option) - current_role_filter_value = current_filter_value(params[:filters], "role_id") - filter = [] - - if option.nil? && current_role_filter_value.present? - # When there is already a role filter set and no new value passed, we want to keep that filter - filter = role_filter_for({ value: current_role_filter_value }) - elsif option.present? && !role_filter_option_active?(option) - # Only when the passed filter option is not the currently selected one, we apply the filter - filter = role_filter_for(option) - end - - filter - end - - def role_filter_for(option) - [ - { role_id: { operator: "=", values: [option[:value]] } } - ] - end - - def apply_type_filter(option) - current_type_filter_value = current_filter_value(params[:filters], "principal_type") - current_member_filter_value = current_filter_value(params[:filters], "also_project_member") - filter = [] - - if option.nil? && current_type_filter_value.present? && current_member_filter_value.present? - # When there is already a type filter set and no new value passed, we want to keep that filter - value = { value: { principal_type: current_type_filter_value, project_member: current_member_filter_value } } - filter = type_filter_for(value) - elsif option.present? && !type_filter_option_active?(option) - # Only when the passed filter option is not the currently selected one, we apply the filter - filter = type_filter_for(option) - end - - filter - end - - def type_filter_for(option) - filter = [ - { principal_type: { operator: "=", values: [option[:value][:principal_type]] } } - ] - - if project_scoped_entity? - if ActiveRecord::Type::Boolean.new.cast(option[:value][:project_member]) - filter.push({ also_project_member: { operator: "=", values: [OpenProject::Database::DB_VALUE_TRUE] } }) - else - filter.push({ also_project_member: { operator: "=", values: [OpenProject::Database::DB_VALUE_FALSE] } }) - end - end - - filter - end - - def current_filter_value(filters, filter_key) - return nil if filters.nil? - - given_filters = JSON.parse(filters).find { |key| key.key?(filter_key) } - given_filters ? given_filters[filter_key]["values"].first : nil + "share_modal_body" end end end diff --git a/app/components/shares/modal_body_component.sass b/app/components/shares/modal_body_component.sass index 44f6e8260e2..1deaf6e981e 100644 --- a/app/components/shares/modal_body_component.sass +++ b/app/components/shares/modal_body_component.sass @@ -4,8 +4,8 @@ &--user-row display: grid - grid-template-columns: minmax(31px, auto) 1fr // 31px is the width needed to display a group avatar - grid-template-areas: "avatar user_details" + grid-template-columns: minmax(31px, auto) 1fr auto // 31px is the width needed to display a group avatar + grid-template-areas: "avatar user_details button" grid-column-gap: 10px &_manageable diff --git a/app/components/shares/permission_button_component.html.erb b/app/components/shares/permission_button_component.html.erb index 24a63a92b6d..dcbae570f5f 100644 --- a/app/components/shares/permission_button_component.html.erb +++ b/app/components/shares/permission_button_component.html.erb @@ -1,28 +1,30 @@ <%= component_wrapper do - render(Primer::Alpha::ActionMenu.new(**{ select_variant: :single, - size: :small, - dynamic_label: true, - anchor_align: :end, - color: :subtle }.deep_merge(@system_arguments))) do |menu| - menu.with_show_button(data: { 'shares--bulk-selection-target': 'userRowRole', - 'share-id': share.id, - 'active-role-name': permission_name(active_role.id)}) do |button| - button.with_trailing_action_icon(icon: :"triangle-down") - permission_name(active_role.id) - end + content_tag(:div, class: tooltip_wrapper_classes, data: { tooltip: tooltip_message }) do + render(Primer::Alpha::ActionMenu.new(**{ select_variant: :single, + size: :small, + dynamic_label: true, + anchor_align: :end, + color: :subtle }.deep_merge(@system_arguments))) do |menu| + menu.with_show_button(disabled: !editable?, data: { 'shares--bulk-selection-target': 'userRowRole', + 'share-id': share.id, + 'active-role-name': permission_name(active_role.id)}) do |button| + button.with_trailing_action_icon(icon: :"triangle-down") + permission_name(active_role.id) + end - @available_roles.each do |role_hash| - menu.with_item(label: role_hash[:label], - href: update_path, - method: :patch, - active: role_active?(role_hash), - data: { value: role_hash[:value] }, - form_arguments: { - method: :patch, - inputs: form_inputs(role_hash[:value]) - }) do |item| - item.with_description.with_content(role_hash[:description]) + strategy.available_roles.each do |role_hash| + menu.with_item(label: role_hash[:label], + href: update_path, + method: :patch, + active: role_active?(role_hash), + data: { value: role_hash[:value] }, + form_arguments: { + method: :patch, + inputs: form_inputs(role_hash[:value]) + }) do |item| + item.with_description.with_content(role_hash[:description]) + end end end end diff --git a/app/components/shares/permission_button_component.rb b/app/components/shares/permission_button_component.rb index 2746241a157..186f4f46194 100644 --- a/app/components/shares/permission_button_component.rb +++ b/app/components/shares/permission_button_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -32,10 +32,10 @@ module Shares include OpPrimer::ComponentHelpers include OpTurbo::Streamable - def initialize(share:, available_roles:, **system_arguments) + def initialize(share:, strategy:, **system_arguments) super - @available_roles = available_roles + @strategy = strategy @share = share @system_arguments = system_arguments end @@ -58,7 +58,7 @@ module Shares private - attr_reader :share, :available_roles + attr_reader :share, :strategy def active_role if share.persisted? @@ -71,7 +71,7 @@ module Shares end def permission_name(value) - available_roles.find { |role_hash| role_hash[:value] == value }[:label] + strategy.available_roles.find { |role_hash| role_hash[:value] == value }[:label] end def form_inputs(role_id) @@ -80,5 +80,21 @@ module Shares inputs << { name: "filters", value: params[:filters] } if params[:filters] end end + + def tooltip_message + return if strategy.manageable? + + I18n.t("sharing.denied", entities: strategy.entity.class.model_name.human(count: 2)) + end + + def tooltip_wrapper_classes + return [] if strategy.manageable? + + ["tooltip--left"] + end + + def editable? + strategy.manageable? && share.principal != User.current + end end end diff --git a/app/components/shares/project_queries/empty_state_component.rb b/app/components/shares/project_queries/empty_state_component.rb index b02fcb9d8dd..b3941ca7a0d 100644 --- a/app/components/shares/project_queries/empty_state_component.rb +++ b/app/components/shares/project_queries/empty_state_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -62,7 +62,7 @@ module Shares def unfiltered_blankslate_config { - icon: :people, + icon: "share-android", heading_text: I18n.t("sharing.project_queries.blank_state.private.header"), description_text: I18n.t("sharing.project_queries.blank_state.private.description") } diff --git a/app/components/shares/project_queries/public_flag_component.html.erb b/app/components/shares/project_queries/public_flag_component.html.erb index aec171db24e..67b4925aa8b 100644 --- a/app/components/shares/project_queries/public_flag_component.html.erb +++ b/app/components/shares/project_queries/public_flag_component.html.erb @@ -1,14 +1,21 @@ <%= container.with_row do - render(Primer::Forms::ToggleSwitchForm.new( + render(Primer::Box.new(border: true, + border_radius: BOX_BORDER_RADIUS, + p: BOX_PADDING)) do + content_tag(:div, class: tooltip_wrapper_classes, data: { tooltip: tooltip_message }) do + render(Primer::Forms::ToggleSwitchForm.new( name: "publish_project_query", - label: t('sharing.project_queries.public_flag.label', instance_name: Setting.app_title), - caption: t('sharing.project_queries.public_flag.caption'), + label: t("sharing.project_queries.public_flag.label", instance_name: Setting.app_title), + caption: t("sharing.project_queries.public_flag.caption"), src: toggle_public_flag_link, csrf_token: form_authenticity_token, status_label_position: :start, checked: published?, - enabled: can_publish? + enabled: can_publish?, + turbo: true )) + end + end end %> diff --git a/app/components/shares/project_queries/public_flag_component.rb b/app/components/shares/project_queries/public_flag_component.rb index 813c5caa2a1..cfbd02dcc79 100644 --- a/app/components/shares/project_queries/public_flag_component.rb +++ b/app/components/shares/project_queries/public_flag_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -31,6 +31,8 @@ module Shares module ProjectQueries class PublicFlagComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent + BOX_PADDING = 3 + BOX_BORDER_RADIUS = 2 include OpTurbo::Streamable include OpPrimer::ComponentHelpers @@ -56,6 +58,18 @@ module Shares def can_publish? User.current.allowed_globally?(:manage_public_project_queries) end + + def tooltip_message + return if can_publish? + + I18n.t("sharing.project_queries.publishing_denied") + end + + def tooltip_wrapper_classes + ["d-flex", "flex-column"].tap do |classlist| + classlist << "tooltip--bottom" unless can_publish? + end + end end end end diff --git a/app/components/shares/project_queries/upsale_component.html.erb b/app/components/shares/project_queries/upsale_component.html.erb new file mode 100644 index 00000000000..0568cec7557 --- /dev/null +++ b/app/components/shares/project_queries/upsale_component.html.erb @@ -0,0 +1,16 @@ +<%= + modal_content.with_row(data: { 'test-selector': 'op-share-dialog-upsale-block' }) do + render Primer::OpenProject::FeedbackMessage.new(icon_arguments: { icon: :"op-enterprise-addons", classes: "upsale-colored" }, border: true) do |component| + component.with_heading(tag: :h2, classes: 'upsale-colored').with_content(I18n.t(:label_enterprise_addon)) + component.with_description { I18n.t('sharing.project_queries.upsale.message') } + + href = "#{OpenProject::Static::Links.links[:upsale][:href]}/?utm_source=unknown&utm_medium=community-edition&utm_campaign=project-list-sharing-modal" + component.with_secondary_action(href:) do + flex_layout(justify_content: :center) do |flex| + flex.with_column(mr: 1) { I18n.t("admin.enterprise.enterprise_link") } + flex.with_column { render(Primer::Beta::Octicon.new(icon: :'link-external')) } + end + end + end + end +%> diff --git a/app/components/shares/project_queries/upsale_component.rb b/app/components/shares/project_queries/upsale_component.rb new file mode 100644 index 00000000000..b3127b97e39 --- /dev/null +++ b/app/components/shares/project_queries/upsale_component.rb @@ -0,0 +1,43 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Shares + module ProjectQueries + class UpsaleComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent + include OpPrimer::ComponentHelpers + + def initialize(modal_content:) + super + + @modal_content = modal_content + end + + attr_reader :modal_content + end + end +end diff --git a/app/components/shares/share_counter_component.rb b/app/components/shares/share_counter_component.rb index 094b0c74dc1..55de336838c 100644 --- a/app/components/shares/share_counter_component.rb +++ b/app/components/shares/share_counter_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/shares/share_dialog_component.html.erb b/app/components/shares/share_dialog_component.html.erb index df84ba60efd..d3c7f273265 100644 --- a/app/components/shares/share_dialog_component.html.erb +++ b/app/components/shares/share_dialog_component.html.erb @@ -1,8 +1,8 @@ <%= - render(Primer::Alpha::Dialog.new(title: t(:label_share_project_list), id: 'sharing-modal', data: { 'keep-open-on-submit': true }, size: :xlarge)) do |d| + render(Primer::Alpha::Dialog.new(title: strategy.title, id: 'sharing-modal', data: { 'keep-open-on-submit': true }, size: :xlarge, open: open)) do |d| d.with_header(variant: :large, mb: 3) d.with_body do - render(Shares::ModalBodyComponent.new(strategy:, shares:, errors:)) + render(strategy.modal_body_component(errors)) end end %> diff --git a/app/components/shares/share_dialog_component.rb b/app/components/shares/share_dialog_component.rb index 702f5adc556..2959b244b97 100644 --- a/app/components/shares/share_dialog_component.rb +++ b/app/components/shares/share_dialog_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -34,16 +34,16 @@ module Shares include OpTurbo::Streamable include OpPrimer::ComponentHelpers - def initialize(shares:, strategy:, errors:) + def initialize(strategy:, errors:, open: false) super - @shares = shares @strategy = strategy @errors = errors + @open = open end private - attr_reader :shares, :strategy, :errors + attr_reader :strategy, :errors, :open end end diff --git a/app/components/shares/share_row_component.html.erb b/app/components/shares/share_row_component.html.erb index f633f52876b..b7045299e47 100644 --- a/app/components/shares/share_row_component.html.erb +++ b/app/components/shares/share_row_component.html.erb @@ -3,7 +3,7 @@ grid_layout(grid_css_classes, tag: :div, align_items: :center, classes: 'ellipsis') do |user_row_grid| user_row_grid.with_area(:selection, tag: :div) do if share_editable? - render(Primer::Alpha::CheckBox.new(name: "share_ids", value: share.id, label: principal.name, + render(Primer::Alpha::CheckBox.new(name: "share_ids", value: (share.id || VIRTUAL_SHARE_ID), label: principal.name, visually_hide_label: true, scheme: :array, data: { 'shares--bulk-selection-target': 'shareCheckbox', @@ -17,16 +17,16 @@ end user_row_grid.with_area(:user_details, tag: :div, classes: 'ellipsis') do - render(Shares::UserDetailsComponent.new(share:, manager_mode: share_editable?)) + render(Shares::UserDetailsComponent.new(share:, strategy:)) + end + + user_row_grid.with_area(:button, tag: :div, color: :subtle) do + render(Shares::PermissionButtonComponent.new(share:, + strategy: strategy, + data: { 'test-selector': 'op-share-dialog-update-role' })) end if share_editable? - user_row_grid.with_area(:button, tag: :div, color: :subtle) do - render(Shares::PermissionButtonComponent.new(share:, - available_roles: @available_roles, - data: { 'test-selector': 'op-share-dialog-update-role' })) - end - user_row_grid.with_area(:remove, tag: :div) do form_with url: url_for([entity, share]), method: :delete do render(Primer::Beta::IconButton.new(icon: "trash", diff --git a/app/components/shares/share_row_component.rb b/app/components/shares/share_row_component.rb index 1a4376af63d..45df3ab20e0 100644 --- a/app/components/shares/share_row_component.rb +++ b/app/components/shares/share_row_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,6 +30,8 @@ module Shares class ShareRowComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent + VIRTUAL_SHARE_ID = "virtual-share-id" + include ApplicationHelper include OpTurbo::Streamable include OpPrimer::ComponentHelpers diff --git a/app/components/shares/user_details_component.html.erb b/app/components/shares/user_details_component.html.erb index 2af0f5a1929..4a42f623ee8 100644 --- a/app/components/shares/user_details_component.html.erb +++ b/app/components/shares/user_details_component.html.erb @@ -1,67 +1,38 @@ -<%= - component_wrapper do - flex_layout do |flex| - flex.with_row do - render(Primer::Beta::Link.new(font_weight: :semibold, href: principal_show_path)) { user.name } - end +<%= component_wrapper do + flex_layout do |flex| + flex.with_row do + render( + Primer::Beta::Link.new( + font_weight: :semibold, + href: principal_show_path, + ) + ) { user.name } + end - flex.with_row(classes: 'ellipsis') do - if manager_mode? - if user_is_a_group? - if project_group? - render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.project_group")} + flex.with_row(classes: "ellipsis") do + if strategy.manageable? + if user_in_non_active_status? + if user.locked? + concat(render(Primer::Beta::Octicon.new(icon: :lock, color: :muted, mr: 1))) + concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.locked") }) + elsif user.invited? + if invite_resent? + concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.invite_resent") }) else - render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.not_project_group")} - end - else - if user_in_non_active_status? - if user.locked? - concat(render(Primer::Beta::Octicon.new(icon: :lock, color: :muted, mr: 1))) - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.locked") }) - elsif user.invited? - if invite_resent? - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.invite_resent") }) - else - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t('sharing.user_details.invited') }) - concat( - form_with(url: resend_invite_path, method: :post) do - render(Primer::Beta::Button.new(type: :submit, px: 0, scheme: :link)) { I18n.t('sharing.user_details.resend_invite') } - end - ) - end - end - else - if part_of_a_group? - if part_of_a_shared_group? - if project_member? - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.additional_privileges_project_or_group") }) - else - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.additional_privileges_group") }) - end - else - if inherited_project_member? - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.additional_privileges_project_or_group") }) - elsif project_member? - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.additional_privileges_project") }) - else - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.not_project_member") }) - end - end - else - if project_member? - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.additional_privileges_project") }) - else - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.not_project_member") }) - end - end + + concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.invited") }) + concat( + form_with(url: resend_invite_path, method: :post) do + render(Primer::Beta::Button.new(type: :submit, px: 0, scheme: :link)) { I18n.t("sharing.user_details.resend_invite") } + end) end end else - if user.invited? - concat(render(Primer::Beta::Text.new(color: :subtle)) { I18n.t("sharing.user_details.invited")}) - end + concat(render(Primer::Beta::Text.new(color: :subtle)) { strategy.share_description(share) }) end + else + concat(render(Primer::Beta::Text.new(color: :subtle)) { strategy.share_description(share) }) end end end -%> +end %> diff --git a/app/components/shares/user_details_component.rb b/app/components/shares/user_details_component.rb index 8f189f2b6db..8ed9924d414 100644 --- a/app/components/shares/user_details_component.rb +++ b/app/components/shares/user_details_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -33,22 +33,18 @@ module Shares include OpTurbo::Streamable include OpPrimer::ComponentHelpers - def initialize(share:, - manager_mode:, - invite_resent: false) + def initialize(share:, strategy:, invite_resent: false) super @share = share @user = share.principal - @manager_mode = manager_mode + @strategy = strategy @invite_resent = invite_resent end private - attr_reader :user, :share - - def manager_mode? = @manager_mode + attr_reader :user, :share, :strategy def invite_resent? = @invite_resent @@ -56,12 +52,6 @@ module Shares share.id end - def authoritative_work_package_role_name - @authoritative_work_package_role_name = options.find do |option| - option[:value] == share.roles.first.id - end[:label] - end - def principal_show_path case user when User @@ -77,50 +67,8 @@ module Shares url_for([:resend_invite, share.entity, share]) end - def user_is_a_group? - @user_is_a_group ||= user.is_a?(Group) - end - def user_in_non_active_status? user.locked? || user.invited? end - - # Is a user member of a project no matter whether inherited or directly assigned - def project_member? - Member.exists?(project: share.project, - principal: user, - entity: nil) - end - - # Explicitly check whether the project membership was inherited by a group - def inherited_project_member? - Member.includes(:roles) - .references(:member_roles) - .where(project: share.project, principal: user, entity: nil) # membership in the project - .merge(MemberRole.only_inherited) # that was inherited - .any? - end - - def project_group? - user_is_a_group? && project_member? - end - - def part_of_a_shared_group? - share.member_roles.where.not(inherited_from: nil).any? - end - - def part_of_a_group? - GroupUser.where(user_id: user.id).any? - end - - def project_role_name - Member.where(project: share.project, - principal: user, - entity: nil) - .first - .roles - .first - .name - end end end diff --git a/app/components/shares/modal_upsale_component.html.erb b/app/components/shares/work_packages/modal_upsale_component.html.erb similarity index 78% rename from app/components/shares/modal_upsale_component.html.erb rename to app/components/shares/work_packages/modal_upsale_component.html.erb index 9f6cc4ae3e2..d1c89c491a1 100644 --- a/app/components/shares/modal_upsale_component.html.erb +++ b/app/components/shares/work_packages/modal_upsale_component.html.erb @@ -1,9 +1,7 @@ <%= component_wrapper(tag: 'turbo-frame') do - render Primer::Beta::Blankslate.new(border: true) do |component| - component.with_visual_icon(icon: :'op-enterprise-addons', classes: 'upsale-colored') + render Primer::OpenProject::FeedbackMessage.new(icon_arguments: { icon: :"op-enterprise-addons", classes: "upsale-colored" }, border: true) do |component| component.with_heading(tag: :h2, classes: 'upsale-colored').with_content(I18n.t(:label_enterprise_addon)) - # TODO: Generalize this text component.with_description { I18n.t('mail.sharing.work_packages.enterprise_text') } href = "#{OpenProject::Static::Links.links[:upsale][:href]}/?utm_source=unknown&utm_medium=community-edition&utm_campaign=work-package-sharing-modal" diff --git a/app/components/shares/modal_upsale_component.rb b/app/components/shares/work_packages/modal_upsale_component.rb similarity index 77% rename from app/components/shares/modal_upsale_component.rb rename to app/components/shares/work_packages/modal_upsale_component.rb index 933a8f06161..617940ed23d 100644 --- a/app/components/shares/modal_upsale_component.rb +++ b/app/components/shares/work_packages/modal_upsale_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,13 +27,15 @@ #++ module Shares - class ModalUpsaleComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent - include ApplicationHelper - include OpTurbo::Streamable - include OpPrimer::ComponentHelpers + module WorkPackages + class ModalUpsaleComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent + include ApplicationHelper + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers - def self.wrapper_key - "share_list" + def self.wrapper_key + "share_modal_body" + end end end end diff --git a/app/components/statuses/row_component.rb b/app/components/statuses/row_component.rb index 0533192cbb8..dd49dd6124f 100644 --- a/app/components/statuses/row_component.rb +++ b/app/components/statuses/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/statuses/table_component.rb b/app/components/statuses/table_component.rb index 240cf1490e5..61f3f49fd5e 100644 --- a/app/components/statuses/table_component.rb +++ b/app/components/statuses/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/table_component.html.erb b/app/components/table_component.html.erb index e5b16b52ebe..9449d5dc489 100644 --- a/app/components/table_component.html.erb +++ b/app/components/table_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -29,12 +29,12 @@ See COPYRIGHT and LICENSE files for more details.
    - +
    <% headers.each do |_name, _options| %> - + <% end %> - + diff --git a/app/components/table_component.rb b/app/components/table_component.rb index 15e59932b86..5a3c186661a 100644 --- a/app/components/table_component.rb +++ b/app/components/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -80,7 +80,7 @@ class TableComponent < ApplicationComponent rescue NameError raise( NameError, - "#{mod}::RowComponent required by #{mod}::TableComponent not defined. " + + "#{mod}::RowComponent required by #{name} not defined. " + "Expected to be defined in `app/components/#{mod.underscore}/row_component.rb`." ) end diff --git a/app/views/attribute_help_texts/upsale.html.erb b/app/components/types/edit_page_header_component.html.erb similarity index 69% rename from app/views/attribute_help_texts/upsale.html.erb rename to app/components/types/edit_page_header_component.html.erb index 928f8bea14b..70c2494d395 100644 --- a/app/views/attribute_help_texts/upsale.html.erb +++ b/app/components/types/edit_page_header_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -27,12 +27,17 @@ See COPYRIGHT and LICENSE files for more details. ++#%> -<% html_title t(:label_administration), t(:'attribute_help_texts.label_plural') %> +<%= + render Primer::OpenProject::PageHeader.new do |header| + header.with_title { @type.name } + header.with_breadcrumbs(breadcrumb_items) -<%= render template: 'common/upsale', - locals: { - feature_title: t(:'attribute_help_texts.label_plural'), - feature_description: t('attribute_help_texts.enterprise.description'), - feature_reference: 'enterprise-attribute-help-texts', - feature_image: 'enterprise/attribute-help-texts.png' - } %> + header.with_tab_nav(label: nil) do |tab_nav| + @tabs.each do |tab| + tab_nav.with_tab(selected: selected_tab(@tabs) == tab, href: tab[:path]) do |t| + t.with_text { I18n.t("js.#{tab[:label]}") } + end + end + end if @tabs.present? + end +%> diff --git a/app/components/types/edit_page_header_component.rb b/app/components/types/edit_page_header_component.rb new file mode 100644 index 00000000000..ad254afd81b --- /dev/null +++ b/app/components/types/edit_page_header_component.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Types + class EditPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + include TabsHelper + + def initialize(type:, tabs: nil) + super + @type = type + @tabs = tabs + end + + def breadcrumb_items + [{ href: admin_index_path, text: t("label_administration") }, + { href: admin_settings_work_packages_general_path, text: t(:label_work_package_plural) }, + { href: types_path, text: t(:label_type_plural) }, + @type.name] + end + end +end diff --git a/app/components/user_filter_component.rb b/app/components/user_filter_component.rb index 7c047d12d0c..42c49f8d8cb 100644 --- a/app/components/user_filter_component.rb +++ b/app/components/user_filter_component.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/components/users/auto_login_tokens/row_component.rb b/app/components/users/auto_login_tokens/row_component.rb index 640415c2af8..95c8eeabf9d 100644 --- a/app/components/users/auto_login_tokens/row_component.rb +++ b/app/components/users/auto_login_tokens/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/auto_login_tokens/table_component.rb b/app/components/users/auto_login_tokens/table_component.rb index eda17cd9ea1..11c2879d7ea 100644 --- a/app/components/users/auto_login_tokens/table_component.rb +++ b/app/components/users/auto_login_tokens/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/avatar_component.rb b/app/components/users/avatar_component.rb index df53c25f239..907f226ce73 100644 --- a/app/components/users/avatar_component.rb +++ b/app/components/users/avatar_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/settings/project_custom_fields/project_custom_field_mapping/table_component.html.erb b/app/components/users/delete_page_header_component.html.erb similarity index 85% rename from app/components/settings/project_custom_fields/project_custom_field_mapping/table_component.html.erb rename to app/components/users/delete_page_header_component.html.erb index ec555bd1f89..c96a1e014b7 100644 --- a/app/components/settings/project_custom_fields/project_custom_field_mapping/table_component.html.erb +++ b/app/components/users/delete_page_header_component.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,9 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See COPYRIGHT and LICENSE files for more details. ++#%> - -<%= component_wrapper(tag: "div", data: { turbo: true }) do %> - <%= render_parent %> -<% end %> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { t("account.delete") } + header.with_breadcrumbs(breadcrumb_items) + end +%> diff --git a/app/forms/queries/projects/form.rb b/app/components/users/delete_page_header_component.rb similarity index 61% rename from app/forms/queries/projects/form.rb rename to app/components/users/delete_page_header_component.rb index 7e2e2b954fa..e9ba1d5ff9b 100644 --- a/app/forms/queries/projects/form.rb +++ b/app/components/users/delete_page_header_component.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + # -- copyright # OpenProject is an open source project management software. # Copyright (C) 2010-2024 the OpenProject GmbH @@ -26,38 +28,25 @@ # See COPYRIGHT and LICENSE files for more details. # ++ -class Queries::Projects::Form < ApplicationForm - include OpenProject::StaticRouting::UrlHelpers +class Users::DeletePageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper - form do |query_form| - query_form.group(layout: :horizontal) do |group| - group.text_field( - visually_hide_label: true, - required: true, - autofocus: true, - name: "name", - label: ProjectQuery.human_attribute_name(:name), - placeholder: I18n.t(:"projects.lists.new.placeholder") - ) + def initialize(user:, layout:) + super + @user = user + @layout = layout + end - group.submit( - name: :submit, - label: I18n.t(:button_save), - scheme: :primary - ) - - group.button( - name: :cancel, - scheme: :secondary, - label: I18n.t(:button_cancel), - tag: :a, - href: @cancel_url - ) + def breadcrumb_items + if @layout == "my" + [{ href: my_account_path, text: t(:label_my_account) }, t("account.delete")] + else + [{ href: admin_index_path, text: t(:label_administration) }, + { href: admin_settings_users_path, text: t(:label_user_and_permission) }, + { href: users_path, text: t(:label_user_plural) }, + { href: edit_user_path(@user), text: @user.name }, + t("account.delete")] end end - - def initialize(cancel_url:) - super() - @cancel_url = cancel_url - end end diff --git a/app/components/users/edit_page_header_component.html.erb b/app/components/users/edit_page_header_component.html.erb new file mode 100644 index 00000000000..13a172ea7e2 --- /dev/null +++ b/app/components/users/edit_page_header_component.html.erb @@ -0,0 +1,100 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { @user.name } + header.with_breadcrumbs(breadcrumb_items) + + header.with_action_button(tag: :a, + mobile_icon: :person, + mobile_label: t(:label_profile), + size: :medium, + href: user_path(@user), + aria: { label: I18n.t(:label_profile) }, + title: I18n.t(:label_profile)) do |button| + button.with_leading_visual_icon(icon: :person) + t(:label_profile) + end + + if @current_user.allowed_globally?(:create_user) && @current_user.id != @user.id + header.with_action_button(tag: :a, + mobile_icon: :mail, + mobile_label: t(:label_send_invitation), + size: :medium, + href: resend_invitation_user_path(@user), + data: { method: :post }, + aria: { label: I18n.t(:label_send_invitation) }, + title: I18n.t(:tooltip_resend_invitation)) do |button| + button.with_leading_visual_icon(icon: :mail) + t(:label_send_invitation) + end + end + + if @current_user.admin? + unless @current_user.id == @user.id + iterate_user_statusses(@user) do |title, name| + header.with_action_button(tag: :a, + mobile_icon: change_user_status_icons[name], + mobile_label: title, + size: :medium, + name: name, + href: change_status_user_path(@user, { name => '' }), + data: { method: :post }, + aria: { label: title }, + title: title) do |button| + button.with_leading_visual_icon(icon: change_user_status_icons[name]) + title + end + end + end + + if Setting.users_deletable_by_admins? + header.with_action_button(tag: :a, + scheme: :danger, + mobile_icon: :trash, + mobile_label: t(:button_delete), + size: :medium, + href: deletion_info_user_path(@user), + aria: { label: I18n.t(:button_delete) }, + title: I18n.t(:button_delete)) do |button| + button.with_leading_visual_icon(icon: :trash) + t(:button_delete) + end + end + end + + header.with_tab_nav(label: nil) do |tab_nav| + @tabs.each do |tab| + tab_nav.with_tab(selected: selected_tab(@tabs) == tab, href: tab[:path]) do |t| + t.with_text { I18n.t("js.#{tab[:label]}") } + end + end + end if @tabs.present? + end +%> diff --git a/app/components/users/edit_page_header_component.rb b/app/components/users/edit_page_header_component.rb new file mode 100644 index 00000000000..5763f14db73 --- /dev/null +++ b/app/components/users/edit_page_header_component.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +class Users::EditPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + include TabsHelper + include UsersHelper + + def initialize(user:, current_user:, tabs: nil) + super + @user = user + @tabs = tabs + @current_user = current_user + end + + def breadcrumb_items + [{ href: admin_index_path, text: t("label_administration") }, + { href: admin_settings_users_path, text: t(:label_user_and_permission) }, + { href: users_path, text: t(:label_user_plural) }, + @user.name] + end +end diff --git a/app/components/users/index_page_header_component.html.erb b/app/components/users/index_page_header_component.html.erb new file mode 100644 index 00000000000..73f5aaf4244 --- /dev/null +++ b/app/components/users/index_page_header_component.html.erb @@ -0,0 +1,14 @@ +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { t(:label_user_plural) } + header.with_breadcrumbs(breadcrumb_items) + header.with_description do %> + <%= t(:label_enterprise_active_users, current: OpenProject::Enterprise.active_user_count, limit: user_limit) %> +   + <%= render(Primer::Beta::Button.new(scheme: :primary, + size: :small, + tag: :a, + href: OpenProject::Enterprise.upgrade_path, + title: t(:title_enterprise_upgrade))) { t(:button_upgrade) } %> + <% end if user_limit %> +<% end %> diff --git a/app/components/users/index_page_header_component.rb b/app/components/users/index_page_header_component.rb new file mode 100644 index 00000000000..d3376e24784 --- /dev/null +++ b/app/components/users/index_page_header_component.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +class Users::IndexPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + + def breadcrumb_items + [{ href: admin_index_path, text: t("label_administration") }, + { href: admin_settings_users_path, text: t(:label_user_and_permission) }, + t(:label_user_plural)] + end + + def user_limit + token = OpenProject::Enterprise.token + limit = token && Hash(token.restrictions)[:active_user_count] + + limit if limit && limit > 0 + end +end diff --git a/app/components/users/index_sub_header_component.html.erb b/app/components/users/index_sub_header_component.html.erb new file mode 100644 index 00000000000..017de6e8cbb --- /dev/null +++ b/app/components/users/index_sub_header_component.html.erb @@ -0,0 +1,16 @@ +<%= + render(Primer::OpenProject::SubHeader.new) do |subheader| + subheader.with_action_button(scheme: :primary, + aria: { label: I18n.t(:label_user_new) }, + title: I18n.t(:label_user_new), + tag: :a, + href: new_user_path) do |button| + button.with_leading_visual_icon(icon: :plus) + t('activerecord.models.user') + end + + subheader.with_bottom_pane_component do + render Users::UserFilterComponent.new(@params, groups: @groups, status: @status) + end + end +%> diff --git a/app/components/users/index_sub_header_component.rb b/app/components/users/index_sub_header_component.rb new file mode 100644 index 00000000000..8f4ed16d22c --- /dev/null +++ b/app/components/users/index_sub_header_component.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Users + class IndexSubHeaderComponent < ApplicationComponent + include ApplicationHelper + + def initialize(groups:, status:, params:) + super + @groups = groups + @status = status + @params = params + end + end +end diff --git a/app/components/users/profile/activities_component.rb b/app/components/users/profile/activities_component.rb index 3383f612fc1..38fc948920f 100644 --- a/app/components/users/profile/activities_component.rb +++ b/app/components/users/profile/activities_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/profile/attributes_component.html.erb b/app/components/users/profile/attributes_component.html.erb index b8ac21cadab..f6dac59e953 100644 --- a/app/components/users/profile/attributes_component.html.erb +++ b/app/components/users/profile/attributes_component.html.erb @@ -1,50 +1,34 @@ <%= - component_wrapper do - flex_layout(mt: 3) do |details_container| - details_container.with_row do - flex_layout(align_items: :center, justify_content: :space_between) do |heading| - heading.with_column(flex: 1) do - render(Primer::Beta::Heading.new(tag: :h4)) { t(:label_information) } + render(Primer::OpenProject::SidePanel::Section.new) do |section| + section.with_title { t(:label_information) } + + component_wrapper do + flex_layout do |details_container| + if @user.pref.can_expose_mail? + details_container.with_row(font_weight: :bold) do + User.human_attribute_name(:mail) end - if User.current.admin? || User.current == @user - heading.with_column do - render(Primer::Beta::IconButton.new( - icon: :gear, - scheme: :invisible, - tag: :a, - "aria-label": t(:label_manage), - href: User.current == @user ? my_account_path : edit_user_path(@user) - )) + details_container.with_row do + mail_to(escape_javascript(@user.mail), nil, encode: 'javascript') + end + end + + visible_custom_fields.each do |custom_field| + details_container.with_row(mt: 2, font_weight: :bold, test_selector: "user-custom-field") do + custom_field.name + end + + details_container.with_row do + value = @user.formatted_custom_value_for(custom_field) + if value.is_a?(Array) + safe_join(value, ", ") + else + value end end end end - - if @user.pref.can_expose_mail? - details_container.with_row(mt: 2, font_weight: :bold) do - User.human_attribute_name(:mail) - end - - details_container.with_row do - mail_to(escape_javascript(@user.mail), nil, encode: 'javascript') - end - end - - visible_custom_fields.each do |custom_field| - details_container.with_row(mt: 2, font_weight: :bold, test_selector: "user-custom-field") do - custom_field.name - end - - details_container.with_row do - value = @user.formatted_custom_value_for(custom_field) - if value.is_a?(Array) - safe_join(value, ", ") - else - value - end - end - end end end %> diff --git a/app/components/users/profile/attributes_component.rb b/app/components/users/profile/attributes_component.rb index cc065a81b3f..5470dbc83d6 100644 --- a/app/components/users/profile/attributes_component.rb +++ b/app/components/users/profile/attributes_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/profile/groups_component.html.erb b/app/components/users/profile/groups_component.html.erb index 617e88fe3ef..cf81ed045d5 100644 --- a/app/components/users/profile/groups_component.html.erb +++ b/app/components/users/profile/groups_component.html.erb @@ -1,41 +1,21 @@ <%= - component_wrapper do - flex_layout(mt: 3) do |details_container| - details_container.with_row do - flex_layout(align_items: :center, justify_content: :space_between) do |heading| - heading.with_column(flex: 1) do - flex_layout(align_items: :center) do |title| - title.with_column(mr: 2) do - render(Primer::Beta::Heading.new(tag: :h4)) { t(:label_group_plural) } - end + render(Primer::OpenProject::SidePanel::Section.new) do |section| + section.with_title { t(:label_group_plural) } + section.with_counter(count: @groups.count, scheme: :primary) - title.with_column do - render(Primer::Beta::Counter.new(count: @groups.count, scheme: :primary)) - end - end - end + if User.current.admin? + section.with_action_icon( + icon: :gear, + tag: :a, + "aria-label": t(:label_manage), + href: edit_user_path(@user, tab: :groups) + ) + end - if User.current.admin? - heading.with_column do - render(Primer::Beta::IconButton.new( - icon: :gear, - scheme: :invisible, - tag: :a, - "aria-label": t(:label_manage), - href: edit_user_path(@user, tab: :groups) - )) - end - end - end - end - - details_container.with_row(mt: 2) do - render(OpPrimer::ExpandableListComponent.new) do |list| - @groups.each do |group| - list.with_element do - helpers.avatar(group, size: :mini, hide_name: false) - end - end + render(OpPrimer::ExpandableListComponent.new) do |list| + @groups.each do |group| + list.with_element do + helpers.avatar(group, size: :mini, hide_name: false) end end end diff --git a/app/components/users/profile/groups_component.rb b/app/components/users/profile/groups_component.rb index e5795b62007..59725b66c42 100644 --- a/app/components/users/profile/groups_component.rb +++ b/app/components/users/profile/groups_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/profile/projects_component.html.erb b/app/components/users/profile/projects_component.html.erb index e34f88105de..5794a8fa877 100644 --- a/app/components/users/profile/projects_component.html.erb +++ b/app/components/users/profile/projects_component.html.erb @@ -1,44 +1,24 @@ <%= - component_wrapper do - flex_layout(mt: 3) do |details_container| - details_container.with_row do - flex_layout(align_items: :center, justify_content: :space_between) do |heading| - heading.with_column(flex: 1) do - flex_layout(align_items: :center) do |title| - title.with_column(mr: 2) do - render(Primer::Beta::Heading.new(tag: :h4)) { t(:label_project_plural) } - end + render(Primer::OpenProject::SidePanel::Section.new) do |section| + section.with_title { t(:label_project_plural) } + section.with_counter(count: @memberships.count, scheme: :primary) - title.with_column do - render(Primer::Beta::Counter.new(count: @memberships.count, scheme: :primary)) - end - end - end + if User.current.admin? + section.with_action_icon( + icon: :gear, + tag: :a, + "aria-label": t(:label_manage), + href: edit_user_path(@user, tab: :memberships) + ) + end - if User.current.admin? - heading.with_column do - render(Primer::Beta::IconButton.new( - icon: :gear, - scheme: :invisible, - tag: :a, - "aria-label": t(:label_manage), - href: edit_user_path(@user, tab: :memberships) - )) - end - end - end - end + render(OpPrimer::ExpandableListComponent.new) do |list| + @memberships.each do |membership| + list.with_element do + concat helpers.link_to_project(membership.project) - details_container.with_row(mt: 2) do - render(OpPrimer::ExpandableListComponent.new) do |list| - @memberships.each do |membership| - list.with_element do - concat helpers.link_to_project(membership.project) - - roles = membership.roles.sort.collect(&:to_s).join(', ') - concat render(Primer::Beta::Text.new(ml: 1, color: :subtle, font_size: :small)) { "(#{roles})" } - end - end + roles = membership.roles.sort.collect(&:to_s).join(', ') + concat render(Primer::Beta::Text.new(ml: 1, color: :subtle, font_size: :small)) { "(#{roles})" } end end end diff --git a/app/components/users/profile/projects_component.rb b/app/components/users/profile/projects_component.rb index 2669a8b653a..a4b65121dcd 100644 --- a/app/components/users/profile/projects_component.rb +++ b/app/components/users/profile/projects_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/profile/sidebar_component.html.erb b/app/components/users/profile/side_panel_component.html.erb similarity index 60% rename from app/components/users/profile/sidebar_component.html.erb rename to app/components/users/profile/side_panel_component.html.erb index 50298f772d0..0d426180cde 100644 --- a/app/components/users/profile/sidebar_component.html.erb +++ b/app/components/users/profile/side_panel_component.html.erb @@ -1,14 +1,12 @@ <%= component_wrapper do - render(Primer::OpenProject::BorderGrid.new(spacious: true)) do |border_grid| + render(Primer::OpenProject::SidePanel.new(spacious: true)) do |panel| [ Users::Profile::AttributesComponent.new(user: @user), Users::Profile::GroupsComponent.new(user: @user), Users::Profile::ProjectsComponent.new(user: @user) ].each do |component| - if component.render? - border_grid.with_row { render(component) } - end + panel.with_section(component) end end end diff --git a/app/components/users/profile/sidebar_component.rb b/app/components/users/profile/side_panel_component.rb similarity index 90% rename from app/components/users/profile/sidebar_component.rb rename to app/components/users/profile/side_panel_component.rb index b0509e70ded..e0ee7a61688 100644 --- a/app/components/users/profile/sidebar_component.rb +++ b/app/components/users/profile/side_panel_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,7 +28,7 @@ module Users module Profile - class SidebarComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent + class SidePanelComponent < ApplicationComponent # rubocop:disable OpenProject/AddPreviewForViewComponent include ApplicationHelper include OpTurbo::Streamable include OpPrimer::ComponentHelpers diff --git a/app/components/users/profile_component.html.erb b/app/components/users/profile_component.html.erb index 5d5336dbb70..b018104abc6 100644 --- a/app/components/users/profile_component.html.erb +++ b/app/components/users/profile_component.html.erb @@ -13,7 +13,7 @@ end content.with_sidebar(row_placement: :start, col_placement: :end) do - render(Users::Profile::SidebarComponent.new(user: @user)) + render(Users::Profile::SidePanelComponent.new(user: @user)) end end %> diff --git a/app/components/users/profile_component.rb b/app/components/users/profile_component.rb index 97912c98567..c9cc33439dd 100644 --- a/app/components/users/profile_component.rb +++ b/app/components/users/profile_component.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/row_component.rb b/app/components/users/row_component.rb index f0ce07fb7be..5b88c1c6196 100644 --- a/app/components/users/row_component.rb +++ b/app/components/users/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/sessions/row_component.rb b/app/components/users/sessions/row_component.rb index 6888306c7a7..cabe1f0ce2d 100644 --- a/app/components/users/sessions/row_component.rb +++ b/app/components/users/sessions/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/sessions/table_component.rb b/app/components/users/sessions/table_component.rb index 0abc12875df..f0adacc435d 100644 --- a/app/components/users/sessions/table_component.rb +++ b/app/components/users/sessions/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/show_page_header_component.html.erb b/app/components/users/show_page_header_component.html.erb new file mode 100644 index 00000000000..9a8ac99ceed --- /dev/null +++ b/app/components/users/show_page_header_component.html.erb @@ -0,0 +1,61 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> +<%= + render(Primer::OpenProject::PageHeader.new) do |header| + header.with_title { "#{avatar @user} #{h(@user.name)}".html_safe } + header.with_breadcrumbs(breadcrumb_items) + + if @current_user.allowed_globally?(:manage_user) + header.with_action_button(tag: :a, + mobile_icon: :pencil, + mobile_label: t(:button_edit), + size: :medium, + href: edit_user_path(@user), + aria: { label: I18n.t(:button_edit) }, + title: I18n.t(:button_edit)) do |button| + button.with_leading_visual_icon(icon: :pencil) + t(:button_edit) + end + end + + if @current_user.allowed_globally?(:create_user) && @current_user != @user + header.with_action_button(tag: :a, + mobile_icon: :mail, + mobile_label: t(:label_send_invitation), + size: :medium, + href: resend_invitation_user_path(@user), + data: { method: :post }, + aria: { label: I18n.t(:label_send_invitation) }, + title: I18n.t(:tooltip_resend_invitation)) do |button| + button.with_leading_visual_icon(icon: :mail) + t(:label_send_invitation) + end + end + end +%> diff --git a/app/components/users/show_page_header_component.rb b/app/components/users/show_page_header_component.rb new file mode 100644 index 00000000000..343e2a0d23a --- /dev/null +++ b/app/components/users/show_page_header_component.rb @@ -0,0 +1,46 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +class Users::ShowPageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + include AvatarHelper + + def initialize(user:, current_user:) + super + @user = user + @current_user = current_user + end + + def breadcrumb_items + [{ href: users_path, text: t(:label_user_plural) }, + @user.name] + end +end diff --git a/app/components/users/table_component.rb b/app/components/users/table_component.rb index cd159c89dd0..06590dbd44f 100644 --- a/app/components/users/table_component.rb +++ b/app/components/users/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/users/user_filter_component.rb b/app/components/users/user_filter_component.rb index b55cd0d1600..ed4242adfa2 100644 --- a/app/components/users/user_filter_component.rb +++ b/app/components/users/user_filter_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/versions/row_component.rb b/app/components/versions/row_component.rb index d1fb386ecca..d5f249b5be1 100644 --- a/app/components/versions/row_component.rb +++ b/app/components/versions/row_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/versions/table_component.rb b/app/components/versions/table_component.rb index bede23fbfdc..dcd3d465fbd 100644 --- a/app/components/versions/table_component.rb +++ b/app/components/versions/table_component.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/work_packages/details/tab_component.html.erb b/app/components/work_packages/details/tab_component.html.erb new file mode 100644 index 00000000000..285ff7cfc93 --- /dev/null +++ b/app/components/work_packages/details/tab_component.html.erb @@ -0,0 +1,72 @@ +<%= + flex_layout(classes: "op-work-package-details-tab-component", data: { + "application-target": "dynamic", + controller: "work-packages--details--tabs" + }) do |flex| + flex.with_column(classes: "op-work-package-details-tab-component--action") do + render(Primer::Beta::IconButton.new(icon: :"chevron-left", + tag: :a, + scheme: :invisible, + data: { + action: "click->work-packages--details--tabs#scrollLeft" + }, + aria: { label: I18n.t(:label_scroll_left) })) + end + + + flex.with_column(flex: 1, classes: "op-work-package-details-tab-component--tabs", test_selector: "wp-details-tab-component--tabs") do + render(Primer::Alpha::UnderlineNav.new(align: :left, + label: "Tabs", + data: { + "work-packages--details--tabs-target": "underlineNav", + })) do |component| + menu_items.each do |node| + component.with_tab(selected: @tab == node.name, + href: helpers.url_for_with_params(**node.url), + test_selector: "wp-details-tab-component--tab-#{node.name}", + data: { + turbo: true, + turbo_stream: true, + turbo_action: "replace", + "work-packages--details--tabs-target": @tab == node.name ? "activeElement" : "" + } + ) do |c| + c.with_text { t("js.work_packages.tabs.#{node.name}") } + count = node.badge(work_package:).to_i + c.with_counter(count:, hide_if_zero: true, id: "wp-details-tab-#{node.name}-counter", test_selector: "wp-details-tab-component--#{node.name}-counter") + end + end + end + end + + flex.with_column(classes: "op-work-package-details-tab-component--action") do + render(Primer::Beta::IconButton.new(icon: :"chevron-right", + tag: :a, + scheme: :invisible, + data: { + action: "click->work-packages--details--tabs#scrollRight" + }, + aria: { label: I18n.t(:label_scroll_right) })) + end + + flex.with_column(classes: "op-work-package-details-tab-component--action") do + render(Primer::Beta::IconButton.new(icon: :"screen-full", + tag: :a, + href: work_package_path(work_package.id, full_screen_tab), + target: "_top", + scheme: :invisible, + test_selector: "wp-details-tab-component--full-screen", + aria: { label: I18n.t("js.button_show_fullscreen") })) + end + + flex.with_column(classes: "op-work-package-details-tab-component--action") do + render(Primer::Beta::IconButton.new(icon: :x, + tag: :a, + href: base_route, + data: { turbo: true, target: "_top", turbo_action: "advance" }, + scheme: :invisible, + test_selector: "wp-details-tab-component--close", + aria: { label: I18n.t(:button_close) })) + end + end +%> diff --git a/app/components/work_packages/details/tab_component.rb b/app/components/work_packages/details/tab_component.rb new file mode 100644 index 00000000000..741792ef396 --- /dev/null +++ b/app/components/work_packages/details/tab_component.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +class WorkPackages::Details::TabComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + include Redmine::MenuManager::MenuHelper + + attr_reader :tab, :work_package, :base_route + + def initialize(work_package:, base_route:, tab: :overview) + super + + @work_package = work_package + @tab = tab.to_sym + @base_route = base_route + end + + delegate :project, to: :work_package + + def menu = :work_package_split_view + + def menu_items + @menu_items ||= + Redmine::MenuManager + .items(menu, nil) + .root + .children + .select do |node| + allowed_node?(node, User.current, project) && visible_node?(menu, node) + end + end + + def full_screen_tab + if @tab.name == "overview" + return :activity + end + + @tab.name + end +end diff --git a/app/components/work_packages/details/tab_component.sass b/app/components/work_packages/details/tab_component.sass new file mode 100644 index 00000000000..4a6fdeb4844 --- /dev/null +++ b/app/components/work_packages/details/tab_component.sass @@ -0,0 +1,19 @@ +.op-work-package-details-tab-component + align-items: flex-start + + &--tabs + flex-grow: 1 + overflow: auto + + &--action + padding-top: 8px + + // This is one of the ugliest hacks I ever had to write. Please remove that as soon as the actions are part of the Splitscreen header + padding-bottom: 7px + border-bottom: 1px solid var(--borderColor-muted) + + &:last-of-type + padding-right: 10px + + &:first-of-type + padding-left: 5px diff --git a/app/components/work_packages/details/update_counter_component.rb b/app/components/work_packages/details/update_counter_component.rb new file mode 100644 index 00000000000..48d0c64f4ce --- /dev/null +++ b/app/components/work_packages/details/update_counter_component.rb @@ -0,0 +1,50 @@ +# frozen_string_literal: true + +class WorkPackages::Details::UpdateCounterComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + + attr_reader :work_package, :menu_name + + def initialize(work_package:, menu_name:) + super + + @work_package = work_package + @menu = find_menu_item(menu_name) + end + + def call + render Primer::Beta::Counter + .new(count:, + hide_if_zero: true, + id: wrapper_key, + test_selector: "wp-details-tab-component--#{@menu.name}-counter") + end + + # We don't need a wrapper component, but wrap on the counter id + def wrapped? + true + end + + def wrapper_key + "wp-details-tab-#{@menu.name}-counter" + end + + def render? + @menu.present? + end + + def count + @menu + .badge(work_package:) + .to_i + end + + def find_menu_item(menu_name) + Redmine::MenuManager + .items(:work_package_split_view, nil) + .root + .children + .detect { |node| node.name.to_s == menu_name } + end +end diff --git a/app/components/work_packages/exports/base_export_settings_component.rb b/app/components/work_packages/exports/base_export_settings_component.rb new file mode 100644 index 00000000000..16fdbc293dd --- /dev/null +++ b/app/components/work_packages/exports/base_export_settings_component.rb @@ -0,0 +1,47 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + class BaseExportSettingsComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + include WorkPackagesHelper + + attr_reader :query + + def initialize(query) + super + + @query = query + end + end + end +end diff --git a/app/components/work_packages/exports/column_selection_component.html.erb b/app/components/work_packages/exports/column_selection_component.html.erb new file mode 100644 index 00000000000..738bef270c8 --- /dev/null +++ b/app/components/work_packages/exports/column_selection_component.html.erb @@ -0,0 +1,16 @@ +<%= helpers.angular_component_tag "opce-draggable-autocompleter", + inputs: { + id:, + name: 'columns', + dragAreaName: "#{id}_dragarea", + formControlId: "#{id}_autocompleter", + appendToComponent: true, + options: available_columns, + selected: selected_columns, + protected: protected_options, + inputCaption: caption, + inputLabel: label, + inputPlaceholder: I18n.t(:"queries.configure_view.columns.input_placeholder"), + dragAreaLabel: I18n.t(:"queries.configure_view.columns.drag_area_label"), + } +%> diff --git a/app/components/work_packages/exports/column_selection_component.rb b/app/components/work_packages/exports/column_selection_component.rb new file mode 100644 index 00000000000..e99625ca618 --- /dev/null +++ b/app/components/work_packages/exports/column_selection_component.rb @@ -0,0 +1,66 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + class ColumnSelectionComponent < ApplicationComponent + include WorkPackagesHelper + + attr_reader :query, :id, :caption, :label + + def initialize(query, id, caption, + label = I18n.t(:"queries.configure_view.columns.input_label")) + super() + + @query = query + @id = id + @caption = caption + @label = label + end + + def available_columns + query + .displayable_columns + .sort_by(&:caption) + .map { |column| { id: column.name.to_s, name: column.caption } } + end + + def protected_options + [] + end + + def selected_columns + query + .columns + .map { |column| { id: column.name.to_s, name: column.caption } } + end + end + end +end diff --git a/app/components/work_packages/exports/csv/export_settings_component.html.erb b/app/components/work_packages/exports/csv/export_settings_component.html.erb new file mode 100644 index 00000000000..dddd90a2649 --- /dev/null +++ b/app/components/work_packages/exports/csv/export_settings_component.html.erb @@ -0,0 +1,20 @@ +<%= flex_layout do |container| %> + <%= container.with_row do |_columns| %> + <%= render WorkPackages::Exports::ColumnSelectionComponent.new( + query, + "columns-select-export-csv", + I18n.t("export.dialog.columns.input_caption_table") + ) %> + <% end %> + <%= container.with_row do |_csv_include_description| %> + <%= render OpenProject::Common::DividerComponent.new %> + <%= render(Primer::Alpha::CheckBox.new( + id: "show_descriptions_csv", + name: "show_descriptions", + value: "true", + unchecked_value: "false", + label: I18n.t("export.dialog.xls.include_descriptions.label"), + caption: I18n.t("export.dialog.xls.include_descriptions.caption"), + visually_hide_label: false)) %> + <% end %> +<% end %> diff --git a/app/components/work_packages/exports/csv/export_settings_component.rb b/app/components/work_packages/exports/csv/export_settings_component.rb new file mode 100644 index 00000000000..1ca563e7dc1 --- /dev/null +++ b/app/components/work_packages/exports/csv/export_settings_component.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + module CSV + class ExportSettingsComponent < BaseExportSettingsComponent + end + end + end +end diff --git a/app/components/work_packages/exports/modal_dialog_component.html.erb b/app/components/work_packages/exports/modal_dialog_component.html.erb new file mode 100644 index 00000000000..ed2ca1c1cf7 --- /dev/null +++ b/app/components/work_packages/exports/modal_dialog_component.html.erb @@ -0,0 +1,59 @@ +<%= render(Primer::Alpha::Dialog.new( + title: I18n.t('export.dialog.title'), + size: :xlarge, + id: MODAL_ID, + data: { + "application-target": "dynamic", + controller: "work-packages--export--dialog" + } +)) do |dialog| %> + <% dialog.with_header(variant: :large) %> + <% dialog.with_body do %> + <% flex_layout do |modal_body| %> + <% modal_body.with_row do |_format| %> + <%= render(Primer::Beta::Text.new(tag: "legend", font_size: :normal, mb: 2, font_weight: :bold)) { I18n.t('export.dialog.format.label') } %> + <%= render(Primer::Alpha::SegmentedControl.new(ml: 0, "aria-label": I18n.t('export.dialog.format.label'), size: :medium)) do |component| + export_formats_settings.each do |format| + component.with_item( + label: format[:label], icon: format[:icon], selected: format[:selected], + data: { + "work-packages--export--dialog-format-param": format[:id], + action: "click:segmented-control#select click->work-packages--export--dialog#formatChanged" + }) + end + end %> + <%= render OpenProject::Common::DividerComponent.new %> + <% end %> + <% export_formats_settings.each do |format| %> + <% modal_body.with_row( + classes: format[:selected] ? nil : "d-none", + data: { format: format[:id], "work-packages--export--dialog-target": "formatTab" } + ) do |_format_tabs| %> + <%= primer_form_with( + url: export_format_url(format[:id]), + id: "#{EXPORT_FORM_ID}-#{format[:id]}", + data: { + "application-target": "dynamic", + action: "submit->work-packages--export--form#submitForm", + controller: "work-packages--export--form", + "work-packages--export--form-job-status-dialog-url-value": job_status_dialog_path('_job_uuid_') + } + ) do |form| %> + + <%= render(format[:component].new(query)) %> + <% end %> + <% end %> + <% end %> + <% end %> + <% end %> + <% dialog.with_footer do %> + <%= render(Primer::ButtonComponent.new(data: { "close-dialog-id": MODAL_ID })) { I18n.t(:button_cancel) } %> + <%= render(Primer::ButtonComponent.new( + data: { + "close-dialog-id": MODAL_ID, + "work-packages--export--dialog-target": "submit" + }, + scheme: :primary, type: :submit, + form: "#{EXPORT_FORM_ID}-#{export_formats_settings.find { |e| e[:selected] }[:id]}")) { I18n.t('export.dialog.submit') } %> + <% end %> +<% end %> diff --git a/app/components/work_packages/exports/modal_dialog_component.rb b/app/components/work_packages/exports/modal_dialog_component.rb new file mode 100644 index 00000000000..0707cb75ca6 --- /dev/null +++ b/app/components/work_packages/exports/modal_dialog_component.rb @@ -0,0 +1,75 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + class ModalDialogComponent < ApplicationComponent + MODAL_ID = "op-work-packages-export-dialog" + EXPORT_FORM_ID = "op-work-packages-export-dialog-form" + include OpTurbo::Streamable + include OpPrimer::ComponentHelpers + + attr_reader :query, :project, :query_params + + def initialize(query:, project:, title:) + super + + @query = query + @project = project + @query_params = ::API::V3::Queries::QueryParamsRepresenter.new(query).to_url_query(merge_params: { columns: [], title: }) + end + + def export_format_url(format) + if @project.nil? + index_work_packages_path(format:) + elsif @query.id.present? + project_work_packages_path(project, query_id: @query.id, format:) + else + project_work_packages_path(project, format:) + end + end + + def export_formats_settings + [ + { id: "pdf", icon: :"op-pdf", + label: I18n.t("export.dialog.format.options.pdf.label"), + component: WorkPackages::Exports::PDF::ExportSettingsComponent, + selected: true }, + { id: "xls", icon: :"op-xls", + label: I18n.t("export.dialog.format.options.xls.label"), + component: WorkPackages::Exports::XLS::ExportSettingsComponent }, + { id: "csv", icon: :"op-file-csv", + label: I18n.t("export.dialog.format.options.csv.label"), + component: WorkPackages::Exports::CSV::ExportSettingsComponent } + ] + end + end + end +end diff --git a/app/components/work_packages/exports/modal_dialog_component.sass b/app/components/work_packages/exports/modal_dialog_component.sass new file mode 100644 index 00000000000..f0c0f350355 --- /dev/null +++ b/app/components/work_packages/exports/modal_dialog_component.sass @@ -0,0 +1,3 @@ +#op-work-packages-export-dialog + .op-draggable-autocomplete--selected + padding-bottom: 0 diff --git a/app/components/work_packages/exports/pdf/export_settings_component.html.erb b/app/components/work_packages/exports/pdf/export_settings_component.html.erb new file mode 100644 index 00000000000..907171a030d --- /dev/null +++ b/app/components/work_packages/exports/pdf/export_settings_component.html.erb @@ -0,0 +1,35 @@ +<%= + flex_layout(data: { + "application-target": "dynamic", + controller: "work-packages--export--pdf--settings" + }) do |container| %> + <%= container.with_row do %> + <%= render(Primer::Alpha::RadioButtonGroup.new( + full_width: true, + name: "pdf_export_type", + label: I18n.t("export.dialog.pdf.export_type.label"))) do |component| + pdf_export_types.each do |entry| + component.radio_button(label: entry[:label], + value: entry[:value], + checked: current_pdf_export_type == entry[:value], + disabled: entry[:disabled] ? true : nil, + data: { + "work-packages--export--pdf--settings-name-param": entry[:value], + action: "work-packages--export--pdf--settings#typeChanged" + }, + caption: entry[:caption]) + end + end %> + <%= render OpenProject::Common::DividerComponent.new %> + <% end %> + <% pdf_export_types.reject { |entry| entry[:disabled] }.each do |entry| %> + <%= container.with_row( + classes: current_pdf_export_type == entry[:value] ? nil : "d-none", + data: { + "pdf-export-type": entry[:value], + "work-packages--export--pdf--settings-target": "fields" + }) do |_pdf_export_type| %> + <%= render(entry[:component].new(query)) %> + <% end %> + <% end %> +<% end %> diff --git a/app/components/work_packages/exports/pdf/export_settings_component.rb b/app/components/work_packages/exports/pdf/export_settings_component.rb new file mode 100644 index 00000000000..ab515abf3da --- /dev/null +++ b/app/components/work_packages/exports/pdf/export_settings_component.rb @@ -0,0 +1,76 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + module PDF + class ExportSettingsComponent < BaseExportSettingsComponent + def current_pdf_export_type + "table" + end + + def gantt_chart_allowed? + EnterpriseToken.allows_to?(:gantt_pdf_export) + end + + def enterprise_icon + render(Primer::Beta::Octicon.new( + icon: "op-enterprise-addons", + "aria-label": I18n.t(:label_enterprise_edition), + classes: "upsale-colored", ml: 2 + )) + end + + def gantt_chart_label + label = I18n.t("export.dialog.pdf.export_type.options.gantt.label") + gantt_chart_allowed? ? label : (label + enterprise_icon).html_safe # rubocop:disable Rails/OutputSafety + end + + def pdf_export_types + [ + { value: "table", + label: I18n.t("export.dialog.pdf.export_type.options.table.label"), + caption: I18n.t("export.dialog.pdf.export_type.options.table.caption"), + component: WorkPackages::Exports::PDF::Table::ExportSettingsComponent }, + { value: "report", + label: I18n.t("export.dialog.pdf.export_type.options.report.label"), + caption: I18n.t("export.dialog.pdf.export_type.options.report.caption"), + component: WorkPackages::Exports::PDF::Report::ExportSettingsComponent }, + { value: "gantt", + label: gantt_chart_label, + caption: I18n.t("export.dialog.pdf.export_type.options.gantt.caption"), + disabled: !gantt_chart_allowed?, + component: WorkPackages::Exports::PDF::Gantt::ExportSettingsComponent } + ] + end + end + end + end +end diff --git a/app/components/work_packages/exports/pdf/gantt/export_settings_component.html.erb b/app/components/work_packages/exports/pdf/gantt/export_settings_component.html.erb new file mode 100644 index 00000000000..3f281ca3bb5 --- /dev/null +++ b/app/components/work_packages/exports/pdf/gantt/export_settings_component.html.erb @@ -0,0 +1,18 @@ +<%= flex_layout do |container| %> + <% gantt_selects.each_with_index do |entry, index| %> + <% container.with_row(mt: index == 0 ? 0 : 3) do %> + <%= render(Primer::Alpha::Select.new( + name: entry[:name], + label: entry[:label], + caption: entry[:caption], + size: :medium, + input_width: :small, + value: entry[:options].find { |e| e[:default] }[:value]) + ) do |component| + entry[:options].each do |entry| + component.option(label: entry[:label], value: entry[:value]) + end + end %> + <% end %> + <% end %> +<% end %> diff --git a/app/components/work_packages/exports/pdf/gantt/export_settings_component.rb b/app/components/work_packages/exports/pdf/gantt/export_settings_component.rb new file mode 100644 index 00000000000..3f1a2497d10 --- /dev/null +++ b/app/components/work_packages/exports/pdf/gantt/export_settings_component.rb @@ -0,0 +1,93 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + module PDF + module Gantt + class ExportSettingsComponent < BaseExportSettingsComponent + def gantt_selects + [ + { + name: "gantt_mode", + label: I18n.t("export.dialog.pdf.gantt_zoom_levels.label"), + caption: I18n.t("export.dialog.pdf.gantt_zoom_levels.caption"), + options: gantt_zoom_levels + }, + { + name: "gantt_width", + label: I18n.t("export.dialog.pdf.column_width.label"), + options: gantt_column_widths + }, + { + name: "paper_size", + label: I18n.t("export.dialog.pdf.paper_size.label"), + caption: I18n.t("export.dialog.pdf.paper_size.caption"), + options: pdf_paper_sizes + } + ] + end + + def gantt_zoom_levels + [ + { label: t("export.dialog.pdf.gantt_zoom_levels.options.days"), value: "day", default: true }, + { label: t("export.dialog.pdf.gantt_zoom_levels.options.weeks"), value: "week" }, + { label: t("export.dialog.pdf.gantt_zoom_levels.options.months"), value: "month" }, + { label: t("export.dialog.pdf.gantt_zoom_levels.options.quarters"), value: "quarter" } + ] + end + + def gantt_column_widths + [ + { label: t("export.dialog.pdf.column_width.options.narrow"), value: "narrow" }, + { label: t("export.dialog.pdf.column_width.options.medium"), value: "medium", default: true }, + { label: t("export.dialog.pdf.column_width.options.wide"), value: "wide" }, + { label: t("export.dialog.pdf.column_width.options.very_wide"), value: "very_wide" } + ] + end + + def pdf_paper_sizes + [ + { label: "A4", value: "A4", default: true }, + { label: "A3", value: "A3" }, + { label: "A2", value: "A2" }, + { label: "A1", value: "A1" }, + { label: "A0", value: "A0" }, + { label: "Executive", value: "EXECUTIVE" }, + { label: "Folio", value: "FOLIO" }, + { label: "Letter", value: "LETTER" }, + { label: "Tabloid", value: "TABLOID" } + ] + end + end + end + end + end +end diff --git a/app/components/work_packages/exports/pdf/report/export_settings_component.html.erb b/app/components/work_packages/exports/pdf/report/export_settings_component.html.erb new file mode 100644 index 00000000000..831c9fed900 --- /dev/null +++ b/app/components/work_packages/exports/pdf/report/export_settings_component.html.erb @@ -0,0 +1,39 @@ +<%= flex_layout do |container| %> + <% container.with_row do |_columns| %> + <%= render WorkPackages::Exports::ColumnSelectionComponent.new( + query, + "columns-select-export-pdf-report", + I18n.t("export.dialog.columns.input_caption_report"), + I18n.t("export.dialog.columns.input_label_report") + ) %> + <% end %> + <% container.with_row do |_columns| %> + <%= render OpenProject::Common::DividerComponent.new %> + <%= helpers.angular_component_tag "opce-draggable-autocompleter", + inputs: { + id: "ltf-select-export-pdf-report", + name: 'long_text_fields', + dragAreaName: "ltf-select-export-pdf-report_dragarea", + formControlId: "ltf-select-export-pdf-report_autocompleter", + appendToComponent: true, + options: available_long_text_fields, + selected: selected_long_text_fields, + protected: protected_long_text_fields, + inputLabel: I18n.t(:"export.dialog.pdf.long_text_fields.input_label"), + inputCaption: I18n.t(:"export.dialog.pdf.long_text_fields.input_caption"), + inputPlaceholder: I18n.t(:"export.dialog.pdf.long_text_fields.input_placeholder"), + dragAreaLabel: I18n.t(:"export.dialog.pdf.long_text_fields.drag_area_label"), + } + %> + <% end %> + <%= container.with_row do |_pdf_report_images| %> + <%= render OpenProject::Common::DividerComponent.new %> + <%= render(Primer::Alpha::CheckBox.new(name: 'show_images', + checked: true, + value: "true", + unchecked_value: "false", + label: I18n.t("export.dialog.pdf.include_images.label"), + caption: I18n.t("export.dialog.pdf.include_images.caption"), + visually_hide_label: false)) %> + <% end %> +<% end %> diff --git a/app/components/work_packages/exports/pdf/report/export_settings_component.rb b/app/components/work_packages/exports/pdf/report/export_settings_component.rb new file mode 100644 index 00000000000..b540b3fd3ce --- /dev/null +++ b/app/components/work_packages/exports/pdf/report/export_settings_component.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + module PDF + module Report + class ExportSettingsComponent < BaseExportSettingsComponent + DESCRIPTION_CF = { id: "description", name: WorkPackage.human_attribute_name("description") }.freeze + + def available_long_text_fields + [DESCRIPTION_CF] + WorkPackageCustomField.where(field_format: "text") + .map { |cf| { id: cf.id, name: cf.name } } + end + + def selected_long_text_fields + available_long_text_fields + end + + def protected_long_text_fields + [] + end + end + end + end + end +end diff --git a/app/components/work_packages/exports/pdf/table/export_settings_component.html.erb b/app/components/work_packages/exports/pdf/table/export_settings_component.html.erb new file mode 100644 index 00000000000..40cd43cd9ee --- /dev/null +++ b/app/components/work_packages/exports/pdf/table/export_settings_component.html.erb @@ -0,0 +1,5 @@ +<%= render WorkPackages::Exports::ColumnSelectionComponent.new( + query, + "columns-select-export-pdf-table", + I18n.t("export.dialog.columns.input_caption_table") +) %> diff --git a/app/components/work_packages/exports/pdf/table/export_settings_component.rb b/app/components/work_packages/exports/pdf/table/export_settings_component.rb new file mode 100644 index 00000000000..b8020bebacd --- /dev/null +++ b/app/components/work_packages/exports/pdf/table/export_settings_component.rb @@ -0,0 +1,40 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + module PDF + module Table + class ExportSettingsComponent < BaseExportSettingsComponent + end + end + end + end +end diff --git a/app/components/work_packages/exports/xls/export_settings_component.html.erb b/app/components/work_packages/exports/xls/export_settings_component.html.erb new file mode 100644 index 00000000000..802b8fc6e67 --- /dev/null +++ b/app/components/work_packages/exports/xls/export_settings_component.html.erb @@ -0,0 +1,31 @@ +<%= flex_layout do |container| %> + <%= container.with_row do |_columns| %> + <%= render WorkPackages::Exports::ColumnSelectionComponent.new( + query, + "columns-select-export-xls", + I18n.t("export.dialog.columns.input_caption_table") + ) %> + <% end %> + <%= container.with_row do |_xls_include_relations| %> + <%= render OpenProject::Common::DividerComponent.new %> + <%= render(Primer::Alpha::CheckBox.new( + id: "show_relations_xls", + name: "show_relations", + value: "true", + unchecked_value: "false", + label: I18n.t("export.dialog.xls.include_relations.label"), + caption: I18n.t("export.dialog.xls.include_relations.caption"), + visually_hide_label: false)) %> + <% end %> + <%= container.with_row do |_xls_include_description| %> + <%= render OpenProject::Common::DividerComponent.new %> + <%= render(Primer::Alpha::CheckBox.new( + id: "show_descriptions_xls", + name: "show_descriptions", + value: "true", + unchecked_value: "false", + label: I18n.t("export.dialog.xls.include_descriptions.label"), + caption: I18n.t("export.dialog.xls.include_descriptions.caption"), + visually_hide_label: false)) %> + <% end %> +<% end %> diff --git a/app/components/work_packages/exports/xls/export_settings_component.rb b/app/components/work_packages/exports/xls/export_settings_component.rb new file mode 100644 index 00000000000..eb42c268054 --- /dev/null +++ b/app/components/work_packages/exports/xls/export_settings_component.rb @@ -0,0 +1,38 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module WorkPackages + module Exports + module XLS + class ExportSettingsComponent < BaseExportSettingsComponent + end + end + end +end diff --git a/app/components/work_packages/progress/base_modal_component.rb b/app/components/work_packages/progress/base_modal_component.rb index c80d6724f3c..c5c957751e5 100644 --- a/app/components/work_packages/progress/base_modal_component.rb +++ b/app/components/work_packages/progress/base_modal_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/work_packages/progress/status_based/modal_body_component.html.erb b/app/components/work_packages/progress/status_based/modal_body_component.html.erb index 2a4ad71215c..d1a61701022 100644 --- a/app/components/work_packages/progress/status_based/modal_body_component.html.erb +++ b/app/components/work_packages/progress/status_based/modal_body_component.html.erb @@ -13,11 +13,20 @@ ) do |f| %> <%= flex_layout do |modal_body| %> <% modal_body.with_row(classes: "FormControl-horizontalGroup--sm-vertical") do |_fields| %> + <% if OpenProject::FeatureDecisions.percent_complete_edition_active? %> <%= render(WorkPackages::ProgressForm.new(f, work_package:, mode:, focused_field:, touched_field_map:)) %> + <% else %> + <%# This condition branch to be removed in 15.0 with :percent_complete_edition feature flag removal %> + <%= render(WorkPackages::Pre144ProgressForm.new(f, + work_package:, + mode:, + focused_field:, + touched_field_map:)) %> + <% end %> <% end %> <% modal_body.with_row(mt: 3) do |_tooltip| %> diff --git a/app/components/work_packages/progress/status_based/modal_body_component.rb b/app/components/work_packages/progress/status_based/modal_body_component.rb index 6052903365c..83bba94fd04 100644 --- a/app/components/work_packages/progress/status_based/modal_body_component.rb +++ b/app/components/work_packages/progress/status_based/modal_body_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/components/work_packages/progress/work_based/modal_body_component.html.erb b/app/components/work_packages/progress/work_based/modal_body_component.html.erb index 93291f03f64..d29236da0e9 100644 --- a/app/components/work_packages/progress/work_based/modal_body_component.html.erb +++ b/app/components/work_packages/progress/work_based/modal_body_component.html.erb @@ -13,23 +13,38 @@ ) do |f| %> <%= flex_layout do |modal_body| %> <% modal_body.with_row(classes: "FormControl-horizontalGroup--sm-vertical") do |_fields| %> + <% if OpenProject::FeatureDecisions.percent_complete_edition_active? %> <%= render(WorkPackages::ProgressForm.new(f, work_package:, mode:, focused_field:, touched_field_map:)) %> - <% end %> - - <% if should_display_migration_warning? %> - <% modal_body.with_row(mt: 3) do |_migration_warning| %> - <%= render(Primer::Alpha::Banner.new) { t("work_package.progress.modal.migration_warning_text") } %> + <% else %> + <%# This condition branch to be removed in 15.0 with :percent_complete_edition feature flag removal %> + <%= render(WorkPackages::Pre144ProgressForm.new(f, + work_package:, + mode:, + focused_field:, + touched_field_map:)) %> <% end %> <% end %> - <% modal_body.with_row(mt: 3) do |_tooltip| %> - <%= render(Primer::Beta::Text.new(font_weight: :semibold)) { t("work_package.progress.label_note") } %> - <%= render(Primer::Beta::Text.new) { t("work_package.progress.modal.work_based_help_text") } %> - <%= render(Primer::Beta::Link.new(href: learn_more_href)) { t(:label_learn_more) } %> + <% if !OpenProject::FeatureDecisions.percent_complete_edition_active? %> + <%# This condition branch to be removed in 15.0 with :percent_complete_edition feature flag removal %> + <% if should_display_migration_warning? %> + <% modal_body.with_row(mt: 3) do |_migration_warning| %> + <%= render(Primer::Alpha::Banner.new) { t("work_package.progress.modal.migration_warning_text") } %> + <% end %> + <% end %> + <% end %> + + <%# This condition branch to be removed in 15.0 with :percent_complete_edition feature flag removal %> + <% unless OpenProject::FeatureDecisions.percent_complete_edition_active? %> + <% modal_body.with_row(mt: 3) do |_tooltip| %> + <%= render(Primer::Beta::Text.new(font_weight: :semibold)) { t("work_package.progress.label_note") } %> + <%= render(Primer::Beta::Text.new) { t("work_package.progress.modal.work_based_help_text_pre_14_4_without_percent_complete_edition") } %> + <%= render(Primer::Beta::Link.new(href: learn_more_href)) { t(:label_learn_more) } %> + <% end %> <% end %> <% modal_body.with_row(mt: 3) do |_actions_row| %> diff --git a/app/components/work_packages/progress/work_based/modal_body_component.rb b/app/components/work_packages/progress/work_based/modal_body_component.rb index c6d6e9c6c55..668b4613d77 100644 --- a/app/components/work_packages/progress/work_based/modal_body_component.rb +++ b/app/components/work_packages/progress/work_based/modal_body_component.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -41,11 +41,15 @@ module WorkPackages @mode = :work_based end + # This method can be safely deleted once the feature flag + # :percent_complete_edition is removed, which should happen for + # OpenProject 15.0 release. def should_display_migration_warning? + return false if OpenProject::FeatureDecisions.percent_complete_edition_active? + work_package.done_ratio.present? && work_package.estimated_hours.nil? && work_package.remaining_hours.nil? end end - # rubocop:enable OpenProject/AddPreviewForViewComponent end end diff --git a/app/components/work_packages/split_view_component.html.erb b/app/components/work_packages/split_view_component.html.erb new file mode 100644 index 00000000000..754c80dadea --- /dev/null +++ b/app/components/work_packages/split_view_component.html.erb @@ -0,0 +1,28 @@ +<%= + component_wrapper(class: "op-work-package-split-view") do + flex_layout(h: :full) do |flex| + if @work_package.nil? + flex.with_row do + render(Primer::Beta::Blankslate.new(spacious: true)) do |component| + component.with_visual_icon(icon: :inbox) + component.with_heading(tag: :h2).with_content( + I18n.t(:error_work_package_id_not_found) + ) + end + end + else + flex.with_row do + render(WorkPackages::Details::TabComponent.new(work_package: @work_package, tab: @tab, base_route: @base_route)) + end + flex.with_row(flex: 1) do + helpers.angular_component_tag "opce-wp-split-view", + inputs: { + work_package_id: @id, + resizerClass: "op-work-package-split-view", + activeTab: @tab + } + end + end + end + end +%> diff --git a/app/components/work_packages/split_view_component.rb b/app/components/work_packages/split_view_component.rb new file mode 100644 index 00000000000..26a84335524 --- /dev/null +++ b/app/components/work_packages/split_view_component.rb @@ -0,0 +1,21 @@ +# frozen_string_literal: true + +class WorkPackages::SplitViewComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include OpTurbo::Streamable + + def self.wrapper_key = :"work-package-details" + + def initialize(id:, base_route:, tab: "overview") + super + + @id = id + @tab = tab + @work_package = WorkPackage.visible.find_by(id:) + @base_route = base_route + end + + def wrapper_uniq_by + @id + end +end diff --git a/app/components/work_packages/split_view_component.sass b/app/components/work_packages/split_view_component.sass new file mode 100644 index 00000000000..c9d6fd99120 --- /dev/null +++ b/app/components/work_packages/split_view_component.sass @@ -0,0 +1,13 @@ +.op-work-package-split-view + height: 100% + min-width: 550px + justify-content: space-around + border-left: 1px solid var(--borderColor-muted) + + @media screen and (max-width: $breakpoint-lg) + // Unfortunately, we have to enforce this style via !important as the resizer writes the width directly on the element as inline style + min-width: unset !important + + @media screen and (max-width: $breakpoint-sm) + .work-packages--details-toolbar-container + @include hide-button-texts diff --git a/app/components/workflows/page_header_component.html.erb b/app/components/workflows/page_header_component.html.erb new file mode 100644 index 00000000000..8ba1be2e573 --- /dev/null +++ b/app/components/workflows/page_header_component.html.erb @@ -0,0 +1,57 @@ +<%#-- copyright +OpenProject is an open source project management software. +Copyright (C) the OpenProject GmbH + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License version 3. + +OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +Copyright (C) 2006-2013 Jean-Philippe Lang +Copyright (C) 2010-2013 the ChiliProject Team + +This program is free software; you can redistribute it and/or +modify it under the terms of the GNU General Public License +as published by the Free Software Foundation; either version 2 +of the License, or (at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + +See COPYRIGHT and LICENSE files for more details. + +++#%> + +<%= + render Primer::OpenProject::PageHeader.new do |header| + header.with_title { title } + header.with_breadcrumbs(breadcrumb_items) + + header.with_action_button(tag: :a, + mobile_icon: :copy, + mobile_label: t(:button_copy), + size: :medium, + href: copy_workflows_path, + aria: { label: I18n.t(:button_copy) }, + title: I18n.t(:button_copy)) do |button| + button.with_leading_visual_icon(icon: :copy) + t(:button_copy) + end + + header.with_action_button(tag: :a, + mobile_icon: :info, + mobile_label: t(:label_workflow_summary), + size: :medium, + href: workflows_path, + aria: { label: I18n.t(:label_workflow_summary) }, + title: I18n.t(:label_workflow_summary)) do |button| + button.with_leading_visual_icon(icon: :info) + t(:label_workflow_summary) + end + end +%> diff --git a/app/components/workflows/page_header_component.rb b/app/components/workflows/page_header_component.rb new file mode 100644 index 00000000000..0df058b70a1 --- /dev/null +++ b/app/components/workflows/page_header_component.rb @@ -0,0 +1,66 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Workflows + class PageHeaderComponent < ApplicationComponent + include OpPrimer::ComponentHelpers + include ApplicationHelper + + def initialize(state:) + super + @state = state + end + + def breadcrumb_items + base_items = [{ href: admin_index_path, text: t("label_administration") }, + { href: admin_settings_work_packages_general_path, text: t(:label_work_package_plural) }, + title] + + if @state == :edit + base_items + else + base_items.insert(2, { href: edit_workflows_path, text: t(:label_workflow) }) + end + end + + def title + case @state + when :show + t(:label_workflow_summary) + when :copy + t(:label_workflow_copy) + when :edit + Workflow.model_name.human + else + t(:label_workflow_plural) + end + end + end +end diff --git a/app/contracts/admin_only_contract.rb b/app/contracts/admin_only_contract.rb index 5d7ae4e6596..31d2c8ada50 100644 --- a/app/contracts/admin_only_contract.rb +++ b/app/contracts/admin_only_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/api_tokens/create_contract.rb b/app/contracts/api_tokens/create_contract.rb index e95a33640df..f9c3d93484f 100644 --- a/app/contracts/api_tokens/create_contract.rb +++ b/app/contracts/api_tokens/create_contract.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/attachments/create_contract.rb b/app/contracts/attachments/create_contract.rb index d4f8b48acc4..2ec0d41d3fe 100644 --- a/app/contracts/attachments/create_contract.rb +++ b/app/contracts/attachments/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/attachments/delete_contract.rb b/app/contracts/attachments/delete_contract.rb index 63f4a375a19..f2b44344f86 100644 --- a/app/contracts/attachments/delete_contract.rb +++ b/app/contracts/attachments/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/attachments/prepare_upload_contract.rb b/app/contracts/attachments/prepare_upload_contract.rb index 5a54cfac194..82233d7ed30 100644 --- a/app/contracts/attachments/prepare_upload_contract.rb +++ b/app/contracts/attachments/prepare_upload_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/attachments/validate_replacements.rb b/app/contracts/attachments/validate_replacements.rb index 7bbc91d763b..c337f9b6310 100644 --- a/app/contracts/attachments/validate_replacements.rb +++ b/app/contracts/attachments/validate_replacements.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/attribute_help_texts/base_contract.rb b/app/contracts/attribute_help_texts/base_contract.rb index 6e6bbaafd60..8ca51da254b 100644 --- a/app/contracts/attribute_help_texts/base_contract.rb +++ b/app/contracts/attribute_help_texts/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/attribute_help_texts/create_contract.rb b/app/contracts/attribute_help_texts/create_contract.rb index 286bbe0b189..4d0280934ef 100644 --- a/app/contracts/attribute_help_texts/create_contract.rb +++ b/app/contracts/attribute_help_texts/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/attribute_help_texts/update_contract.rb b/app/contracts/attribute_help_texts/update_contract.rb index eb259eb02f4..7420a63aa9e 100644 --- a/app/contracts/attribute_help_texts/update_contract.rb +++ b/app/contracts/attribute_help_texts/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/authentication/omniauth_auth_hash_contract.rb b/app/contracts/authentication/omniauth_auth_hash_contract.rb index ba0b257f176..120c78c8fb1 100644 --- a/app/contracts/authentication/omniauth_auth_hash_contract.rb +++ b/app/contracts/authentication/omniauth_auth_hash_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/backups/create_contract.rb b/app/contracts/backups/create_contract.rb index 17bc328d8a4..3cd6ec347eb 100644 --- a/app/contracts/backups/create_contract.rb +++ b/app/contracts/backups/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/base_contract.rb b/app/contracts/base_contract.rb index f7f78b7a129..6e91a78285c 100644 --- a/app/contracts/base_contract.rb +++ b/app/contracts/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -50,7 +50,7 @@ class BaseContract < Disposable::Twin end def writable_conditions - @writable_conditions ||= [] + @writable_conditions ||= {} end def attribute_permissions @@ -102,16 +102,13 @@ class BaseContract < Disposable::Twin def add_writable(attribute, writable) attribute_name = attribute.to_s.delete_suffix("_id") + writable_conditions[attribute_name] = writable - unless writable == false - writable_attributes << attribute_name - # allow the _id variant as well - writable_attributes << "#{attribute_name}_id" - end + return if writable == false - if writable.respond_to?(:call) - writable_conditions << [attribute_name, writable] - end + writable_attributes << attribute_name + # allow the _id variant as well + writable_attributes << "#{attribute_name}_id" end end @@ -229,18 +226,7 @@ class BaseContract < Disposable::Twin end def collect_available_custom_field_attributes - if model.is_a?(Project) - # required because project custom fields are now activated on a per-project basis - # - # if we wouldn't query available_custom field on a global level here, - # implicitly enabling project custom fields through this contract would fail - # as the disabled custom fields would be treated as not-writable - # - # relevant especially for the project API - model.all_available_custom_fields.map(&:attribute_name) - else - model.available_custom_fields.map(&:attribute_name) - end + model.available_custom_fields.map(&:attribute_name) end def reduce_writable_attributes(attributes) @@ -250,7 +236,8 @@ class BaseContract < Disposable::Twin def reduce_by_writable_conditions(attributes) collect_ancestor_attributes(:writable_conditions).each do |attribute, condition| - attributes -= [attribute, "#{attribute}_id"] unless instance_exec(&condition) + condition = !!instance_exec(&condition) if condition.respond_to?(:call) + attributes -= [attribute, "#{attribute}_id"] if condition == false end attributes diff --git a/app/contracts/concerns/admin_writable_timestamps.rb b/app/contracts/concerns/admin_writable_timestamps.rb index 8a83ee22eb8..96e5a5fe049 100644 --- a/app/contracts/concerns/admin_writable_timestamps.rb +++ b/app/contracts/concerns/admin_writable_timestamps.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/concerns/assignable_custom_field_values.rb b/app/contracts/concerns/assignable_custom_field_values.rb index 133f1ecbf6f..efd0be250c4 100644 --- a/app/contracts/concerns/assignable_custom_field_values.rb +++ b/app/contracts/concerns/assignable_custom_field_values.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/concerns/requires_admin_guard.rb b/app/contracts/concerns/requires_admin_guard.rb index b01feb96064..133ac24d0bb 100644 --- a/app/contracts/concerns/requires_admin_guard.rb +++ b/app/contracts/concerns/requires_admin_guard.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/concerns/requires_enterprise_guard.rb b/app/contracts/concerns/requires_enterprise_guard.rb index 06e13acdb56..72f7f90196d 100644 --- a/app/contracts/concerns/requires_enterprise_guard.rb +++ b/app/contracts/concerns/requires_enterprise_guard.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/concerns/single_table_inheritance_model_contract.rb b/app/contracts/concerns/single_table_inheritance_model_contract.rb index dcc27099694..e98417de527 100644 --- a/app/contracts/concerns/single_table_inheritance_model_contract.rb +++ b/app/contracts/concerns/single_table_inheritance_model_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/concerns/unchanged_project.rb b/app/contracts/concerns/unchanged_project.rb index 6ec6e48fba6..c47cb3930d8 100644 --- a/app/contracts/concerns/unchanged_project.rb +++ b/app/contracts/concerns/unchanged_project.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/custom_actions/cu_contract.rb b/app/contracts/custom_actions/cu_contract.rb index 3fac14a8618..0f789b0043c 100644 --- a/app/contracts/custom_actions/cu_contract.rb +++ b/app/contracts/custom_actions/cu_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/custom_actions/execute_contract.rb b/app/contracts/custom_actions/execute_contract.rb index 08c29a66a59..e1857c2facb 100644 --- a/app/contracts/custom_actions/execute_contract.rb +++ b/app/contracts/custom_actions/execute_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/custom_fields/base_contract.rb b/app/contracts/custom_fields/base_contract.rb index 9cb68cc1bcb..6648bfc213b 100644 --- a/app/contracts/custom_fields/base_contract.rb +++ b/app/contracts/custom_fields/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -42,7 +42,7 @@ module CustomFields attribute :possible_values attribute :regexp attribute :searchable - attribute :visible + attribute :admin_only attribute :default_value attribute :possible_values attribute :multi_value diff --git a/app/contracts/custom_fields/create_contract.rb b/app/contracts/custom_fields/create_contract.rb index e12a3014174..bff22d66aaa 100644 --- a/app/contracts/custom_fields/create_contract.rb +++ b/app/contracts/custom_fields/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/custom_fields/custom_field_projects/base_contract.rb b/app/contracts/custom_fields/custom_field_projects/base_contract.rb new file mode 100644 index 00000000000..d2d260d1111 --- /dev/null +++ b/app/contracts/custom_fields/custom_field_projects/base_contract.rb @@ -0,0 +1,52 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module CustomFields + module CustomFieldProjects + class BaseContract < ::ModelContract + attribute :project_id + attribute :custom_field_id + + validate :select_custom_fields_permission + validate :not_for_all + + def select_custom_fields_permission + return if user.allowed_in_project?(:select_custom_fields, model.project) + + errors.add :base, :error_unauthorized + end + + def not_for_all + # Only mappings of custom fields which are not enabled for all projects can be manipulated by the user + return if model.custom_field.nil? || !model.custom_field.is_for_all? + + errors.add :custom_field_id, :is_for_all_cannot_modify + end + end + end +end diff --git a/app/contracts/custom_fields/custom_field_projects/update_contract.rb b/app/contracts/custom_fields/custom_field_projects/update_contract.rb new file mode 100644 index 00000000000..cfbf9dcccaf --- /dev/null +++ b/app/contracts/custom_fields/custom_field_projects/update_contract.rb @@ -0,0 +1,34 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module CustomFields + module CustomFieldProjects + class UpdateContract < BaseContract + end + end +end diff --git a/app/contracts/custom_fields/update_contract.rb b/app/contracts/custom_fields/update_contract.rb index 6e7df4fd813..2355526cb92 100644 --- a/app/contracts/custom_fields/update_contract.rb +++ b/app/contracts/custom_fields/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/delete_contract.rb b/app/contracts/delete_contract.rb index 3218035e82b..d8f06edc14e 100644 --- a/app/contracts/delete_contract.rb +++ b/app/contracts/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/empty_contract.rb b/app/contracts/empty_contract.rb index f9790809b26..e30af014c52 100644 --- a/app/contracts/empty_contract.rb +++ b/app/contracts/empty_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/groups/base_contract.rb b/app/contracts/groups/base_contract.rb index ee0309e789d..4c13c77b7d6 100644 --- a/app/contracts/groups/base_contract.rb +++ b/app/contracts/groups/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/groups/create_contract.rb b/app/contracts/groups/create_contract.rb index af3eb12b13a..4c87f23a296 100644 --- a/app/contracts/groups/create_contract.rb +++ b/app/contracts/groups/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/groups/delete_contract.rb b/app/contracts/groups/delete_contract.rb index 628f9f90f20..8e89d0ae7a5 100644 --- a/app/contracts/groups/delete_contract.rb +++ b/app/contracts/groups/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/groups/update_contract.rb b/app/contracts/groups/update_contract.rb index e724972b80a..422812527d3 100644 --- a/app/contracts/groups/update_contract.rb +++ b/app/contracts/groups/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/journals/update_contract.rb b/app/contracts/journals/update_contract.rb index 85fba341370..8847cfc8dcc 100644 --- a/app/contracts/journals/update_contract.rb +++ b/app/contracts/journals/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/members/base_contract.rb b/app/contracts/members/base_contract.rb index 040a3bd5bec..5c83da04079 100644 --- a/app/contracts/members/base_contract.rb +++ b/app/contracts/members/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/members/create_contract.rb b/app/contracts/members/create_contract.rb index 27f616eb10d..96c3e90ad37 100644 --- a/app/contracts/members/create_contract.rb +++ b/app/contracts/members/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/members/delete_contract.rb b/app/contracts/members/delete_contract.rb index 4d71ee1fe30..f876029feaa 100644 --- a/app/contracts/members/delete_contract.rb +++ b/app/contracts/members/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/members/update_contract.rb b/app/contracts/members/update_contract.rb index f3b966cb1e5..2d510e59c60 100644 --- a/app/contracts/members/update_contract.rb +++ b/app/contracts/members/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/messages/base_contract.rb b/app/contracts/messages/base_contract.rb index fe89acf761b..bad7a1c6b73 100644 --- a/app/contracts/messages/base_contract.rb +++ b/app/contracts/messages/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/messages/create_contract.rb b/app/contracts/messages/create_contract.rb index 6d70d0de526..14728f35ab8 100644 --- a/app/contracts/messages/create_contract.rb +++ b/app/contracts/messages/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/messages/update_contract.rb b/app/contracts/messages/update_contract.rb index db2a8508b75..0c8f17dd082 100644 --- a/app/contracts/messages/update_contract.rb +++ b/app/contracts/messages/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/model_contract.rb b/app/contracts/model_contract.rb index 07ba44ffd92..efa06281f33 100644 --- a/app/contracts/model_contract.rb +++ b/app/contracts/model_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/news/base_contract.rb b/app/contracts/news/base_contract.rb index 7d6325f0e9e..91bc9925bb0 100644 --- a/app/contracts/news/base_contract.rb +++ b/app/contracts/news/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/news/create_contract.rb b/app/contracts/news/create_contract.rb index 9a0274c5954..31ed015811a 100644 --- a/app/contracts/news/create_contract.rb +++ b/app/contracts/news/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/news/delete_contract.rb b/app/contracts/news/delete_contract.rb index 42648cce9ab..808f2ed73d6 100644 --- a/app/contracts/news/delete_contract.rb +++ b/app/contracts/news/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/news/update_contract.rb b/app/contracts/news/update_contract.rb index 04bb5fef4bf..3967f463f2e 100644 --- a/app/contracts/news/update_contract.rb +++ b/app/contracts/news/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/notifications/create_contract.rb b/app/contracts/notifications/create_contract.rb index 712884a2b82..0e448aa1735 100644 --- a/app/contracts/notifications/create_contract.rb +++ b/app/contracts/notifications/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -31,7 +31,6 @@ module Notifications attribute :recipient attribute :subject attribute :reason - attribute :project attribute :actor attribute :resource attribute :journal diff --git a/app/components/oauth/applications/row_component.rb b/app/contracts/oauth/applications/base_contract.rb similarity index 54% rename from app/components/oauth/applications/row_component.rb rename to app/contracts/oauth/applications/base_contract.rb index 70b598eac26..fac8b49b187 100644 --- a/app/components/oauth/applications/row_component.rb +++ b/app/contracts/oauth/applications/base_contract.rb @@ -1,5 +1,3 @@ -# frozen_string_literal: true - #-- copyright # OpenProject is an open source project management software. # Copyright (C) 2012-2024 the OpenProject GmbH @@ -30,51 +28,46 @@ module OAuth module Applications - class RowComponent < ::RowComponent - property :confidential - - def application - model + class BaseContract < ::ModelContract + def self.model + ::Doorkeeper::Application end - def name - link_to application.name, oauth_application_path(application) + validate :validate_client_credential_user + validate :validate_integration + validate :validate_admin_only + + attribute :enabled + attribute :name + attribute :redirect_uri + attribute :confidential + attribute :owner_id + attribute :owner_type + attribute :scopes + attribute :client_credentials_user_id + attribute :integration_id + attribute :integration_type + + private + + def validate_admin_only + errors.add :base, :error_unauthorized unless user.admin? end - def owner - link_to application.owner.name, user_path(application.owner) + def validate_integration + both = model.integration_id.present? && model.integration_type.present? + none = model.integration_id.nil? && model.integration_type.nil? + + errors.add :integration, :invalid unless both || none end - def confidential - if application.confidential? - helpers.op_icon "icon icon-checkmark" + def validate_client_credential_user + return if model.client_credentials_user_id.blank? + + unless User.exists?(id: model.client_credentials_user_id) + errors.add :client_credentials_user_id, :invalid end end - - def redirect_uri - urls = application.redirect_uri.split("\n") - safe_join urls, "
    ".html_safe - end - - def client_credentials - if user_id = application.client_credentials_user_id - helpers.link_to_user User.find(user_id) - else - "-" - end - end - - def edit_link - link_to( - I18n.t(:button_edit), - edit_oauth_application_path(application), - class: "oauth-application--edit-link icon icon-edit" - ) - end - - def button_links - [edit_link, helpers.delete_link(oauth_application_path(application))] - end end end end diff --git a/app/contracts/oauth/applications/create_contract.rb b/app/contracts/oauth/applications/create_contract.rb new file mode 100644 index 00000000000..947cea0ac3c --- /dev/null +++ b/app/contracts/oauth/applications/create_contract.rb @@ -0,0 +1,46 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OAuth + module Applications + class CreateContract < BaseContract + attribute :builtin + attribute :uid + + validate :validate_owner_present + + private + + def validate_owner_present + if model.owner.blank? + errors.add(:owner, :blank) + end + end + end + end +end diff --git a/app/contracts/oauth/applications/delete_contract.rb b/app/contracts/oauth/applications/delete_contract.rb new file mode 100644 index 00000000000..1d7ce6f5dab --- /dev/null +++ b/app/contracts/oauth/applications/delete_contract.rb @@ -0,0 +1,35 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OAuth + module Applications + class DeleteContract < ::DeleteContract + delete_permission -> { !model.builtin? && user.admin? } + end + end +end diff --git a/app/contracts/oauth/applications/update_contract.rb b/app/contracts/oauth/applications/update_contract.rb new file mode 100644 index 00000000000..48f436d14fe --- /dev/null +++ b/app/contracts/oauth/applications/update_contract.rb @@ -0,0 +1,41 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OAuth + module Applications + class UpdateContract < BaseContract + validate :application_is_not_builtin + + def application_is_not_builtin + if model.builtin? + errors.add(:base, :unchangeable) + end + end + end + end +end diff --git a/app/contracts/oauth_clients/create_contract.rb b/app/contracts/oauth_clients/create_contract.rb index ddfcc19866f..404436c4a1a 100644 --- a/app/contracts/oauth_clients/create_contract.rb +++ b/app/contracts/oauth_clients/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/oauth_clients/delete_contract.rb b/app/contracts/oauth_clients/delete_contract.rb index 4fbdc22fea5..5465d115716 100644 --- a/app/contracts/oauth_clients/delete_contract.rb +++ b/app/contracts/oauth_clients/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/params_contract.rb b/app/contracts/params_contract.rb index 575f302d922..bf6cd7b98a6 100644 --- a/app/contracts/params_contract.rb +++ b/app/contracts/params_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/placeholder_users/base_contract.rb b/app/contracts/placeholder_users/base_contract.rb index cff24d7d52f..ce6895ed87f 100644 --- a/app/contracts/placeholder_users/base_contract.rb +++ b/app/contracts/placeholder_users/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/placeholder_users/create_contract.rb b/app/contracts/placeholder_users/create_contract.rb index 308b7750fd9..5e8d35078cc 100644 --- a/app/contracts/placeholder_users/create_contract.rb +++ b/app/contracts/placeholder_users/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/placeholder_users/delete_contract.rb b/app/contracts/placeholder_users/delete_contract.rb index 1767521a678..a0c8d3f8602 100644 --- a/app/contracts/placeholder_users/delete_contract.rb +++ b/app/contracts/placeholder_users/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/placeholder_users/update_contract.rb b/app/contracts/placeholder_users/update_contract.rb index 83d4bb61580..053e7ba62b4 100644 --- a/app/contracts/placeholder_users/update_contract.rb +++ b/app/contracts/placeholder_users/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/project_custom_field_project_mappings/base_contract.rb b/app/contracts/project_custom_field_project_mappings/base_contract.rb index 0ed19cf6d5a..5c03a5053df 100644 --- a/app/contracts/project_custom_field_project_mappings/base_contract.rb +++ b/app/contracts/project_custom_field_project_mappings/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -52,7 +52,8 @@ module ProjectCustomFieldProjectMappings def visbile_to_user # "invisible" custom fields can only be seen and edited by admins # using visible scope to check if the custom field is actually visible to the user - return if model.project_custom_field.nil? || ProjectCustomField.visible.pluck(:id).include?(model.project_custom_field.id) + return if model.project_custom_field.nil? || + ProjectCustomField.visible(user).pluck(:id).include?(model.project_custom_field.id) errors.add :custom_field_id, :invalid end diff --git a/app/contracts/project_custom_field_project_mappings/update_contract.rb b/app/contracts/project_custom_field_project_mappings/update_contract.rb index 66140ecdf98..c44b887e72d 100644 --- a/app/contracts/project_custom_field_project_mappings/update_contract.rb +++ b/app/contracts/project_custom_field_project_mappings/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/project_custom_field_sections/base_contract.rb b/app/contracts/project_custom_field_sections/base_contract.rb index 951c64d1e39..0ab59477de4 100644 --- a/app/contracts/project_custom_field_sections/base_contract.rb +++ b/app/contracts/project_custom_field_sections/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/project_custom_field_sections/create_contract.rb b/app/contracts/project_custom_field_sections/create_contract.rb index 91e44c3aaec..94041c62496 100644 --- a/app/contracts/project_custom_field_sections/create_contract.rb +++ b/app/contracts/project_custom_field_sections/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/project_custom_field_sections/delete_contract.rb b/app/contracts/project_custom_field_sections/delete_contract.rb index 3b5e38d4930..e1a639e5940 100644 --- a/app/contracts/project_custom_field_sections/delete_contract.rb +++ b/app/contracts/project_custom_field_sections/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/project_custom_field_sections/update_contract.rb b/app/contracts/project_custom_field_sections/update_contract.rb index 85960355c76..e77e9080cfe 100644 --- a/app/contracts/project_custom_field_sections/update_contract.rb +++ b/app/contracts/project_custom_field_sections/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/projects/archive_contract.rb b/app/contracts/projects/archive_contract.rb index 7c719d255a2..d315f3257b1 100644 --- a/app/contracts/projects/archive_contract.rb +++ b/app/contracts/projects/archive_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/projects/base_contract.rb b/app/contracts/projects/base_contract.rb index a894a0e2ffe..8b8fa191161 100644 --- a/app/contracts/projects/base_contract.rb +++ b/app/contracts/projects/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -67,7 +67,7 @@ module Projects if user.admin? model.available_custom_fields else - model.available_custom_fields.select(&:visible?) + model.available_custom_fields.reject(&:admin_only?) end end @@ -77,6 +77,20 @@ module Projects Project.status_codes.keys end + protected + + def collect_available_custom_field_attributes + # required because project custom fields are now activated on a per-project basis + # + # if we wouldn't query available_custom field on a global level here, + # implicitly enabling project custom fields through this contract would fail + # as the disabled custom fields would be treated as not-writable + # + # relevant especially for the project API + + model.all_available_custom_fields.map(&:attribute_name) + end + private def validate_parent_assignable diff --git a/app/contracts/projects/copy_contract.rb b/app/contracts/projects/copy_contract.rb index 205789fac64..a6bd24c1790 100644 --- a/app/contracts/projects/copy_contract.rb +++ b/app/contracts/projects/copy_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/projects/create_contract.rb b/app/contracts/projects/create_contract.rb index 78b38a775c7..0898ebe2a19 100644 --- a/app/contracts/projects/create_contract.rb +++ b/app/contracts/projects/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -33,8 +33,35 @@ module Projects # so allowing writing here would be useless. allow_writable_timestamps :created_at + def writable_attributes + if allowed_to_write_custom_fields? + super + else + without_custom_fields(super) + end + end + + protected + + def collect_available_custom_field_attributes + model.all_visible_custom_fields.map(&:attribute_name) + end + private + def allowed_to_write_custom_fields? + # Writable attributes are already restricted based on their visibility in the + # ProjectCustomField.visible scope. Here it is enough to check whether the user + # has permission to copy_projects or edit_project_attributes in any project. + user.admin? || + user.allowed_globally?(:add_project) || + (model.parent && user.allowed_in_project?(:add_subprojects, model.parent)) || + user.allowed_in_any_project?(:copy_projects) || + user.allowed_in_any_project?(:edit_project_attributes) + end + + def without_custom_fields(changes) = changes.grep_v(/^custom_field_/) + def validate_user_allowed_to_manage unless user.allowed_globally?(:add_project) || (model.parent && user.allowed_in_project?(:add_subprojects, model.parent)) diff --git a/app/contracts/projects/delete_contract.rb b/app/contracts/projects/delete_contract.rb index 1f80d3ee0fd..9ad4965e650 100644 --- a/app/contracts/projects/delete_contract.rb +++ b/app/contracts/projects/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/projects/enabled_modules_contract.rb b/app/contracts/projects/enabled_modules_contract.rb index 864caf4f007..2c54e33d948 100644 --- a/app/contracts/projects/enabled_modules_contract.rb +++ b/app/contracts/projects/enabled_modules_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/projects/settings_contract.rb b/app/contracts/projects/settings_contract.rb index 940f4d95521..dfce7ff07aa 100644 --- a/app/contracts/projects/settings_contract.rb +++ b/app/contracts/projects/settings_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/projects/unarchive_contract.rb b/app/contracts/projects/unarchive_contract.rb index 53ec5e9b918..1f87505a076 100644 --- a/app/contracts/projects/unarchive_contract.rb +++ b/app/contracts/projects/unarchive_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/projects/update_contract.rb b/app/contracts/projects/update_contract.rb index 471a55e86fb..7fafe5277d8 100644 --- a/app/contracts/projects/update_contract.rb +++ b/app/contracts/projects/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,11 +28,46 @@ module Projects class UpdateContract < BaseContract + def writable_attributes + if allow_project_attributes_only + with_custom_fields_only(super) + elsif allow_edit_attributes_only + without_custom_fields(super) + elsif allow_all_attributes + super + else + [] + end + end + private + def project_attributes_only = options[:project_attributes_only].present? + + def edit_project = user.allowed_in_project?(:edit_project, model) + + def edit_project_attributes = user.allowed_in_project?(:edit_project_attributes, model) + + def allow_edit_attributes_only = edit_project && !project_attributes_only && !edit_project_attributes + + def allow_project_attributes_only + edit_project_attributes && (project_attributes_only || !edit_project) + end + + def allow_all_attributes + (edit_project && edit_project_attributes && !project_attributes_only) || + (changed_by_user == ["active"]) # Allow archiving, permission checked in manage_permission + end + + def without_custom_fields(changes) = changes.grep_v(/^custom_field_/) + + def with_custom_fields_only(changes) = changes.grep(/^custom_field_/) + def manage_permission if changed_by_user == ["active"] :archive_project + elsif project_attributes_only + :edit_project_attributes else # if "active" is changed, :archive_project permission will also be # checked in `Projects::BaseContract#validate_changing_active` diff --git a/app/contracts/queries/base_contract.rb b/app/contracts/queries/base_contract.rb index 49418dd3187..f1b79d81909 100644 --- a/app/contracts/queries/base_contract.rb +++ b/app/contracts/queries/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/copy_contract.rb b/app/contracts/queries/copy_contract.rb index c184b13b43f..84d99d74335 100644 --- a/app/contracts/queries/copy_contract.rb +++ b/app/contracts/queries/copy_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/create_contract.rb b/app/contracts/queries/create_contract.rb index 32218baf5c7..560681b1856 100644 --- a/app/contracts/queries/create_contract.rb +++ b/app/contracts/queries/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/ical_sharing_contract.rb b/app/contracts/queries/ical_sharing_contract.rb index 58390a9d0c0..c2085b28f27 100644 --- a/app/contracts/queries/ical_sharing_contract.rb +++ b/app/contracts/queries/ical_sharing_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/projects/project_queries/base_contract.rb b/app/contracts/queries/projects/project_queries/base_contract.rb index a98d9fa807c..e4f0edd6f26 100644 --- a/app/contracts/queries/projects/project_queries/base_contract.rb +++ b/app/contracts/queries/projects/project_queries/base_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -42,7 +42,8 @@ module Queries::Projects::ProjectQueries length: { maximum: 255 } validate :name_select_included - validate :existing_selects + # When we only changed the name, we don't need to validate the selects + validate :existing_selects, unless: :only_changed_name? validate :user_is_logged_in validate :allowed_to_modify_private_query validate :allowed_to_modify_public_query @@ -57,18 +58,18 @@ module Queries::Projects::ProjectQueries def allowed_to_modify_private_query return if model.public? + return if model.user == user + return if user.allowed_in_project_query?(:edit_project_query, model) - if model.user != user - errors.add :base, :can_only_be_modified_by_owner - end + errors.add :base, :can_only_be_modified_by_owner end def allowed_to_modify_public_query return unless model.public? + return if user.allowed_in_project_query?(:edit_project_query, model) + return if user.allowed_globally?(:manage_public_project_queries) - unless user.allowed_globally?(:manage_public_project_queries) - errors.add :base, :need_permission_to_modify_public_query - end + errors.add :base, :need_permission_to_modify_public_query end def name_select_included @@ -82,5 +83,9 @@ module Queries::Projects::ProjectQueries errors.add :selects, :nonexistent, column: s.attribute end end + + def only_changed_name? + model.changed == ["name"] + end end end diff --git a/app/contracts/queries/projects/project_queries/create_contract.rb b/app/contracts/queries/projects/project_queries/create_contract.rb index f4b66999b43..be862966c71 100644 --- a/app/contracts/queries/projects/project_queries/create_contract.rb +++ b/app/contracts/queries/projects/project_queries/create_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/projects/project_queries/delete_contract.rb b/app/contracts/queries/projects/project_queries/delete_contract.rb index 30deba66b35..2b149f6dce8 100644 --- a/app/contracts/queries/projects/project_queries/delete_contract.rb +++ b/app/contracts/queries/projects/project_queries/delete_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/projects/project_queries/loading_contract.rb b/app/contracts/queries/projects/project_queries/loading_contract.rb index 5c4eff0aa06..5a46646e684 100644 --- a/app/contracts/queries/projects/project_queries/loading_contract.rb +++ b/app/contracts/queries/projects/project_queries/loading_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/projects/project_queries/publish_contract.rb b/app/contracts/queries/projects/project_queries/publish_contract.rb index 98a9fe2844c..470b59089a8 100644 --- a/app/contracts/queries/projects/project_queries/publish_contract.rb +++ b/app/contracts/queries/projects/project_queries/publish_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/projects/project_queries/update_contract.rb b/app/contracts/queries/projects/project_queries/update_contract.rb index 82e6479a947..ca0985f819b 100644 --- a/app/contracts/queries/projects/project_queries/update_contract.rb +++ b/app/contracts/queries/projects/project_queries/update_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/update_contract.rb b/app/contracts/queries/update_contract.rb index c098a53d1ce..3b5694d4e7c 100644 --- a/app/contracts/queries/update_contract.rb +++ b/app/contracts/queries/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/queries/update_form_contract.rb b/app/contracts/queries/update_form_contract.rb index 8f2805706d7..fea2e00c6c3 100644 --- a/app/contracts/queries/update_form_contract.rb +++ b/app/contracts/queries/update_form_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/relations/base_contract.rb b/app/contracts/relations/base_contract.rb index 24b9b23e0ce..82c4d5edc2e 100644 --- a/app/contracts/relations/base_contract.rb +++ b/app/contracts/relations/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/relations/create_contract.rb b/app/contracts/relations/create_contract.rb index fe139dfa70b..b65e7b50c8f 100644 --- a/app/contracts/relations/create_contract.rb +++ b/app/contracts/relations/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/relations/delete_contract.rb b/app/contracts/relations/delete_contract.rb index 9a266dabc66..e018c567196 100644 --- a/app/contracts/relations/delete_contract.rb +++ b/app/contracts/relations/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/relations/update_contract.rb b/app/contracts/relations/update_contract.rb index 4551c9bed4f..78be6df8ff6 100644 --- a/app/contracts/relations/update_contract.rb +++ b/app/contracts/relations/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/roles/base_contract.rb b/app/contracts/roles/base_contract.rb index 7f207b69f0e..7fc489a910f 100644 --- a/app/contracts/roles/base_contract.rb +++ b/app/contracts/roles/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -43,7 +43,7 @@ module Roles else assignable_member_permissions end.reject do |permission| - !keep_public && permission.public? + (!keep_public && permission.public?) || permission.hidden? end end diff --git a/app/contracts/roles/create_contract.rb b/app/contracts/roles/create_contract.rb index 076d7774501..f09d2fb6fce 100644 --- a/app/contracts/roles/create_contract.rb +++ b/app/contracts/roles/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/roles/delete_contract.rb b/app/contracts/roles/delete_contract.rb index 3bd499fad3f..e80919fca5d 100644 --- a/app/contracts/roles/delete_contract.rb +++ b/app/contracts/roles/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/roles/update_contract.rb b/app/contracts/roles/update_contract.rb index d0fdbc44a15..49d6c19c394 100644 --- a/app/contracts/roles/update_contract.rb +++ b/app/contracts/roles/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/settings/update_contract.rb b/app/contracts/settings/update_contract.rb index a78c3dbe001..69833d75ec9 100644 --- a/app/contracts/settings/update_contract.rb +++ b/app/contracts/settings/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/settings/working_days_and_hours_params_contract.rb b/app/contracts/settings/working_days_and_hours_params_contract.rb index 81cb129fe60..e2abe706095 100644 --- a/app/contracts/settings/working_days_and_hours_params_contract.rb +++ b/app/contracts/settings/working_days_and_hours_params_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/base_contract.rb b/app/contracts/shares/base_contract.rb index 856094e1f04..5bd00481f50 100644 --- a/app/contracts/shares/base_contract.rb +++ b/app/contracts/shares/base_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/create_contract.rb b/app/contracts/shares/create_contract.rb index 9d8941d1762..f9917e6d011 100644 --- a/app/contracts/shares/create_contract.rb +++ b/app/contracts/shares/create_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/delete_contract.rb b/app/contracts/shares/delete_contract.rb index 69cdc52d8b1..db133bcb3e9 100644 --- a/app/contracts/shares/delete_contract.rb +++ b/app/contracts/shares/delete_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/project_queries/base_extension.rb b/app/contracts/shares/project_queries/base_extension.rb index 7392139fe6f..95500d8996e 100644 --- a/app/contracts/shares/project_queries/base_extension.rb +++ b/app/contracts/shares/project_queries/base_extension.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/project_queries/create_contract.rb b/app/contracts/shares/project_queries/create_contract.rb index d9ce1351d68..7a7d97b5aa6 100644 --- a/app/contracts/shares/project_queries/create_contract.rb +++ b/app/contracts/shares/project_queries/create_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/project_queries/delete_contract.rb b/app/contracts/shares/project_queries/delete_contract.rb index 925dc2d18e7..5d789156d4e 100644 --- a/app/contracts/shares/project_queries/delete_contract.rb +++ b/app/contracts/shares/project_queries/delete_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/project_queries/update_contract.rb b/app/contracts/shares/project_queries/update_contract.rb index eac81bc4e19..541c7398e2a 100644 --- a/app/contracts/shares/project_queries/update_contract.rb +++ b/app/contracts/shares/project_queries/update_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/update_contract.rb b/app/contracts/shares/update_contract.rb index 565c519bcb8..9208d92004b 100644 --- a/app/contracts/shares/update_contract.rb +++ b/app/contracts/shares/update_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/work_packages/base_extension.rb b/app/contracts/shares/work_packages/base_extension.rb index 7f7fb016b4f..bcf598b4ede 100644 --- a/app/contracts/shares/work_packages/base_extension.rb +++ b/app/contracts/shares/work_packages/base_extension.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/work_packages/create_contract.rb b/app/contracts/shares/work_packages/create_contract.rb index d0cc27f013d..19e2822dc07 100644 --- a/app/contracts/shares/work_packages/create_contract.rb +++ b/app/contracts/shares/work_packages/create_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/work_packages/delete_contract.rb b/app/contracts/shares/work_packages/delete_contract.rb index 01bd4ebd152..0a2f7923f1f 100644 --- a/app/contracts/shares/work_packages/delete_contract.rb +++ b/app/contracts/shares/work_packages/delete_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/shares/work_packages/update_contract.rb b/app/contracts/shares/work_packages/update_contract.rb index 7b2dc5d9e90..f54e71eacbd 100644 --- a/app/contracts/shares/work_packages/update_contract.rb +++ b/app/contracts/shares/work_packages/update_contract.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/types/base_contract.rb b/app/contracts/types/base_contract.rb index 59d349d82af..5f8c5b02db9 100644 --- a/app/contracts/types/base_contract.rb +++ b/app/contracts/types/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/user_preferences/base_contract.rb b/app/contracts/user_preferences/base_contract.rb index 4aa2a4be075..35416652b70 100644 --- a/app/contracts/user_preferences/base_contract.rb +++ b/app/contracts/user_preferences/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/user_preferences/params_contract.rb b/app/contracts/user_preferences/params_contract.rb index 0450f0c0144..ec5fc093d80 100644 --- a/app/contracts/user_preferences/params_contract.rb +++ b/app/contracts/user_preferences/params_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/user_preferences/update_contract.rb b/app/contracts/user_preferences/update_contract.rb index 37463a2ecd4..020e00eedd6 100644 --- a/app/contracts/user_preferences/update_contract.rb +++ b/app/contracts/user_preferences/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/users/base_contract.rb b/app/contracts/users/base_contract.rb index 2dfb83fd0c6..f699978b022 100644 --- a/app/contracts/users/base_contract.rb +++ b/app/contracts/users/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/users/create_contract.rb b/app/contracts/users/create_contract.rb index 2ef001e6446..80c4f7a0fb3 100644 --- a/app/contracts/users/create_contract.rb +++ b/app/contracts/users/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/users/delete_contract.rb b/app/contracts/users/delete_contract.rb index 994dac0be86..a65fb3c57fb 100644 --- a/app/contracts/users/delete_contract.rb +++ b/app/contracts/users/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/users/update_contract.rb b/app/contracts/users/update_contract.rb index f794a575a7d..6f5db378068 100644 --- a/app/contracts/users/update_contract.rb +++ b/app/contracts/users/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/versions/base_contract.rb b/app/contracts/versions/base_contract.rb index 96178fb42ba..8abc35ce61a 100644 --- a/app/contracts/versions/base_contract.rb +++ b/app/contracts/versions/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/versions/create_contract.rb b/app/contracts/versions/create_contract.rb index 76399e0d1f8..184f34fc552 100644 --- a/app/contracts/versions/create_contract.rb +++ b/app/contracts/versions/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/versions/delete_contract.rb b/app/contracts/versions/delete_contract.rb index 744fec993d4..afb597fa780 100644 --- a/app/contracts/versions/delete_contract.rb +++ b/app/contracts/versions/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/versions/update_contract.rb b/app/contracts/versions/update_contract.rb index 614499eb0f0..982fff57c77 100644 --- a/app/contracts/versions/update_contract.rb +++ b/app/contracts/versions/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/views/base_contract.rb b/app/contracts/views/base_contract.rb index 2be1e778027..008a53b1ff6 100644 --- a/app/contracts/views/base_contract.rb +++ b/app/contracts/views/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/views/create_contract.rb b/app/contracts/views/create_contract.rb index 0f326a0d849..bbeaeaa7e40 100644 --- a/app/contracts/views/create_contract.rb +++ b/app/contracts/views/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/views/update_contract.rb b/app/contracts/views/update_contract.rb index 474a5d012e8..762240972f2 100644 --- a/app/contracts/views/update_contract.rb +++ b/app/contracts/views/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/wiki_pages/base_contract.rb b/app/contracts/wiki_pages/base_contract.rb index 11f254ef15a..4b1dca1f5d4 100644 --- a/app/contracts/wiki_pages/base_contract.rb +++ b/app/contracts/wiki_pages/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/wiki_pages/copy_contract.rb b/app/contracts/wiki_pages/copy_contract.rb index d7cf16e9e62..740acd88d53 100644 --- a/app/contracts/wiki_pages/copy_contract.rb +++ b/app/contracts/wiki_pages/copy_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/wiki_pages/create_contract.rb b/app/contracts/wiki_pages/create_contract.rb index 5074f964300..30fcccdaa2c 100644 --- a/app/contracts/wiki_pages/create_contract.rb +++ b/app/contracts/wiki_pages/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/wiki_pages/update_contract.rb b/app/contracts/wiki_pages/update_contract.rb index e32643172f0..8707c3b14fc 100644 --- a/app/contracts/wiki_pages/update_contract.rb +++ b/app/contracts/wiki_pages/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/work_packages/base_contract.rb b/app/contracts/work_packages/base_contract.rb index a43c9ef9527..dc62c589bf4 100644 --- a/app/contracts/work_packages/base_contract.rb +++ b/app/contracts/work_packages/base_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -53,19 +53,41 @@ module WorkPackages attribute :project_id attribute :done_ratio, - writable: false + writable: ->(*) { + OpenProject::FeatureDecisions.percent_complete_edition_active? \ + && WorkPackage.work_based_mode? + } do + if OpenProject::FeatureDecisions.percent_complete_edition_active? + next if invalid_work_or_remaining_work_values? # avoid too many error messages at the same time + + validate_percent_complete_matches_work_and_remaining_work + validate_percent_complete_is_empty_when_work_is_zero + validate_percent_complete_is_set_when_work_and_remaining_work_are_set + end + end attribute :derived_done_ratio, writable: false attribute :estimated_hours do - validate_work_is_set_when_remaining_work_is_set + if OpenProject::FeatureDecisions.percent_complete_edition_active? + validate_work_is_set_when_remaining_work_and_percent_complete_are_set + else + # to be removed in 15.0 with :percent_complete_edition feature flag removal + validate_work_is_set_when_remaining_work_is_set + end end attribute :derived_estimated_hours, writable: false attribute :remaining_hours do validate_remaining_work_is_lower_than_work - validate_remaining_work_is_set_when_work_is_set + if OpenProject::FeatureDecisions.percent_complete_edition_active? + validate_remaining_work_is_zero_or_empty_when_percent_complete_is_100p + validate_remaining_work_is_set_when_work_and_percent_complete_are_set + else + # to be removed in 15.0 with :percent_complete_edition feature flag removal + validate_remaining_work_is_set_when_work_is_set + end end attribute :derived_remaining_hours, writable: false @@ -137,7 +159,6 @@ module WorkPackages validate :validate_priority_exists validate :validate_category - validate :validate_estimated_hours validate :validate_assigned_to_exists @@ -218,12 +239,6 @@ module WorkPackages attr_reader :can - def validate_estimated_hours - if !model.estimated_hours.nil? && model.estimated_hours < 0 - errors.add :estimated_hours, :only_values_greater_or_equal_zeroes_allowed - end - end - def validate_after_soonest_start(date_attribute) if !model.schedule_manually? && before_soonest_start?(date_attribute) message = I18n.t("activerecord.errors.models.work_package.attributes.start_date.violates_relationships", @@ -324,7 +339,7 @@ module WorkPackages end def validate_remaining_work_is_lower_than_work - if work_set? && remaining_work_set? && remaining_work_exceeds_work? + if remaining_work_exceeds_work? if model.changed.include?("estimated_hours") errors.add(:estimated_hours, :cant_be_inferior_to_remaining_work) end @@ -335,28 +350,142 @@ module WorkPackages end end + # to be removed in 15.0 with :percent_complete_edition feature flag removal def validate_remaining_work_is_set_when_work_is_set if work_set? && !remaining_work_set? errors.add(:remaining_hours, :must_be_set_when_work_is_set) end end + # to be removed in 15.0 with :percent_complete_edition feature flag removal def validate_work_is_set_when_remaining_work_is_set if remaining_work_set? && !work_set? errors.add(:estimated_hours, :must_be_set_when_remaining_work_is_set) end end + def validate_work_is_set_when_remaining_work_and_percent_complete_are_set + if remaining_work_set_and_valid? && percent_complete_set_and_valid? && work_empty? && percent_complete != 100 + errors.add(:estimated_hours, :must_be_set_when_remaining_work_and_percent_complete_are_set) + end + end + + def validate_remaining_work_is_zero_or_empty_when_percent_complete_is_100p + return unless percent_complete == 100 + + if work_set_and_valid? && remaining_work != 0 + errors.add(:remaining_hours, :must_be_set_to_zero_hours_when_work_is_set_and_percent_complete_is_100p) + elsif work_empty? && remaining_work_set? + errors.add(:remaining_hours, :must_be_empty_when_work_is_empty_and_percent_complete_is_100p) + end + end + + def validate_remaining_work_is_set_when_work_and_percent_complete_are_set + return if percent_complete == 100 + + if work_set_and_valid? && percent_complete_set_and_valid? && remaining_work_empty? + errors.add(:remaining_hours, :must_be_set_when_work_and_percent_complete_are_set) + end + end + + def validate_percent_complete_is_set_when_work_and_remaining_work_are_set + if work_set? && remaining_work_set? && work != 0 && percent_complete_empty? + errors.add(:done_ratio, :must_be_set_when_work_and_remaining_work_are_set) + end + end + + def validate_percent_complete_matches_work_and_remaining_work + return if percent_complete_derivation_unapplicable? + + if !percent_complete_range_derived_from_work_and_remaining_work.cover?(percent_complete) + errors.add(:done_ratio, :does_not_match_work_and_remaining_work) + end + end + + def validate_percent_complete_is_empty_when_work_is_zero + return if WorkPackage.status_based_mode? + + if work == 0 && percent_complete_set? + errors.add(:done_ratio, :cannot_be_set_when_work_is_zero) + end + end + + def work + model.estimated_hours + end + def work_set? - model.estimated_hours.present? + work.present? + end + + def work_set_and_valid? + work_set? && work >= 0 && !model.errors.has_key?(:estimated_hours) + end + + def work_empty? + work.nil? + end + + def remaining_work + model.remaining_hours end def remaining_work_set? - model.remaining_hours.present? + remaining_work.present? + end + + def remaining_work_set_and_valid? + remaining_work_set? && remaining_work >= 0 && !model.errors.has_key?(:remaining_hours) + end + + def remaining_work_empty? + remaining_work.nil? + end + + def invalid_work_or_remaining_work_values? + (work_set? && work.negative?) || + (remaining_work_set? && remaining_work.negative?) || + (model.errors.has_key?(:estimated_hours) || model.errors.has_key?(:remaining_hours)) || + remaining_work_exceeds_work? end def remaining_work_exceeds_work? - model.remaining_hours > model.estimated_hours + # if % complete is 100%, then remaining work should be 0h or empty, so no + # need to display an error for remaining work exceeding work + return false if percent_complete == 100 + + work_set_and_valid? && remaining_work_set_and_valid? && remaining_work > work + end + + def percent_complete + model.done_ratio + end + + def percent_complete_set? + percent_complete.present? + end + + def percent_complete_set_and_valid? + percent_complete_set? && percent_complete.between?(0, 100) + end + + def percent_complete_empty? + percent_complete.nil? + end + + def percent_complete_derivation_unapplicable? + WorkPackage.status_based_mode? || # only applicable in work-based mode + work_empty? || remaining_work_empty? || percent_complete_empty? || # only applicable if all 3 values are set + work == 0 || percent_complete == 100 # only applicable if not in special cases leading to divisions by zero + end + + def percent_complete_range_derived_from_work_and_remaining_work + work_done = work - remaining_work + percentage = (100 * work_done.to_f / work) + + lower_bound = percentage.truncate + upper_bound = lower_bound + 1 + lower_bound..upper_bound end def validate_no_reopen_on_closed_version diff --git a/app/contracts/work_packages/copy_contract.rb b/app/contracts/work_packages/copy_contract.rb index 4bd8d5e895b..797c03de4e2 100644 --- a/app/contracts/work_packages/copy_contract.rb +++ b/app/contracts/work_packages/copy_contract.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/work_packages/copy_project_contract.rb b/app/contracts/work_packages/copy_project_contract.rb index a9d49288287..6f1b7d79b85 100644 --- a/app/contracts/work_packages/copy_project_contract.rb +++ b/app/contracts/work_packages/copy_project_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/work_packages/create_contract.rb b/app/contracts/work_packages/create_contract.rb index 9c8c735e7ad..7ca7bd43c89 100644 --- a/app/contracts/work_packages/create_contract.rb +++ b/app/contracts/work_packages/create_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/work_packages/create_note_contract.rb b/app/contracts/work_packages/create_note_contract.rb index 4d28ea9fecc..0d158c8aa67 100644 --- a/app/contracts/work_packages/create_note_contract.rb +++ b/app/contracts/work_packages/create_note_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/work_packages/delete_contract.rb b/app/contracts/work_packages/delete_contract.rb index 35913f594a9..de22373fb9a 100644 --- a/app/contracts/work_packages/delete_contract.rb +++ b/app/contracts/work_packages/delete_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/work_packages/skip_authorization_checks.rb b/app/contracts/work_packages/skip_authorization_checks.rb index a14e83fc318..2941b1a881b 100644 --- a/app/contracts/work_packages/skip_authorization_checks.rb +++ b/app/contracts/work_packages/skip_authorization_checks.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/work_packages/update_contract.rb b/app/contracts/work_packages/update_contract.rb index 3425f15be16..b25158caed0 100644 --- a/app/contracts/work_packages/update_contract.rb +++ b/app/contracts/work_packages/update_contract.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/work_packages/update_dependent_contract.rb b/app/contracts/work_packages/update_dependent_contract.rb index f18fbf18ec1..6640d443f34 100644 --- a/app/contracts/work_packages/update_dependent_contract.rb +++ b/app/contracts/work_packages/update_dependent_contract.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/account_controller.rb b/app/controllers/account_controller.rb index a9b2423c55e..bf66aca9349 100644 --- a/app/controllers/account_controller.rb +++ b/app/controllers/account_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/activities_controller.rb b/app/controllers/activities_controller.rb index 1c66dec3058..14a9af48b6b 100644 --- a/app/controllers/activities_controller.rb +++ b/app/controllers/activities_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,7 +30,8 @@ class ActivitiesController < ApplicationController include Layout menu_item :activity - before_action :load_and_authorize_in_optional_project, + before_action :warn_if_no_projects_visible, + :load_and_authorize_in_optional_project, :verify_activities_module_activated, :determine_subprojects, :determine_author, @@ -44,20 +45,18 @@ class ActivitiesController < ApplicationController accept_key_auth :index + rescue_from ActiveRecord::RecordNotFound do |exception| + op_handle_warning "Failed to find all resources in activities: #{exception.message}" + render_404(message: I18n.t(:error_can_not_find_all_resources)) + end + def index @events = @activity.events(from: @date_from.to_datetime, to: @date_to.to_datetime) respond_to do |format| - format.html do - respond_html - end - format.atom do - respond_atom - end + format.html { respond_html } + format.atom { respond_atom } end - rescue ActiveRecord::RecordNotFound => e - op_handle_warning "Failed to find all resources in activities: #{e.message}" - render_404 I18n.t(:error_can_not_find_all_resources) end def menu @@ -143,4 +142,10 @@ class ActivitiesController < ApplicationController session[:activity] = { scope: @activity.scope, with_subprojects: @with_subprojects } end + + def warn_if_no_projects_visible + unless current_user.allowed_in_any_project?(:view_project_activity) + render_404(message: I18n.t("homescreen.additional.no_visible_projects")) + end + end end diff --git a/app/controllers/admin/attachments/quarantined_attachments_controller.rb b/app/controllers/admin/attachments/quarantined_attachments_controller.rb index 2a7c0b8594d..80b7ec2556f 100644 --- a/app/controllers/admin/attachments/quarantined_attachments_controller.rb +++ b/app/controllers/admin/attachments/quarantined_attachments_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/admin/backups_controller.rb b/app/controllers/admin/backups_controller.rb index b156aef9a08..0be5ebdff8a 100644 --- a/app/controllers/admin/backups_controller.rb +++ b/app/controllers/admin/backups_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -76,12 +76,10 @@ class Admin::BackupsController < ApplicationController redirect_to action: "show" end - def default_breadcrumb - t(:label_backup) - end + def default_breadcrumb; end def show_local_breadcrumb - true + false end def check_enabled diff --git a/app/controllers/admin/custom_fields/custom_field_projects_controller.rb b/app/controllers/admin/custom_fields/custom_field_projects_controller.rb new file mode 100644 index 00000000000..c314cadd5a4 --- /dev/null +++ b/app/controllers/admin/custom_fields/custom_field_projects_controller.rb @@ -0,0 +1,149 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class Admin::CustomFields::CustomFieldProjectsController < ApplicationController + include OpTurbo::ComponentStream + include OpTurbo::DialogStreamHelper + + layout "admin" + + model_object CustomField + + before_action :require_admin + before_action :find_model_object + + before_action :available_custom_fields_projects_query, only: :index + before_action :initialize_custom_field_project, only: :new + before_action :find_projects_to_activate_for_custom_field, only: :create + + menu_item :custom_fields + + def index; end + + def new + respond_with_dialog Admin::CustomFields::CustomFieldProjects::NewCustomFieldProjectsModalComponent.new( + custom_field_project_mapping: @custom_field_project, + custom_field: @custom_field + ) + end + + def create + create_service = ::CustomFields::CustomFieldProjects::BulkCreateService + .new(user: current_user, projects: @projects, custom_field: @custom_field, + include_sub_projects: include_sub_projects?) + .call + + create_service.on_success { render_project_list(url_for_action: :index) } + + create_service.on_failure do + update_flash_message_via_turbo_stream( + message: join_flash_messages(create_service.errors), + full: true, dismiss_scheme: :hide, scheme: :danger + ) + end + + respond_to_with_turbo_streams(status: create_service.success? ? :ok : :unprocessable_entity) + end + + def default_breadcrumb; end + + def show_local_breadcrumb + false + end + + private + + def render_project_list(url_for_action: action_name) + update_via_turbo_stream( + component: Admin::CustomFields::CustomFieldProjects::TableComponent.new( + query: available_custom_fields_projects_query, + params: { custom_field: @custom_field, url_for_action: } + ) + ) + end + + def find_model_object(object_id = :custom_field_id) + super + @custom_field = @object + end + + def find_projects_to_activate_for_custom_field + if (project_ids = params.to_unsafe_h[:custom_fields_project][:project_ids]).present? + @projects = Project.find(project_ids) + else + initialize_custom_field_project + @custom_field_project.errors.add(:project_ids, :blank) + update_via_turbo_stream( + component: Admin::CustomFields::CustomFieldProjects::NewCustomFieldProjectsFormModalComponent.new( + custom_field_project_mapping: @custom_field_project, + custom_field: @custom_field + ), + status: :bad_request + ) + respond_with_turbo_streams + end + rescue ActiveRecord::RecordNotFound + update_flash_message_via_turbo_stream message: t(:notice_project_not_found), full: true, dismiss_scheme: :hide, + scheme: :danger + update_project_list_via_turbo_stream + + respond_with_turbo_streams + end + + def update_project_list_via_turbo_stream(url_for_action: action_name) + update_via_turbo_stream( + component: Admin::CustomFields::CustomFieldProjects::TableComponent.new( + query: available_custom_fields_projects_query, + params: { custom_field: @custom_field, url_for_action: } + ) + ) + end + + def available_custom_fields_projects_query + @available_custom_fields_projects_query = ProjectQuery.new( + name: "custom-fields-projects-#{@custom_field.id}" + ) do |query| + query.where(:available_custom_fields_projects, "=", [@custom_field.id]) + query.select(:name) + query.order("lft" => "asc") + end + end + + def initialize_custom_field_project + @custom_field_project = ::CustomFields::CustomFieldProjects::SetAttributesService + .new(user: current_user, model: CustomFieldsProject.new, contract_class: EmptyContract) + .call(custom_field: @custom_field) + .result + end + + def include_sub_projects? + ActiveRecord::Type::Boolean.new.cast(params.to_unsafe_h[:custom_fields_project][:include_sub_projects]) + end +end diff --git a/app/controllers/admin/settings/aggregation_settings_controller.rb b/app/controllers/admin/settings/aggregation_settings_controller.rb index 56ebfd5880c..1c0d0bad39c 100644 --- a/app/controllers/admin/settings/aggregation_settings_controller.rb +++ b/app/controllers/admin/settings/aggregation_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -35,13 +35,5 @@ module Admin::Settings def show respond_to :html end - - def default_breadcrumb - t(:"menus.admin.aggregation") - end - - def show_local_breadcrumb - true - end end end diff --git a/app/controllers/admin/settings/api_settings_controller.rb b/app/controllers/admin/settings/api_settings_controller.rb index f7aae0d4d18..d94e03460bf 100644 --- a/app/controllers/admin/settings/api_settings_controller.rb +++ b/app/controllers/admin/settings/api_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,10 +30,6 @@ module Admin::Settings class APISettingsController < ::Admin::SettingsController menu_item :api - def default_breadcrumb - t(:label_api_access_key_type) - end - def settings_params super.tap do |settings| settings["apiv3_cors_origins"] = settings["apiv3_cors_origins"].split(/\r?\n/) diff --git a/app/controllers/admin/settings/attachments_settings_controller.rb b/app/controllers/admin/settings/attachments_settings_controller.rb index 7929473435a..f727c70c44d 100644 --- a/app/controllers/admin/settings/attachments_settings_controller.rb +++ b/app/controllers/admin/settings/attachments_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/admin/settings/authentication_settings_controller.rb b/app/controllers/admin/settings/authentication_settings_controller.rb index 875d6c16789..48c246dc460 100644 --- a/app/controllers/admin/settings/authentication_settings_controller.rb +++ b/app/controllers/admin/settings/authentication_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,13 +29,5 @@ module Admin::Settings class AuthenticationSettingsController < ::Admin::SettingsController menu_item :authentication_settings - - def default_breadcrumb - t(:label_authentication) - end - - def show_local_breadcrumb - true - end end end diff --git a/app/controllers/admin/settings/date_format_settings_controller.rb b/app/controllers/admin/settings/date_format_settings_controller.rb index 9c14335914f..2222c7012c5 100644 --- a/app/controllers/admin/settings/date_format_settings_controller.rb +++ b/app/controllers/admin/settings/date_format_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -36,10 +36,6 @@ module Admin::Settings super end - def default_breadcrumb - t(:label_date_format) - end - private def validate_start_of_week_and_first_week_of_year_combination diff --git a/app/controllers/admin/settings/experimental_settings_controller.rb b/app/controllers/admin/settings/experimental_settings_controller.rb index 2e05c08c5dd..6f02c722eae 100644 --- a/app/controllers/admin/settings/experimental_settings_controller.rb +++ b/app/controllers/admin/settings/experimental_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,10 +28,6 @@ module Admin::Settings class ExperimentalSettingsController < ::Admin::SettingsController - menu_item :settings - - def default_breadcrumb - t(:label_experimental) - end + menu_item :settings_experimental end end diff --git a/app/controllers/admin/settings/general_settings_controller.rb b/app/controllers/admin/settings/general_settings_controller.rb index 114a65065d9..2b2f14b20b6 100644 --- a/app/controllers/admin/settings/general_settings_controller.rb +++ b/app/controllers/admin/settings/general_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -34,9 +34,5 @@ module Admin::Settings super @guessed_host = request.host_with_port.dup end - - def default_breadcrumb - t(:label_general) - end end end diff --git a/app/controllers/admin/settings/icalendar_settings_controller.rb b/app/controllers/admin/settings/icalendar_settings_controller.rb index 5bbb35d0476..0fa66dac599 100644 --- a/app/controllers/admin/settings/icalendar_settings_controller.rb +++ b/app/controllers/admin/settings/icalendar_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,9 +29,5 @@ module Admin::Settings class IcalendarSettingsController < ::Admin::SettingsController menu_item :icalendar - - def default_breadcrumb - t(:label_calendar_subscriptions) - end end end diff --git a/app/controllers/admin/settings/incoming_mails_settings_controller.rb b/app/controllers/admin/settings/incoming_mails_settings_controller.rb index 4848e5ea802..d3ea484e4ae 100644 --- a/app/controllers/admin/settings/incoming_mails_settings_controller.rb +++ b/app/controllers/admin/settings/incoming_mails_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -31,13 +31,5 @@ module Admin::Settings current_menu_item [:show] do :incoming_mails end - - def default_breadcrumb - t(:label_incoming_emails) - end - - def show_local_breadcrumb - true - end end end diff --git a/app/controllers/admin/settings/languages_settings_controller.rb b/app/controllers/admin/settings/languages_settings_controller.rb index 3a2ed0fc99d..e34ee1a9d9a 100644 --- a/app/controllers/admin/settings/languages_settings_controller.rb +++ b/app/controllers/admin/settings/languages_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,10 +30,6 @@ module Admin::Settings class LanguagesSettingsController < ::Admin::SettingsController menu_item :settings_languages - def default_breadcrumb - t(:label_languages) - end - protected def update_service diff --git a/app/controllers/admin/settings/mail_notifications_settings_controller.rb b/app/controllers/admin/settings/mail_notifications_settings_controller.rb index 8af36f26c00..f2e70374837 100644 --- a/app/controllers/admin/settings/mail_notifications_settings_controller.rb +++ b/app/controllers/admin/settings/mail_notifications_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -37,13 +37,5 @@ module Admin::Settings respond_to :html end - - def default_breadcrumb - t(:"menus.admin.mail_notification") - end - - def show_local_breadcrumb - true - end end end diff --git a/app/controllers/admin/settings/new_project_settings_controller.rb b/app/controllers/admin/settings/new_project_settings_controller.rb index 656d919284e..05595025674 100644 --- a/app/controllers/admin/settings/new_project_settings_controller.rb +++ b/app/controllers/admin/settings/new_project_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/admin/settings/work_packages_settings_controller.rb b/app/controllers/admin/settings/progress_tracking_controller.rb similarity index 82% rename from app/controllers/admin/settings/work_packages_settings_controller.rb rename to app/controllers/admin/settings/progress_tracking_controller.rb index 6d7134d0b48..e6687d0afd6 100644 --- a/app/controllers/admin/settings/work_packages_settings_controller.rb +++ b/app/controllers/admin/settings/progress_tracking_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,17 +27,9 @@ #++ module Admin::Settings - class WorkPackagesSettingsController < ::Admin::SettingsController + class ProgressTrackingController < ::Admin::SettingsController current_menu_item :show do - :work_packages_setting - end - - def default_breadcrumb - t(:label_work_package_tracking) - end - - def show_local_breadcrumb - true + :progress_tracking end end end diff --git a/app/controllers/admin/settings/project_custom_field_sections_controller.rb b/app/controllers/admin/settings/project_custom_field_sections_controller.rb index e861d0b475c..20264164a54 100644 --- a/app/controllers/admin/settings/project_custom_field_sections_controller.rb +++ b/app/controllers/admin/settings/project_custom_field_sections_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/admin/settings/project_custom_fields_controller.rb b/app/controllers/admin/settings/project_custom_fields_controller.rb index 8f37bb49c65..2b10ab128af 100644 --- a/app/controllers/admin/settings/project_custom_fields_controller.rb +++ b/app/controllers/admin/settings/project_custom_fields_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -76,8 +76,8 @@ module Admin::Settings def new_link @project_mapping = ProjectCustomFieldProjectMapping.new(project_custom_field: @custom_field) respond_with_dialog Settings::ProjectCustomFields::ProjectCustomFieldMapping::NewProjectMappingComponent.new( - project_mapping: @project_mapping, - project_custom_field: @custom_field + custom_field_project_mapping: @project_mapping, + custom_field: @custom_field ) end @@ -205,8 +205,8 @@ module Admin::Settings project_mapping = ProjectCustomFieldProjectMapping.new(project_custom_field: @custom_field) project_mapping.errors.add(:project_ids, :blank) component = Settings::ProjectCustomFields::ProjectCustomFieldMapping::NewProjectMappingFormComponent.new( - project_mapping:, - project_custom_field: @custom_field + custom_field_project_mapping: project_mapping, + custom_field: @custom_field ) update_via_turbo_stream(component:, status: :bad_request) respond_with_turbo_streams diff --git a/app/controllers/admin/settings/projects_settings_controller.rb b/app/controllers/admin/settings/projects_settings_controller.rb index fcde77f502a..60ce183fe4f 100644 --- a/app/controllers/admin/settings/projects_settings_controller.rb +++ b/app/controllers/admin/settings/projects_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,9 +29,5 @@ module Admin::Settings class ProjectsSettingsController < ::Admin::SettingsController menu_item :project_lists_settings - - def default_breadcrumb - t(:label_project_list_plural) - end end end diff --git a/app/controllers/admin/settings/repositories_settings_controller.rb b/app/controllers/admin/settings/repositories_settings_controller.rb index 05dd5f86778..43ce71b08f7 100644 --- a/app/controllers/admin/settings/repositories_settings_controller.rb +++ b/app/controllers/admin/settings/repositories_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,9 +29,5 @@ module Admin::Settings class RepositoriesSettingsController < ::Admin::SettingsController menu_item :settings_repositories - - def default_breadcrumb - t(:label_repository_plural) - end end end diff --git a/app/controllers/admin/settings/users_settings_controller.rb b/app/controllers/admin/settings/users_settings_controller.rb index 8fb79712df0..e0d2d2de972 100644 --- a/app/controllers/admin/settings/users_settings_controller.rb +++ b/app/controllers/admin/settings/users_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -37,12 +37,8 @@ module Admin::Settings respond_to :html end - def default_breadcrumb - t(:label_user_settings) - end - def show_local_breadcrumb - true + false end def settings_params diff --git a/app/controllers/admin/settings/virus_scanning_settings_controller.rb b/app/controllers/admin/settings/virus_scanning_settings_controller.rb index 63dcf7cc92c..e7eabbc7981 100644 --- a/app/controllers/admin/settings/virus_scanning_settings_controller.rb +++ b/app/controllers/admin/settings/virus_scanning_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/admin/settings/work_packages_general_controller.rb b/app/controllers/admin/settings/work_packages_general_controller.rb new file mode 100644 index 00000000000..82164cb7987 --- /dev/null +++ b/app/controllers/admin/settings/work_packages_general_controller.rb @@ -0,0 +1,35 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Admin::Settings + class WorkPackagesGeneralController < ::Admin::SettingsController + current_menu_item :show do + :work_packages_general + end + end +end diff --git a/app/controllers/admin/settings/working_days_and_hours_settings_controller.rb b/app/controllers/admin/settings/working_days_and_hours_settings_controller.rb index b0bd50d11ab..9f5de6e9c28 100644 --- a/app/controllers/admin/settings/working_days_and_hours_settings_controller.rb +++ b/app/controllers/admin/settings/working_days_and_hours_settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,10 +30,6 @@ module Admin::Settings class WorkingDaysAndHoursSettingsController < ::Admin::SettingsController menu_item :working_days_and_hours - def default_breadcrumb - t(:label_working_days_and_hours) - end - def failure_callback(call) @modified_non_working_days = modified_non_working_days_for(call.result) flash[:error] = call.message || I18n.t(:notice_internal_server_error) diff --git a/app/controllers/admin/settings_controller.rb b/app/controllers/admin/settings_controller.rb index c7daac6c37d..8fcb49a5311 100644 --- a/app/controllers/admin/settings_controller.rb +++ b/app/controllers/admin/settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -70,7 +70,7 @@ module Admin end def show_local_breadcrumb - true + false end def default_breadcrumb diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb index 8631f3a5f18..36d3eb00d5d 100644 --- a/app/controllers/admin_controller.rb +++ b/app/controllers/admin_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -90,17 +90,10 @@ class AdminController < ApplicationController @storage_information = OpenProject::Storage.mount_information end - def default_breadcrumb - case params[:action] - when "plugins" - t(:label_plugins) - when "info" - t(:label_information) - end - end + def default_breadcrumb; end def show_local_breadcrumb - true + false end private diff --git a/app/controllers/angular_controller.rb b/app/controllers/angular_controller.rb index 40e623c9027..15c0d4bcf29 100644 --- a/app/controllers/angular_controller.rb +++ b/app/controllers/angular_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,7 +29,7 @@ class AngularController < ApplicationController before_action :require_login - no_authorization_required! :empty_layout, :notifications_layout + no_authorization_required! :empty_layout def empty_layout # Frontend will handle rendering @@ -37,12 +37,6 @@ class AngularController < ApplicationController render html: "", layout: "angular/angular" end - def notifications_layout - # Frontend will handle rendering - # but we will need to render with notification specific layout - render html: "", layout: "angular/notifications" - end - def login_back_url_params params.permit(:state) end diff --git a/app/controllers/announcements_controller.rb b/app/controllers/announcements_controller.rb index 59591fb70d5..618f55b5937 100644 --- a/app/controllers/announcements_controller.rb +++ b/app/controllers/announcements_controller.rb @@ -20,12 +20,8 @@ class AnnouncementsController < ApplicationController private - def default_breadcrumb - t(:label_announcement) - end - def show_local_breadcrumb - true + false end def announcement_params diff --git a/app/controllers/api_docs_controller.rb b/app/controllers/api_docs_controller.rb index 3a78ca1c7a5..c4997ca6895 100644 --- a/app/controllers/api_docs_controller.rb +++ b/app/controllers/api_docs_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 3310a9db849..276ef7d8cd0 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -51,6 +51,7 @@ class ApplicationController < ActionController::Base include ::OpenProject::Authentication::SessionExpiry include AdditionalUrlHelpers include OpenProjectErrorHelper + include Security::DefaultUrlOptions layout "base" @@ -148,13 +149,6 @@ class ApplicationController < ActionController::Base include Redmine::MenuManager::MenuController helper Redmine::MenuManager::MenuHelper - def default_url_options(_options = {}) - { - layout: params["layout"], - protocol: Setting.protocol - } - end - # set http headers so that the browser does not store any # data (caches) of this site # see: diff --git a/app/controllers/attribute_help_texts_controller.rb b/app/controllers/attribute_help_texts_controller.rb index 50e759264db..44aa15e6085 100644 --- a/app/controllers/attribute_help_texts_controller.rb +++ b/app/controllers/attribute_help_texts_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -44,8 +44,6 @@ class AttributeHelpTextsController < ApplicationController def edit; end - def upsale; end - def create call = ::AttributeHelpTexts::CreateService .new(user: current_user) @@ -87,16 +85,10 @@ class AttributeHelpTextsController < ApplicationController protected - def default_breadcrumb - if action_name == "index" - t("attribute_help_texts.label_plural") - else - ActionController::Base.helpers.link_to(t("attribute_help_texts.label_plural"), attribute_help_texts_path) - end - end + def default_breadcrumb; end def show_local_breadcrumb - true + false end private diff --git a/app/controllers/categories_controller.rb b/app/controllers/categories_controller.rb index 242abdc4b65..b41f73c4759 100644 --- a/app/controllers/categories_controller.rb +++ b/app/controllers/categories_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/colors_controller.rb b/app/controllers/colors_controller.rb index b911b9451cf..ed553c1ce1c 100644 --- a/app/controllers/colors_controller.rb +++ b/app/controllers/colors_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -102,20 +102,14 @@ class ColorsController < ApplicationController protected - def default_breadcrumb - if action_name == "index" - t(:label_color_plural) - else - ActionController::Base.helpers.link_to(t(:label_color_plural), colors_path) - end + def show_local_breadcrumb + false end - def show_local_breadcrumb - true - end + def default_breadcrumb; end def require_admin_unless_readonly_api_request - require_admin unless %w[index show].include? params[:action] and + require_admin unless %w[index show].include? action_name and api_request? end end diff --git a/app/controllers/concerns/accounts/authentication_stages.rb b/app/controllers/concerns/accounts/authentication_stages.rb index 1d2dbb19b74..33e44249be4 100644 --- a/app/controllers/concerns/accounts/authentication_stages.rb +++ b/app/controllers/concerns/accounts/authentication_stages.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/accounts/authorization.rb b/app/controllers/concerns/accounts/authorization.rb index 206e81e78c4..3d4227a43de 100644 --- a/app/controllers/concerns/accounts/authorization.rb +++ b/app/controllers/concerns/accounts/authorization.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -46,9 +46,9 @@ module Accounts::Authorization private def authorization_check_required - unless authorization_is_ensured?(params[:action]) + unless authorization_is_ensured?(action_name) raise <<-MESSAGE - Authorization check required for #{self.class.name}##{params[:action]}. + Authorization check required for #{self.class.name}##{action_name}. Use any method of #{METHODS_ENFORCING_AUTHORIZATION.join(', ')} @@ -62,20 +62,20 @@ module Accounts::Authorization # Authorize the user for the requested controller action. # To be used in before_action hooks def authorize - do_authorize({ controller: params[:controller], action: params[:action] }, global: false) + do_authorize({ controller: controller_path, action: action_name }, global: false) end # Authorize the user for the requested controller action outside a project # To be used in before_action hooks def authorize_global - do_authorize({ controller: params[:controller], action: params[:action] }, global: true) + do_authorize({ controller: controller_path, action: action_name }, global: true) end # Find a project based on params[:project_id] def load_and_authorize_in_optional_project @project = Project.find(params[:project_id]) if params[:project_id].present? - do_authorize({ controller: params[:controller], action: params[:action] }, global: params[:project_id].blank?) + do_authorize({ controller: controller_path, action: action_name }, global: params[:project_id].blank?) rescue ActiveRecord::RecordNotFound render_404 end diff --git a/app/controllers/concerns/accounts/current_user.rb b/app/controllers/concerns/accounts/current_user.rb index a52a9ca84b4..de51756c3f3 100644 --- a/app/controllers/concerns/accounts/current_user.rb +++ b/app/controllers/concerns/accounts/current_user.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -105,7 +105,7 @@ module Accounts::CurrentUser end def current_rss_key_user - if params[:format] == "atom" && params[:key] && accept_key_auth_actions.include?(params[:action]) + if params[:format] == "atom" && params[:key] && accept_key_auth_actions.include?(action_name) # RSS key authentication does not start a session User.find_by_rss_key(params[:key]) end @@ -116,7 +116,7 @@ module Accounts::CurrentUser key = api_key_from_request - if key && accept_key_auth_actions.include?(params[:action]) + if key && accept_key_auth_actions.include?(action_name) # Use API key User.find_by_api_key(key) end diff --git a/app/controllers/concerns/accounts/omniauth_login.rb b/app/controllers/concerns/accounts/omniauth_login.rb index d858918736c..93f36f80cc8 100644 --- a/app/controllers/concerns/accounts/omniauth_login.rb +++ b/app/controllers/concerns/accounts/omniauth_login.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/accounts/redirect_after_login.rb b/app/controllers/concerns/accounts/redirect_after_login.rb index e5bcc7e9a35..02a2244903c 100644 --- a/app/controllers/concerns/accounts/redirect_after_login.rb +++ b/app/controllers/concerns/accounts/redirect_after_login.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/accounts/user_consent.rb b/app/controllers/concerns/accounts/user_consent.rb index e3beee7a7de..c17d33a9069 100644 --- a/app/controllers/concerns/accounts/user_consent.rb +++ b/app/controllers/concerns/accounts/user_consent.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/accounts/user_limits.rb b/app/controllers/concerns/accounts/user_limits.rb index 18b2cd91056..119ebd933f5 100644 --- a/app/controllers/concerns/accounts/user_limits.rb +++ b/app/controllers/concerns/accounts/user_limits.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/accounts/user_password_change.rb b/app/controllers/concerns/accounts/user_password_change.rb index 1ce7f02cbd4..b6ea6e6db3e 100644 --- a/app/controllers/concerns/accounts/user_password_change.rb +++ b/app/controllers/concerns/accounts/user_password_change.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/admin/settings/project_custom_fields/component_streams.rb b/app/controllers/concerns/admin/settings/project_custom_fields/component_streams.rb index 5073bdf20b2..b36b9b49c9e 100644 --- a/app/controllers/concerns/admin/settings/project_custom_fields/component_streams.rb +++ b/app/controllers/concerns/admin/settings/project_custom_fields/component_streams.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/attachable_service_call.rb b/app/controllers/concerns/attachable_service_call.rb index aa878d44ce7..ffeac473a78 100644 --- a/app/controllers/concerns/attachable_service_call.rb +++ b/app/controllers/concerns/attachable_service_call.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/auth_source_sso.rb b/app/controllers/concerns/auth_source_sso.rb index 3147ffa8445..510bd7a865b 100644 --- a/app/controllers/concerns/auth_source_sso.rb +++ b/app/controllers/concerns/auth_source_sso.rb @@ -185,7 +185,7 @@ module AuthSourceSSO def perform_post_logout(prev_session, previous_user) if prev_session[:user_from_auth_header] && header_slo_url.present? - redirect_to header_slo_url + redirect_to(header_slo_url, allow_other_host: true) else super end diff --git a/app/controllers/concerns/custom_fields/shared_actions.rb b/app/controllers/concerns/custom_fields/shared_actions.rb index a2b54097a7c..44928935ff0 100644 --- a/app/controllers/concerns/custom_fields/shared_actions.rb +++ b/app/controllers/concerns/custom_fields/shared_actions.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/layout.rb b/app/controllers/concerns/layout.rb index 47b8057307c..d8e65251185 100644 --- a/app/controllers/concerns/layout.rb +++ b/app/controllers/concerns/layout.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/member_helper.rb b/app/controllers/concerns/member_helper.rb index 8eb65831fd9..ae824ca2acb 100644 --- a/app/controllers/concerns/member_helper.rb +++ b/app/controllers/concerns/member_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/op_turbo/component_stream.rb b/app/controllers/concerns/op_turbo/component_stream.rb index 4c1836f9f4e..88fbf6f9abd 100644 --- a/app/controllers/concerns/op_turbo/component_stream.rb +++ b/app/controllers/concerns/op_turbo/component_stream.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/op_turbo/dialog_stream_helper.rb b/app/controllers/concerns/op_turbo/dialog_stream_helper.rb index 429506530d3..0eec3f4f1eb 100644 --- a/app/controllers/concerns/op_turbo/dialog_stream_helper.rb +++ b/app/controllers/concerns/op_turbo/dialog_stream_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/op_turbo/flash_stream_helper.rb b/app/controllers/concerns/op_turbo/flash_stream_helper.rb new file mode 100644 index 00000000000..fa743e4e376 --- /dev/null +++ b/app/controllers/concerns/op_turbo/flash_stream_helper.rb @@ -0,0 +1,41 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OpTurbo + module FlashStreamHelper + def respond_with_flash(flash_component, status: :ok, &format_block) + respond_to do |format| + format.turbo_stream do + render turbo_stream: flash_component.render_as_turbo_stream(view_context:, action: :flash), status: + end + + yield(format) if format_block + end + end + end +end diff --git a/app/controllers/concerns/password_confirmation.rb b/app/controllers/concerns/password_confirmation.rb index 79ecc8e1446..d3452efee40 100644 --- a/app/controllers/concerns/password_confirmation.rb +++ b/app/controllers/concerns/password_confirmation.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/projects/settings/project_custom_fields/component_streams.rb b/app/controllers/concerns/projects/settings/project_custom_fields/component_streams.rb index 0b126e565c4..2042c4cf0d9 100644 --- a/app/controllers/concerns/projects/settings/project_custom_fields/component_streams.rb +++ b/app/controllers/concerns/projects/settings/project_custom_fields/component_streams.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/security/default_url_options.rb b/app/controllers/concerns/security/default_url_options.rb new file mode 100644 index 00000000000..db1a6cbb4bb --- /dev/null +++ b/app/controllers/concerns/security/default_url_options.rb @@ -0,0 +1,41 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Security + module DefaultUrlOptions + # Determine host for links on our static host name + def default_url_options(_options = {}) + { + layout: params["layout"], + protocol: Setting.protocol, + host: Setting.host_without_protocol, + port: Setting.optional_port_from_host_name + }.compact + end + end +end diff --git a/app/controllers/concerns/user_invitation.rb b/app/controllers/concerns/user_invitation.rb index 9d33dfaacdf..98055acdf23 100644 --- a/app/controllers/concerns/user_invitation.rb +++ b/app/controllers/concerns/user_invitation.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/concerns/work_packages/with_split_view.rb b/app/controllers/concerns/work_packages/with_split_view.rb new file mode 100644 index 00000000000..736a5bfe4b0 --- /dev/null +++ b/app/controllers/concerns/work_packages/with_split_view.rb @@ -0,0 +1,41 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module WorkPackages + module WithSplitView + extend ActiveSupport::Concern + + included do + helper_method :split_view_base_route + end + + def split_view_work_package_id + params[:work_package_id].to_i + end + end +end diff --git a/app/controllers/custom_actions_controller.rb b/app/controllers/custom_actions_controller.rb index a676ef0410f..a7296b63959 100644 --- a/app/controllers/custom_actions_controller.rb +++ b/app/controllers/custom_actions_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -109,15 +109,9 @@ class CustomActionsController < ApplicationController params[:custom_action][:actions] ||= {} end - def default_breadcrumb - if action_name == "index" - t("custom_actions.plural") - else - ActionController::Base.helpers.link_to(t("custom_actions.plural"), custom_actions_path) - end + def show_local_breadcrumb + false end - def show_local_breadcrumb - true - end + def default_breadcrumb; end end diff --git a/app/controllers/custom_fields_controller.rb b/app/controllers/custom_fields_controller.rb index 7b8c5bfa0d4..de3a72af308 100644 --- a/app/controllers/custom_fields_controller.rb +++ b/app/controllers/custom_fields_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -58,16 +58,10 @@ class CustomFieldsController < ApplicationController protected - def default_breadcrumb - if action_name == "index" - t("label_custom_field_plural") - else - ActionController::Base.helpers.link_to(t("label_custom_field_plural"), custom_fields_path) - end - end + def default_breadcrumb; end def show_local_breadcrumb - true + false end def find_custom_field diff --git a/app/controllers/custom_styles_controller.rb b/app/controllers/custom_styles_controller.rb index a8467ed35a7..e2e70eb61df 100644 --- a/app/controllers/custom_styles_controller.rb +++ b/app/controllers/custom_styles_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -153,7 +153,7 @@ class CustomStylesController < ApplicationController end def show_local_breadcrumb - true + false end private diff --git a/app/controllers/enterprises_controller.rb b/app/controllers/enterprises_controller.rb index 836b5896ba4..a011ec00375 100644 --- a/app/controllers/enterprises_controller.rb +++ b/app/controllers/enterprises_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -98,12 +98,10 @@ class EnterprisesController < ApplicationController helpers.write_augur_to_gon end - def default_breadcrumb - t(:label_enterprise_edition) - end + def default_breadcrumb; end def show_local_breadcrumb - true + false end def check_user_limit diff --git a/app/controllers/enumerations_controller.rb b/app/controllers/enumerations_controller.rb index 8cc2a55280e..e9dfc358734 100644 --- a/app/controllers/enumerations_controller.rb +++ b/app/controllers/enumerations_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -102,33 +102,19 @@ class EnumerationsController < ApplicationController protected - def default_breadcrumb - if action_name == "index" - t(:label_enumerations) - else - ActionController::Base.helpers.link_to(t(:label_enumerations), enumerations_path) - end + def show_local_breadcrumb + false end - def show_local_breadcrumb - true - end + def default_breadcrumb; end def find_enumeration @enumeration = Enumeration.find(params[:id]) end ## - # Find an enumeration class with the given Name - # this should be fail save for nonsense names or names - # which are no enumerations to prevent remote code execution attacks. - # params: type (string) + # Find an enumeration class with the given name def enumeration_class(type) - klass = type.to_s.constantize - raise NameError unless klass.ancestors.include? Enumeration - - klass - rescue NameError - nil + Enumeration.registered_subclasses.detect { |cls| cls.name == type } end end diff --git a/app/controllers/errors_controller.rb b/app/controllers/errors_controller.rb index aa7d59807d0..f7aa7a827eb 100644 --- a/app/controllers/errors_controller.rb +++ b/app/controllers/errors_controller.rb @@ -1,8 +1,11 @@ -class ErrorsController < ActionController::Base +class ErrorsController < ApplicationController include ErrorsHelper include OpenProjectErrorHelper include Accounts::CurrentUser + no_authorization_required! :not_found, :unacceptable, :internal_error + skip_before_action :check_if_login_required + def not_found render_404 end diff --git a/app/controllers/favorites_controller.rb b/app/controllers/favorites_controller.rb index cdc157058e4..9a596898126 100644 --- a/app/controllers/favorites_controller.rb +++ b/app/controllers/favorites_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/forums_controller.rb b/app/controllers/forums_controller.rb index f28372d7d7f..1def837243c 100644 --- a/app/controllers/forums_controller.rb +++ b/app/controllers/forums_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/groups_controller.rb b/app/controllers/groups_controller.rb index 85384f3b0ca..1694553a9fc 100644 --- a/app/controllers/groups_controller.rb +++ b/app/controllers/groups_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -160,16 +160,8 @@ class GroupsController < ApplicationController Group.in_project(Project.allowed_to(current_user, :view_members)).exists? end - def default_breadcrumb - if action_name == "index" || !current_user.admin? - t("label_group_plural") - else - ActionController::Base.helpers.link_to(t("label_group_plural"), groups_path) - end - end - def show_local_breadcrumb - true + false end def respond_membership_altered(service_call) diff --git a/app/controllers/help_controller.rb b/app/controllers/help_controller.rb index 3eb2c7b2885..fb63a4b60fc 100644 --- a/app/controllers/help_controller.rb +++ b/app/controllers/help_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,13 +30,13 @@ class HelpController < ApplicationController no_authorization_required! :keyboard_shortcuts, :text_formatting def keyboard_shortcuts - redirect_to OpenProject::Static::Links[:shortcuts][:href] + redirect_to OpenProject::Static::Links[:shortcuts][:href], allow_other_host: true end def text_formatting default_link = OpenProject::Static::Links[:text_formatting][:href] help_link = OpenProject::Configuration.force_formatting_help_link.presence || default_link - redirect_to help_link + redirect_to help_link, allow_other_host: true end end diff --git a/app/controllers/highlighting_controller.rb b/app/controllers/highlighting_controller.rb index e859e429bb8..855a5c51bda 100644 --- a/app/controllers/highlighting_controller.rb +++ b/app/controllers/highlighting_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/homescreen_controller.rb b/app/controllers/homescreen_controller.rb index 50dfe8195b6..5f2b8810cb7 100644 --- a/app/controllers/homescreen_controller.rb +++ b/app/controllers/homescreen_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/journals_controller.rb b/app/controllers/journals_controller.rb index d7ea7714252..e1b49530e78 100644 --- a/app/controllers/journals_controller.rb +++ b/app/controllers/journals_controller.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -108,11 +108,14 @@ class JournalsController < ApplicationController end def valid_field_for_diffing? - %w[description status_explanation].include?(field_param) || agenda_item_notes? - end - - def agenda_item_notes? - field_param.match?(/\Aagenda_items_\d+_notes\z/) + case field_param + when "description", + "status_explanation", + /\Aagenda_items_\d+_notes\z/ + true + when /\Acustom_fields_(?\d+)\z/ + ::CustomField.exists?(id: Regexp.last_match[:id], field_format: "text") + end end def journals_index_title diff --git a/app/controllers/ldap_auth_sources_controller.rb b/app/controllers/ldap_auth_sources_controller.rb index 172a358af68..17e46c044da 100644 --- a/app/controllers/ldap_auth_sources_controller.rb +++ b/app/controllers/ldap_auth_sources_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -106,16 +106,8 @@ class LdapAuthSourcesController < ApplicationController end end - def default_breadcrumb - if action_name == "index" - t(:label_ldap_auth_source_plural) - else - ActionController::Base.helpers.link_to(t(:label_ldap_auth_source_plural), ldap_auth_sources_path) - end - end - def show_local_breadcrumb - true + false end def block_if_password_login_disabled diff --git a/app/controllers/members/menus_controller.rb b/app/controllers/members/menus_controller.rb index edfaec25077..88fee621858 100644 --- a/app/controllers/members/menus_controller.rb +++ b/app/controllers/members/menus_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/members_controller.rb b/app/controllers/members_controller.rb index 7fbba42d4f5..10c4cd9d00e 100644 --- a/app/controllers/members_controller.rb +++ b/app/controllers/members_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 980c69da2e8..d9e44f4aa30 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/my_controller.rb b/app/controllers/my_controller.rb index 527891665ef..f0d6ccdba04 100644 --- a/app/controllers/my_controller.rb +++ b/app/controllers/my_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -31,6 +31,7 @@ class MyController < ApplicationController include Accounts::UserPasswordChange include ActionView::Helpers::TagHelper include OpTurbo::ComponentStream + include FlashMessagesOutputSafetyHelper layout "my" @@ -112,26 +113,10 @@ class MyController < ApplicationController end # Configure user's in app notifications - def notifications - render html: "", - layout: "angular/angular", - locals: { - menu_name: :my_menu, - component: "opce-notification-settings", - page_title: [I18n.t(:label_my_account), I18n.t("js.notifications.settings.title")] - } - end + def notifications; end # Configure user's mail reminders - def reminders - render html: "", - layout: "angular/angular", - locals: { - menu_name: :my_menu, - component: "opce-reminder-settings", - page_title: [I18n.t(:label_my_account), I18n.t("js.reminders.settings.title")] - } - end + def reminders; end # Create a new feeds key def generate_rss_key @@ -163,13 +148,12 @@ class MyController < ApplicationController result = APITokens::CreateService.new(user: current_user).call(token_name: params[:token_api][:token_name]) result.on_success do |r| - flash[:info] = [ - t("my.access_token.notice_reset_token", type: "API").html_safe, - content_tag(:strong, r.result.plain_value), - t("my.access_token.token_value_warning") - ] + update_via_turbo_stream( + component: My::AccessToken::APITokensSectionComponent.new(api_tokens: @user.api_tokens) + ) - redirect_to action: "access_token" + dialog = My::AccessToken::AccessTokenCreatedDialogComponent.new(token_value: r.result.plain_value) + modify_via_turbo_stream(component: dialog, action: :dialog, status: :ok) end result.on_failure do |r| @@ -177,10 +161,11 @@ class MyController < ApplicationController component: My::AccessToken::NewAccessTokenFormComponent.new(token: r.result), status: :bad_request ) - - respond_with_turbo_streams end + + respond_with_turbo_streams end + # rubocop:enable Metrics/AbcSize # rubocop:disable Metrics/AbcSize @@ -189,12 +174,13 @@ class MyController < ApplicationController # rubocop:disable Rails/ActionControllerFlashBeforeRender result.on_success do - flash[:info] = t("my.access_token.notice_api_token_revoked") + flash[:primer_banner] = { message: t("my.access_token.notice_api_token_revoked") } end - result.on_failure do - Rails.logger.error "Failed to revoke api token ##{current_user.id}: #{e}" - flash[:error] = t("my.access_token.failed_to_revoke_token", error: e.message) + result.on_failure do |r| + error = r.errors.map(&:message).join("; ") + Rails.logger.error("Failed to revoke api token ##{current_user.id}: #{error}") + flash[:primer_banner] = { message: t("my.access_token.failed_to_revoke_token", error:), scheme: :danger } end # rubocop:enable Rails/ActionControllerFlashBeforeRender diff --git a/app/controllers/news/comments_controller.rb b/app/controllers/news/comments_controller.rb index 7ed4205ec21..282f7f4410b 100644 --- a/app/controllers/news/comments_controller.rb +++ b/app/controllers/news/comments_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/news_controller.rb b/app/controllers/news_controller.rb index 31dae3297a4..1a36644447a 100644 --- a/app/controllers/news_controller.rb +++ b/app/controllers/news_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/notifications/menus_controller.rb b/app/controllers/notifications/menus_controller.rb new file mode 100644 index 00000000000..b76a4e52774 --- /dev/null +++ b/app/controllers/notifications/menus_controller.rb @@ -0,0 +1,42 @@ +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ +module Notifications + class MenusController < ApplicationController + # No authorize as every user (or logged in user) + # is allowed to see the menu. + no_authorization_required! :show + + def show + menu = Notifications::Menu.new(params:, current_user:) + + @sidebar_menu_items = menu.menu_items + + render layout: nil + end + end +end diff --git a/app/controllers/notifications_controller.rb b/app/controllers/notifications_controller.rb new file mode 100644 index 00000000000..394d8243cd0 --- /dev/null +++ b/app/controllers/notifications_controller.rb @@ -0,0 +1,96 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class NotificationsController < ApplicationController + include WorkPackages::WithSplitView + + before_action :require_login + before_action :filtered_query, only: :mark_all_read + no_authorization_required! :index, :split_view, :update_counter, :mark_all_read, :date_alerts, :share_upsale + + def index + render_notifications_layout + end + + def split_view + respond_to do |format| + format.html do + if turbo_frame_request? + render "work_packages/split_view", layout: false + else + render :index, layout: "notifications" + end + end + end + end + + def mark_all_read + if filtered_query.valid? + filtered_query.results.update_all(read_ian: true, updated_at: Time.zone.now) + else + flash[:error] = filtered_query.errors.full_messages.join(", ") + end + + redirect_back fallback_location: notifications_path + end + + def date_alerts + render_notifications_layout + end + + def share_upsale + render_notifications_layout + end + + private + + def split_view_base_route = notifications_path(request.query_parameters) + + def default_breadcrumb; end + + def render_notifications_layout + # Frontend will handle rendering + # but we will need to render with notification specific layout + render layout: "notifications" + end + + def filtered_query + query = Queries::Notifications::NotificationQuery.new(user: current_user) + query.where(:read_ian, "=", "f") + + case params[:filter] + when "project" + id = params[:name].to_i + query.where(:project_id, "=", [id]) + when "reason" + query.where(:reason, "=", [params[:name]]) + end + + @filtered_query = query + end +end diff --git a/app/controllers/oauth/applications_controller.rb b/app/controllers/oauth/applications_controller.rb index d77870eb801..0d32225d584 100644 --- a/app/controllers/oauth/applications_controller.rb +++ b/app/controllers/oauth/applications_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,8 +29,8 @@ module OAuth class ApplicationsController < ::ApplicationController before_action :require_admin - before_action :new_app, only: %i[new create] - before_action :find_app, only: %i[edit update show destroy] + before_action :find_app, only: %i[edit update show toggle destroy] + before_action :prevent_builtin_edits, only: %i[edit update destroy] layout "admin" menu_item :oauth_applications @@ -44,26 +44,35 @@ module OAuth flash.delete :reveal_secret end - def new; end + def new + @application = ::Doorkeeper::Application.new + end def edit; end def create - call = ::OAuth::PersistApplicationService.new(@application, user: current_user) - .call(permitted_params.oauth_application) + call = ::OAuth::Applications::CreateService.new(user: current_user) + .call(permitted_params.oauth_application) + result = call.result if call.success? flash[:notice] = t(:notice_successful_create) - flash[:_application_secret] = call.result.plaintext_secret - redirect_to action: :show, id: call.result.id + flash[:_application_secret] = result.plaintext_secret + redirect_to action: :show, id: result.id else + @application = result render action: :new end end + def toggle + @application.toggle!(:enabled) + redirect_to action: :index + end + def update - call = ::OAuth::PersistApplicationService.new(@application, user: current_user) - .call(permitted_params.oauth_application) + call = ::OAuth::Applications::UpdateService.new(model: @application, user: current_user) + .call(permitted_params.oauth_application) if call.success? flash[:notice] = t(:notice_successful_update) @@ -75,7 +84,11 @@ module OAuth end def destroy - if @application.destroy + call = OAuth::Applications::DeleteService + .new(model: @application, user: current_user) + .call + + if call.success? flash[:notice] = t(:notice_successful_delete) else flash[:error] = t(:error_can_not_delete_entry) @@ -86,22 +99,18 @@ module OAuth protected - def default_breadcrumb - if action_name == "index" - t("oauth.application.plural") - else - ActionController::Base.helpers.link_to(t("oauth.application.plural"), oauth_applications_path) - end - end + def default_breadcrumb; end def show_local_breadcrumb - current_user.admin? + false end private - def new_app - @application = ::Doorkeeper::Application.new + def prevent_builtin_edits + if @application.builtin? + render_403 + end end def find_app diff --git a/app/controllers/oauth/auth_base_controller.rb b/app/controllers/oauth/auth_base_controller.rb index 8ec97a4ceba..ad1b3388986 100644 --- a/app/controllers/oauth/auth_base_controller.rb +++ b/app/controllers/oauth/auth_base_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/oauth/grants_controller.rb b/app/controllers/oauth/grants_controller.rb index dc9206b1a48..c7264e2348d 100644 --- a/app/controllers/oauth/grants_controller.rb +++ b/app/controllers/oauth/grants_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/oauth_clients_controller.rb b/app/controllers/oauth_clients_controller.rb index a2a09b3c1eb..4329c8c0ebe 100644 --- a/app/controllers/oauth_clients_controller.rb +++ b/app/controllers/oauth_clients_controller.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -82,11 +82,7 @@ class OAuthClientsController < ApplicationController storage = oauth_client.integration # check if the origin is the same - destination_url = if params.fetch(:destination_url, "").start_with?(root_url) - params[:destination_url] - else - root_url - end + destination_url = destination_url(params.fetch(:destination_url, "")) auth_state = ::Storages::Peripherals::StorageInteraction::Authentication .authorization_state(storage:, user: User.current) @@ -95,7 +91,7 @@ class OAuthClientsController < ApplicationController else nonce = SecureRandom.uuid cookies["oauth_state_#{nonce}"] = { value: { href: destination_url, storageId: storage_id }.to_json, expires: 1.hour } - redirect_to(storage.oauth_configuration.authorization_uri(state: nonce)) + redirect_to(storage.oauth_configuration.authorization_uri(state: nonce), allow_other_host: true) end end @@ -103,6 +99,20 @@ class OAuthClientsController < ApplicationController private + def relative_url?(url) + url.starts_with?("/") + end + + def destination_url(url) + if ::API::V3::Utilities::PathHelper::ApiV3Path.same_origin?(url) + url + elsif relative_url?(url) + root_url.chomp("/") + url + else + root_url + end + end + def handle_absent_oauth_client flash[:error] = [I18n.t("oauth_client.errors.oauth_client_not_found"), I18n.t("oauth_client.errors.oauth_client_not_found_explanation")] diff --git a/app/controllers/onboarding_controller.rb b/app/controllers/onboarding_controller.rb index 59105b0a543..5ac689d35c6 100644 --- a/app/controllers/onboarding_controller.rb +++ b/app/controllers/onboarding_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/placeholder_users/memberships_controller.rb b/app/controllers/placeholder_users/memberships_controller.rb index b75532b9a87..7b164709921 100644 --- a/app/controllers/placeholder_users/memberships_controller.rb +++ b/app/controllers/placeholder_users/memberships_controller.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/controllers/placeholder_users_controller.rb b/app/controllers/placeholder_users_controller.rb index 9936ed29032..82d6660e274 100644 --- a/app/controllers/placeholder_users_controller.rb +++ b/app/controllers/placeholder_users_controller.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or @@ -158,16 +158,7 @@ class PlaceholderUsersController < ApplicationController end end - def default_breadcrumb - if action_name == "index" - t("label_placeholder_user_plural") - else - ActionController::Base.helpers.link_to(t("label_placeholder_user_plural"), - placeholder_users_path) - end - end - def show_local_breadcrumb - action_name != "show" + false end end diff --git a/app/controllers/projects/archive_controller.rb b/app/controllers/projects/archive_controller.rb index b18c6f86c44..c2d7e272967 100644 --- a/app/controllers/projects/archive_controller.rb +++ b/app/controllers/projects/archive_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/identifier_controller.rb b/app/controllers/projects/identifier_controller.rb index 5178dc0e94b..57462a5a531 100644 --- a/app/controllers/projects/identifier_controller.rb +++ b/app/controllers/projects/identifier_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/menus_controller.rb b/app/controllers/projects/menus_controller.rb index 2b6e5324349..935a9536c87 100644 --- a/app/controllers/projects/menus_controller.rb +++ b/app/controllers/projects/menus_controller.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/queries_controller.rb b/app/controllers/projects/queries_controller.rb index e1111712033..3b77ca9a3b2 100644 --- a/app/controllers/projects/queries_controller.rb +++ b/app/controllers/projects/queries_controller.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,12 +28,15 @@ class Projects::QueriesController < ApplicationController include Projects::QueryLoading + include OpTurbo::ComponentStream + include OpTurbo::DialogStreamHelper # No need for a more specific authorization check. That is carried out in the contracts. - no_authorization_required! :show, :new, :create, :rename, :update, :toggle_public, :destroy - before_action :require_login - before_action :find_query, only: %i[show rename update destroy toggle_public] - before_action :build_query_or_deny_access, only: %i[new create] + no_authorization_required! :show, :new, :create, :rename, :update, :toggle_public, :destroy, :destroy_confirmation_modal, + :configure_view_modal + before_action :require_login, except: %i[configure_view_modal] + before_action :find_query, only: %i[show rename update destroy toggle_public destroy_confirmation_modal] + before_action :build_query_or_deny_access, only: %i[new create configure_view_modal] current_menu_item [:new, :rename, :create, :update] do :projects @@ -44,15 +47,37 @@ class Projects::QueriesController < ApplicationController end def new - render template: "/projects/index", - layout: "global", - locals: { query: @query, state: :edit } + respond_to do |format| + format.html do + render template: "/projects/index", + layout: "global", + locals: { query: @query, state: :edit } + end + format.turbo_stream do + replace_via_turbo_stream( + component: Projects::IndexPageHeaderComponent.new(query: @query, current_user:, state: :edit, params:) + ) + + render turbo_stream: turbo_streams + end + end end def rename - render template: "/projects/index", - layout: "global", - locals: { query: @query, state: :rename } + respond_to do |format| + format.html do + render template: "/projects/index", + layout: "global", + locals: { query: @query, state: :rename } + end + format.turbo_stream do + replace_via_turbo_stream( + component: Projects::IndexPageHeaderComponent.new(query: @query, current_user:, state: :rename, params:) + ) + + render turbo_stream: turbo_streams + end + end end def create @@ -71,15 +96,26 @@ class Projects::QueriesController < ApplicationController render_result(call, success_i18n_key: "lists.update.success", error_i18n_key: "lists.update.failure") end - def toggle_public - to_be_public = !@query.public? + def toggle_public # rubocop:disable Metrics/AbcSize + to_be_public = ActiveRecord::Type::Boolean.new.cast(params["value"]) i18n_key = to_be_public ? "lists.publish" : "lists.unpublish" call = Queries::Projects::ProjectQueries::PublishService .new(user: current_user, model: @query) .call(public: to_be_public) - render_result(call, success_i18n_key: "#{i18n_key}.success", error_i18n_key: "#{i18n_key}.failure") + respond_to do |format| + format.turbo_stream do + # Load shares and replace the modal + strategy = SharingStrategies::ProjectQueryStrategy.new(@query, user: current_user, query_params: {}) + replace_via_turbo_stream(component: Shares::ModalBodyComponent.new(strategy:, errors: [])) + render turbo_stream: turbo_streams + end + + format.html do + render_result(call, success_i18n_key: "#{i18n_key}.success", error_i18n_key: "#{i18n_key}.failure") + end + end end def destroy @@ -89,6 +125,14 @@ class Projects::QueriesController < ApplicationController redirect_to projects_path end + def destroy_confirmation_modal + respond_with_dialog Projects::DeleteListModalComponent.new(query: @query) + end + + def configure_view_modal + respond_with_dialog Projects::ConfigureViewModalComponent.new(query: @query) + end + private def render_result(service_call, success_i18n_key:, error_i18n_key:) # rubocop:disable Metrics/AbcSize diff --git a/app/controllers/projects/query_loading.rb b/app/controllers/projects/query_loading.rb index c7679d9b9b8..6555949a5a3 100644 --- a/app/controllers/projects/query_loading.rb +++ b/app/controllers/projects/query_loading.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/categories_controller.rb b/app/controllers/projects/settings/categories_controller.rb index 1929018ac41..688465d2042 100644 --- a/app/controllers/projects/settings/categories_controller.rb +++ b/app/controllers/projects/settings/categories_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/custom_fields_controller.rb b/app/controllers/projects/settings/custom_fields_controller.rb index 25cbac60b79..ffd9d0b6244 100644 --- a/app/controllers/projects/settings/custom_fields_controller.rb +++ b/app/controllers/projects/settings/custom_fields_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/general_controller.rb b/app/controllers/projects/settings/general_controller.rb index 024869dc4bd..e485054f49c 100644 --- a/app/controllers/projects/settings/general_controller.rb +++ b/app/controllers/projects/settings/general_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/modules_controller.rb b/app/controllers/projects/settings/modules_controller.rb index c7f3dc070e1..027b9b88bd8 100644 --- a/app/controllers/projects/settings/modules_controller.rb +++ b/app/controllers/projects/settings/modules_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/project_custom_fields_controller.rb b/app/controllers/projects/settings/project_custom_fields_controller.rb index 9dbcb329fe5..b8f458dd551 100644 --- a/app/controllers/projects/settings/project_custom_fields_controller.rb +++ b/app/controllers/projects/settings/project_custom_fields_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/repository_controller.rb b/app/controllers/projects/settings/repository_controller.rb index 3bd1d50b160..18c132916d4 100644 --- a/app/controllers/projects/settings/repository_controller.rb +++ b/app/controllers/projects/settings/repository_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/storage_controller.rb b/app/controllers/projects/settings/storage_controller.rb index 45de66390e0..59df2513e2d 100644 --- a/app/controllers/projects/settings/storage_controller.rb +++ b/app/controllers/projects/settings/storage_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/types_controller.rb b/app/controllers/projects/settings/types_controller.rb index 68c65ceaaa0..7e706a2eede 100644 --- a/app/controllers/projects/settings/types_controller.rb +++ b/app/controllers/projects/settings/types_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings/versions_controller.rb b/app/controllers/projects/settings/versions_controller.rb index 232b0638f07..175963af1bc 100644 --- a/app/controllers/projects/settings/versions_controller.rb +++ b/app/controllers/projects/settings/versions_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/settings_controller.rb b/app/controllers/projects/settings_controller.rb index 67515829647..2758b98bf33 100644 --- a/app/controllers/projects/settings_controller.rb +++ b/app/controllers/projects/settings_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects/templated_controller.rb b/app/controllers/projects/templated_controller.rb index c59e7c03314..acec6583bc0 100644 --- a/app/controllers/projects/templated_controller.rb +++ b/app/controllers/projects/templated_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/projects_controller.rb b/app/controllers/projects_controller.rb index 60e78cf76b3..277bdfdb298 100644 --- a/app/controllers/projects_controller.rb +++ b/app/controllers/projects_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,22 +27,25 @@ #++ class ProjectsController < ApplicationController + include OpTurbo::ComponentStream + menu_item :overview menu_item :roadmap, only: :roadmap - before_action :find_project, except: %i[index new] - before_action :load_query_or_deny_access, only: %i[index] + before_action :find_project, except: %i[index new export_list_modal] + before_action :load_query_or_deny_access, only: %i[index export_list_modal] before_action :authorize, only: %i[copy deactivate_work_package_attachments] before_action :authorize_global, only: %i[new] before_action :require_admin, only: %i[destroy destroy_info] - no_authorization_required! :index + no_authorization_required! :index, :export_list_modal include SortHelper include PaginationHelper include QueriesHelper include ProjectsHelper include Projects::QueryLoading + include OpTurbo::DialogStreamHelper helper_method :has_managed_project_folders? @@ -50,7 +53,7 @@ class ProjectsController < ApplicationController :projects end - def index + def index # rubocop:disable Format/AbcSize respond_to do |format| format.html do flash.now[:error] = @query.errors.full_messages if @query.errors.any? @@ -61,6 +64,27 @@ class ProjectsController < ApplicationController format.any(*supported_export_formats) do export_list(@query, request.format.symbol) end + + format.turbo_stream do + replace_via_turbo_stream( + component: Projects::IndexPageHeaderComponent.new(query: @query, current_user:, state: :show, params:) + ) + update_via_turbo_stream( + component: Filter::FilterButtonComponent.new(query: @query, disable_buttons: false) + ) + replace_via_turbo_stream(component: Projects::TableComponent.new(query: @query, current_user:, params:)) + + current_url = url_for(params.permit(:conroller, :action, :query_id, :filters, :columns, :sortBy, :page, :per_page)) + turbo_streams << turbo_stream.push_state(current_url) + turbo_streams << turbo_stream.turbo_frame_set_src( + "projects_sidemenu", + projects_menu_url(query_id: @query.id, controller_path: "projects") + ) + + turbo_streams << turbo_stream.replace("flash-messages", helpers.render_flash_messages) + + render turbo_stream: turbo_streams + end end end @@ -105,6 +129,10 @@ class ProjectsController < ApplicationController end end + def export_list_modal + respond_with_dialog Projects::ExportListModalComponent.new(query: @query) + end + private def has_managed_project_folders?(project) diff --git a/app/controllers/queries/params_parser.rb b/app/controllers/queries/params_parser.rb index 3968ce1d4e4..acc356e1f54 100644 --- a/app/controllers/queries/params_parser.rb +++ b/app/controllers/queries/params_parser.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/queries/params_parser/api_v3_filters_parser.rb b/app/controllers/queries/params_parser/api_v3_filters_parser.rb index 4bcf0d27b77..35802d9bcf7 100644 --- a/app/controllers/queries/params_parser/api_v3_filters_parser.rb +++ b/app/controllers/queries/params_parser/api_v3_filters_parser.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/queries/params_parser/filters_parser.rb b/app/controllers/queries/params_parser/filters_parser.rb index 8b6a7c377dd..7f52e184b1f 100644 --- a/app/controllers/queries/params_parser/filters_parser.rb +++ b/app/controllers/queries/params_parser/filters_parser.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/repositories_controller.rb b/app/controllers/repositories_controller.rb index 741493d32a1..37682ac30da 100644 --- a/app/controllers/repositories_controller.rb +++ b/app/controllers/repositories_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/roles_controller.rb b/app/controllers/roles_controller.rb index 893c2686653..d4c2e0d08fb 100644 --- a/app/controllers/roles_controller.rb +++ b/app/controllers/roles_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -97,7 +97,7 @@ class RolesController < ApplicationController def report @roles = roles_scope - @permissions = OpenProject::AccessControl.permissions.reject(&:public?) + @permissions = visible_permissions end def bulk_update @@ -110,7 +110,7 @@ class RolesController < ApplicationController redirect_to action: "index" else @calls = calls - @permissions = OpenProject::AccessControl.permissions.reject(&:public?) + @permissions = visible_permissions render action: "report" end end @@ -139,20 +139,18 @@ class RolesController < ApplicationController end end + def visible_permissions + OpenProject::AccessControl.permissions + .reject(&:public?) + .filter(&:visible?) + end + def roles_scope Role.visible.ordered_by_builtin_and_position end - def default_breadcrumb - if action_name == "index" - t("label_role_plural") - else - ActionController::Base.helpers.link_to(t("label_role_plural"), roles_path) - end - end - def show_local_breadcrumb - true + false end def new_params diff --git a/app/controllers/search_controller.rb b/app/controllers/search_controller.rb index e29eeb94e44..eae22730680 100644 --- a/app/controllers/search_controller.rb +++ b/app/controllers/search_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/shares_controller.rb b/app/controllers/shares_controller.rb index 5eebc6cef77..f020a2c9d5a 100644 --- a/app/controllers/shares_controller.rb +++ b/app/controllers/shares_controller.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -32,10 +32,8 @@ class SharesController < ApplicationController include MemberHelper before_action :load_entity - before_action :load_shares, only: %i[index dialog] before_action :load_selected_shares, only: %i[bulk_update bulk_destroy] before_action :load_share, only: %i[destroy update resend_invite] - before_action :enterprise_check, only: %i[index] before_action :check_if_manageable, except: %i[index dialog] before_action :check_if_viewable, only: %i[index dialog] @@ -44,18 +42,20 @@ class SharesController < ApplicationController def dialog; end def index - unless @query.valid? - flash.now[:error] = query.errors.full_messages + unless sharing_strategy.query.valid? + flash.now[:error] = sharing_strategy.query.errors.full_messages end - render Shares::ModalBodyComponent.new(strategy: sharing_strategy, shares: @shares, errors: @errors), layout: nil + render sharing_strategy.modal_body_component(@errors), layout: nil end def create # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity overall_result = [] @errors = ActiveModel::Errors.new(self) - find_or_create_users(send_notification: false) do |member_params| + visible_shares_before_adding = sharing_strategy.shares.present? + + find_or_create_users(send_notification: send_notification?) do |member_params| user = User.find_by(id: member_params[:user_id]) if user.present? && user.locked? @errors.add(:base, I18n.t("sharing.warning_locked_user", user: user.name)) @@ -65,13 +65,13 @@ class SharesController < ApplicationController end end - @new_shares = overall_result.map(&:result).reverse + new_shares = overall_result.map(&:result).reverse if overall_result.present? - # In case the number of newly added shares is equal to the whole number of shares, - # we have to render the whole modal again to get rid of the blankslate - if current_visible_member_count > 1 && @new_shares.size < current_visible_member_count - respond_with_prepend_shares + # In case we did not have shares before we have to replace the modal to get rid of the blankstate, + # otherwise we can prepend the new shares + if visible_shares_before_adding + respond_with_prepend_shares(new_shares) else respond_with_replace_modal end @@ -83,11 +83,11 @@ class SharesController < ApplicationController def update create_or_update_share(@share.principal.id, params[:role_ids]) - load_shares + shares = sharing_strategy.shares(reload: true) - if @shares.empty? + if shares.empty? respond_with_replace_modal - elsif @shares.include?(@share) + elsif shares.include?(@share) respond_with_update_permission_button else respond_with_remove_share @@ -97,13 +97,15 @@ class SharesController < ApplicationController def destroy destroy_share(@share) - if current_visible_member_count.zero? + # When we removed the last share we have to replace the modal to show the blankstate + if sharing_strategy.shares(reload: true).empty? respond_with_replace_modal else respond_with_remove_share end end + # TODO: This is still work package specific def resend_invite OpenProject::Notifications.send(OpenProject::Events::WORK_PACKAGE_SHARED, work_package_member: @share, @@ -115,16 +117,16 @@ class SharesController < ApplicationController def bulk_update @selected_shares.each { |share| create_or_update_share(share.principal.id, params[:role_ids]) } - respond_with_bulk_updated_permission_buttons + respond_with_bulk_updated_permission_buttons(@selected_shares) end def bulk_destroy @selected_shares.each { |share| destroy_share(share) } - if current_visible_member_count.zero? + if sharing_strategy.shares(reload: true).empty? respond_with_replace_modal else - respond_with_bulk_removed_shares + respond_with_bulk_removed_shares(@selected_shares) end end @@ -144,12 +146,6 @@ class SharesController < ApplicationController render_403 end - def enterprise_check - return if EnterpriseToken.allows_to?(:work_package_sharing) - - render Shares::ModalUpsaleComponent.new - end - def destroy_share(share) Shares::DeleteService .new(user: current_user, model: share, contract_class: sharing_strategy.delete_contract_class) @@ -165,18 +161,14 @@ class SharesController < ApplicationController end def respond_with_replace_modal - replace_via_turbo_stream( - component: Shares::ModalBodyComponent.new( - strategy: sharing_strategy, - shares: @new_shares || load_shares, - errors: @errors - ) - ) + sharing_strategy.shares(reload: true) + + replace_via_turbo_stream(component: sharing_strategy.modal_body_component(@errors)) respond_with_turbo_streams end - def respond_with_prepend_shares + def respond_with_prepend_shares(new_shares) replace_via_turbo_stream( component: Shares::InviteUserFormComponent.new( strategy: sharing_strategy, @@ -187,21 +179,14 @@ class SharesController < ApplicationController update_via_turbo_stream( component: Shares::CounterComponent.new( strategy: sharing_strategy, - count: current_visible_member_count + count: sharing_strategy.shares(reload: true).count ) ) - @new_shares.each do |share| + new_shares.each do |share| prepend_via_turbo_stream( - component: Shares::ShareRowComponent.new( - share:, - strategy: sharing_strategy - ), - target_component: Shares::ModalBodyComponent.new( - strategy: sharing_strategy, - shares: load_shares, - errors: @errors - ) + component: Shares::ShareRowComponent.new(share:, strategy: sharing_strategy), + target_component: Shares::ManageSharesComponent.new(strategy: sharing_strategy, modal_content: nil, errors: @errors) ) end @@ -223,7 +208,7 @@ class SharesController < ApplicationController replace_via_turbo_stream( component: Shares::PermissionButtonComponent.new( share: @share, - available_roles: sharing_strategy.available_roles, + strategy: sharing_strategy, data: { "test-selector": "op-share-dialog-update-role" } ) ) @@ -241,7 +226,7 @@ class SharesController < ApplicationController update_via_turbo_stream( component: Shares::CounterComponent.new( strategy: sharing_strategy, - count: current_visible_member_count + count: sharing_strategy.shares(reload: true).count ) ) @@ -252,7 +237,7 @@ class SharesController < ApplicationController update_via_turbo_stream( component: Shares::UserDetailsComponent.new( share: @share, - manager_mode: sharing_strategy.manageable?, + strategy: sharing_strategy, invite_resent: true ) ) @@ -260,12 +245,12 @@ class SharesController < ApplicationController respond_with_turbo_streams end - def respond_with_bulk_updated_permission_buttons - @selected_shares.each do |share| + def respond_with_bulk_updated_permission_buttons(selected_shares) + selected_shares.each do |share| replace_via_turbo_stream( component: Shares::PermissionButtonComponent.new( share:, - available_roles: sharing_strategy.available_roles, + strategy: sharing_strategy, data: { "test-selector": "op-share-dialog-update-role" } ) ) @@ -274,8 +259,8 @@ class SharesController < ApplicationController respond_with_turbo_streams end - def respond_with_bulk_removed_shares - @selected_shares.each do |share| + def respond_with_bulk_removed_shares(selected_shares) + selected_shares.each do |share| remove_via_turbo_stream( component: Shares::ShareRowComponent.new( share:, @@ -286,7 +271,7 @@ class SharesController < ApplicationController update_via_turbo_stream( component: Shares::CounterComponent.new( - count: current_visible_member_count, + count: sharing_strategy.shares(reload: true).count, strategy: sharing_strategy ) ) @@ -294,13 +279,19 @@ class SharesController < ApplicationController respond_with_turbo_streams end + def send_notification? + return false if @entity.is_a?(WorkPackage) # For WorkPackages we have a custom notification + + true + end + def load_entity # rubocop:disable Metrics/AbcSize if params["work_package_id"] @entity = WorkPackage.visible.find(params["work_package_id"]) - @sharing_strategy = SharingStrategies::WorkPackageStrategy.new(@entity, user: current_user) + @sharing_strategy = SharingStrategies::WorkPackageStrategy.new(@entity, user: current_user, query_params:) elsif params["project_query_id"] @entity = ProjectQuery.visible.find(params["project_query_id"]) - @sharing_strategy = SharingStrategies::ProjectQueryStrategy.new(@entity, user: current_user) + @sharing_strategy = SharingStrategies::ProjectQueryStrategy.new(@entity, user: current_user, query_params:) else raise ArgumentError, <<~ERROR Nested the SharesController under an entity controller that is not yet configured to support sharing. @@ -311,46 +302,21 @@ class SharesController < ApplicationController Request Path: #{request.path} ERROR end - - if @entity.respond_to?(:project) - @project = @entity.project - end end def load_share @share = @entity.members.find(params[:id]) end - def current_visible_member_count - @current_visible_member_count ||= load_shares.size - end - - def load_query - return @query if defined?(@query) - - @query = ParamsToQueryService - .new(Member, current_user, query_class: Queries::Members::NonInheritedMemberQuery) - .call(params) - - # Set default filter on the entity - @query.where("entity_id", "=", @entity.id) - @query.where("entity_type", "=", @entity.class.name) - if @project - @query.where("project_id", "=", @project.id) - end - - @query.order(name: :asc) unless params[:sortBy] - - @query - end - - def load_shares - @shares = load_query.results - end - def load_selected_shares @selected_shares = Member.includes(:principal) .of_entity(@entity) .where(id: params[:share_ids]) end + + def query_params + params + .slice(:filters, :sortBy, :groupBy) + .permit! # ParamsToQueryService will parse the data, so we can permit everything here + end end diff --git a/app/controllers/statuses_controller.rb b/app/controllers/statuses_controller.rb index c3b0e10784f..2041400006d 100644 --- a/app/controllers/statuses_controller.rb +++ b/app/controllers/statuses_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -85,16 +85,8 @@ class StatusesController < ApplicationController protected - def default_breadcrumb - if action_name == "index" - t(:label_work_package_status_plural) - else - ActionController::Base.helpers.link_to(t(:label_work_package_status_plural), statuses_path) - end - end - def show_local_breadcrumb - true + false end def recompute_progress_values diff --git a/app/controllers/sys_controller.rb b/app/controllers/sys_controller.rb index e709ef3b705..c2d0bd085e7 100644 --- a/app/controllers/sys_controller.rb +++ b/app/controllers/sys_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,6 +29,8 @@ require "open_project/repository_authentication" class SysController < ActionController::Base + include Security::DefaultUrlOptions + before_action :check_enabled before_action :require_basic_auth, only: [:repo_auth] before_action :find_project, only: [:update_required_storage] diff --git a/app/controllers/types_controller.rb b/app/controllers/types_controller.rb index 224593c207b..31c8ad25cd7 100644 --- a/app/controllers/types_controller.rb +++ b/app/controllers/types_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -139,14 +139,6 @@ class TypesController < ApplicationController notice:) end - def default_breadcrumb - if action_name == "index" - t(:label_work_package_types) - else - ActionController::Base.helpers.link_to(t(:label_work_package_types), types_path) - end - end - def render_edit_tab(type) @tab = params[:tab] @projects = Project.all @@ -156,7 +148,7 @@ class TypesController < ApplicationController end def show_local_breadcrumb - true + false end def update_success_message diff --git a/app/controllers/users/memberships_controller.rb b/app/controllers/users/memberships_controller.rb index 2e02321d568..681163c3474 100644 --- a/app/controllers/users/memberships_controller.rb +++ b/app/controllers/users/memberships_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 399fab97ab0..006335e2d3c 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -219,7 +219,7 @@ class UsersController < ApplicationController end def deletion_info - render action: "deletion_info", layout: my_or_admin_layout + render action: "deletion_info", layout: my_or_admin_layout, locals: { layout: my_or_admin_layout } end private @@ -282,16 +282,8 @@ class UsersController < ApplicationController protected - def default_breadcrumb - if action_name == "index" - t("label_user_plural") - else - ActionController::Base.helpers.link_to(t("label_user_plural"), users_path) - end - end - def show_local_breadcrumb - can_manage_or_create_users? && action_name != "show" + false end def build_user_update_params diff --git a/app/controllers/versions_controller.rb b/app/controllers/versions_controller.rb index 9d4d4fd40ae..87d25fe223d 100644 --- a/app/controllers/versions_controller.rb +++ b/app/controllers/versions_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/watchers_controller.rb b/app/controllers/watchers_controller.rb index ee4e32938ac..395a9e4a686 100644 --- a/app/controllers/watchers_controller.rb +++ b/app/controllers/watchers_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/wiki_controller.rb b/app/controllers/wiki_controller.rb index d0b646e7df9..95538c1a28c 100644 --- a/app/controllers/wiki_controller.rb +++ b/app/controllers/wiki_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -260,11 +260,11 @@ class WikiController < ApplicationController end def diff - if (@diff = @page.diff(params[:version], params[:version_from])) - @html_diff = HTMLDiff::DiffBuilder.new( - helpers.format_text(@diff.content_from.data.text, disable_macro_expansion: true), - helpers.format_text(@diff.content_to.data.text, disable_macro_expansion: true) - ).build + if (@diff = @page.diff(params[:version_to], params[:version_from])) + @html_diff = OpenProject::HtmlDiff.from_markdown( + @diff.content_from.data.text, + @diff.content_to.data.text + ) else render_404 end diff --git a/app/controllers/wiki_menu_items_controller.rb b/app/controllers/wiki_menu_items_controller.rb index 6ac9c2358cc..1a035cc1da6 100644 --- a/app/controllers/wiki_menu_items_controller.rb +++ b/app/controllers/wiki_menu_items_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/work_packages/auto_completes_controller.rb b/app/controllers/work_packages/auto_completes_controller.rb index 5a06d103d14..0f2677a9cb2 100644 --- a/app/controllers/work_packages/auto_completes_controller.rb +++ b/app/controllers/work_packages/auto_completes_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/work_packages/bulk_controller.rb b/app/controllers/work_packages/bulk_controller.rb index 0951fd72de3..8030b41f7ce 100644 --- a/app/controllers/work_packages/bulk_controller.rb +++ b/app/controllers/work_packages/bulk_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/work_packages/bulk_error_message.rb b/app/controllers/work_packages/bulk_error_message.rb index a0e5a9acf2a..bdce01fa3cf 100644 --- a/app/controllers/work_packages/bulk_error_message.rb +++ b/app/controllers/work_packages/bulk_error_message.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/work_packages/menus_controller.rb b/app/controllers/work_packages/menus_controller.rb index f05a98d8160..a4d8d3c570c 100644 --- a/app/controllers/work_packages/menus_controller.rb +++ b/app/controllers/work_packages/menus_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/work_packages/moves_controller.rb b/app/controllers/work_packages/moves_controller.rb index a9bbe6cd8e9..84fb506e34c 100644 --- a/app/controllers/work_packages/moves_controller.rb +++ b/app/controllers/work_packages/moves_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/work_packages/progress_controller.rb b/app/controllers/work_packages/progress_controller.rb index 96335b394d2..3d1831c70f4 100644 --- a/app/controllers/work_packages/progress_controller.rb +++ b/app/controllers/work_packages/progress_controller.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -35,14 +35,13 @@ class WorkPackages::ProgressController < ApplicationController done_ratio].freeze layout false - before_action :set_work_package - before_action :extract_persisted_progress_attributes, only: %i[edit create update] authorization_checked! :new, :edit, :create, :update helper_method :modal_class def new - build_up_brand_new_work_package + make_fake_initial_work_package + set_progress_attributes_to_work_package render modal_class.new(@work_package, focused_field: params[:field], @@ -50,15 +49,18 @@ class WorkPackages::ProgressController < ApplicationController end def edit - build_up_work_package + find_work_package + set_progress_attributes_to_work_package render modal_class.new(@work_package, focused_field: params[:field], touched_field_map:) end + # rubocop:disable Metrics/AbcSize def create - service_call = build_up_brand_new_work_package + make_fake_initial_work_package + service_call = set_progress_attributes_to_work_package if service_call.errors .map(&:attribute) @@ -72,17 +74,24 @@ class WorkPackages::ProgressController < ApplicationController render :update, status: :unprocessable_entity end end - else + # following 3 lines to be removed in 15.0 with :percent_complete_edition feature flag removal + elsif !OpenProject::FeatureDecisions.percent_complete_edition_active? render json: { estimatedTime: formatted_duration(@work_package.estimated_hours), remainingTime: formatted_duration(@work_package.remaining_hours) } + else + render json: { estimatedTime: formatted_duration(@work_package.estimated_hours), + remainingTime: formatted_duration(@work_package.remaining_hours), + percentageDone: @work_package.done_ratio } end end + # rubocop:enable Metrics/AbcSize def update + find_work_package service_call = WorkPackages::UpdateService .new(user: current_user, model: @work_package) - .call(work_package_params) + .call(work_package_progress_params) if service_call.success? respond_to do |format| @@ -111,28 +120,29 @@ class WorkPackages::ProgressController < ApplicationController end end - def set_work_package + def find_work_package @work_package = WorkPackage.visible.find(params[:work_package_id]) - rescue ActiveRecord::RecordNotFound - @work_package = WorkPackage.new + end + + def make_fake_initial_work_package + initial_params = params["work_package"]["initial"] + .slice(*%w[estimated_hours remaining_hours done_ratio status_id]) + .permit! + @work_package = WorkPackage.new(initial_params) + @work_package.clear_changes_information end def touched_field_map params.require(:work_package) .slice("estimated_hours_touched", "remaining_hours_touched", + "done_ratio_touched", "status_id_touched") .transform_values { _1 == "true" } .permit! end - def extract_persisted_progress_attributes - @persisted_progress_attributes = @work_package - .attributes - .slice("estimated_hours", "remaining_hours", "status_id") - end - - def work_package_params + def work_package_progress_params params.require(:work_package) .slice(*allowed_touched_params) .permit! @@ -145,8 +155,11 @@ class WorkPackages::ProgressController < ApplicationController def allowed_params if WorkPackage.use_status_for_done_ratio? %i[estimated_hours status_id] - else + # two next lines to be removed in 15.0 with :percent_complete_edition feature flag removal + elsif !OpenProject::FeatureDecisions.percent_complete_edition_active? %i[estimated_hours remaining_hours] + else + %i[estimated_hours remaining_hours done_ratio] end end @@ -154,20 +167,12 @@ class WorkPackages::ProgressController < ApplicationController touched_field_map[:"#{field}_touched"] end - def build_up_work_package + def set_progress_attributes_to_work_package WorkPackages::SetAttributesService .new(user: current_user, model: @work_package, contract_class: WorkPackages::CreateContract) - .call(work_package_params) - end - - def build_up_brand_new_work_package - WorkPackages::SetAttributesService - .new(user: current_user, - model: @work_package, - contract_class: WorkPackages::CreateContract) - .call(work_package_params) + .call(work_package_progress_params) end def formatted_duration(hours) diff --git a/app/controllers/work_packages/reports_controller.rb b/app/controllers/work_packages/reports_controller.rb index e1cb2800030..7507026789b 100644 --- a/app/controllers/work_packages/reports_controller.rb +++ b/app/controllers/work_packages/reports_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/controllers/work_packages/split_view_controller.rb b/app/controllers/work_packages/split_view_controller.rb new file mode 100644 index 00000000000..4a5a9057d95 --- /dev/null +++ b/app/controllers/work_packages/split_view_controller.rb @@ -0,0 +1,55 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +require "rack/utils" + +class WorkPackages::SplitViewController < ApplicationController + # Authorization is checked in the find_work_package action + no_authorization_required! :update_counter + before_action :find_work_package, only: %i[update_counter] + + def update_counter + respond_to do |format| + format.turbo_stream do + render turbo_stream: [ + WorkPackages::Details::UpdateCounterComponent + .new(work_package: @work_package, menu_name: params[:counter]) + .render_as_turbo_stream(action: :replace, view_context:) + ] + end + end + end + + private + + def find_work_package + @work_package = WorkPackage.visible.find(params[:id]) + rescue ActiveRecord::RecordNotFound + render_404 message: I18n.t(:error_work_package_id_not_found) + end +end diff --git a/app/controllers/work_packages_controller.rb b/app/controllers/work_packages_controller.rb index 513d5d9e174..3d8e1298603 100644 --- a/app/controllers/work_packages_controller.rb +++ b/app/controllers/work_packages_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -31,6 +31,7 @@ class WorkPackagesController < ApplicationController include PaginationHelper include Layout include WorkPackagesControllerHelper + include OpTurbo::DialogStreamHelper accept_key_auth :index, :show @@ -38,11 +39,12 @@ class WorkPackagesController < ApplicationController :project, only: :show before_action :load_and_authorize_in_optional_project, :check_allowed_export, - :protect_from_unauthorized_export, only: :index - authorization_checked! :index, :show + :protect_from_unauthorized_export, only: %i[index export_dialog] + authorization_checked! :index, :show, :export_dialog before_action :load_and_validate_query, only: :index, unless: -> { request.format.html? } before_action :load_work_packages, only: :index, if: -> { request.format.atom? } + before_action :load_and_validate_query_for_export, only: :export_dialog def index respond_to do |format| @@ -84,13 +86,21 @@ class WorkPackagesController < ApplicationController end end + def export_dialog + respond_with_dialog WorkPackages::Exports::ModalDialogComponent.new(query: @query, project: @project, title: params[:title]) + end + protected + def load_and_validate_query_for_export + load_and_validate_query + end + def export_list(mime_type) job_id = WorkPackages::Exports::ScheduleService - .new(user: current_user) - .call(query: @query, mime_type:, params:) - .result + .new(user: current_user) + .call(query: @query, mime_type:, params:) + .result if request.headers["Accept"]&.include?("application/json") render json: { job_id: } @@ -101,8 +111,8 @@ class WorkPackagesController < ApplicationController def export_single(mime_type) exporter = Exports::Register - .single_exporter(WorkPackage, mime_type) - .new(work_package, params) + .single_exporter(WorkPackage, mime_type) + .new(work_package, params) export = exporter.export! send_data(export.content, type: export.mime_type, filename: export.title) diff --git a/app/controllers/workflows_controller.rb b/app/controllers/workflows_controller.rb index 26f94fb71b3..bf78196c288 100644 --- a/app/controllers/workflows_controller.rb +++ b/app/controllers/workflows_controller.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -45,7 +45,7 @@ class WorkflowsController < ApplicationController end def edit - @used_statuses_only = params[:used_statuses_only] != "0" + @used_statuses_only = params[:used_statuses_only] == "1" statuses_for_form @@ -93,16 +93,8 @@ class WorkflowsController < ApplicationController end end - def default_breadcrumb - if action_name == "edit" - t("label_workflow") - else - ActionController::Base.helpers.link_to(t("label_workflow"), url_for(controller: "/workflows", action: "edit")) - end - end - def show_local_breadcrumb - true + false end private diff --git a/app/forms/application_form.rb b/app/forms/application_form.rb new file mode 100644 index 00000000000..4438a280917 --- /dev/null +++ b/app/forms/application_form.rb @@ -0,0 +1,42 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class ApplicationForm < Primer::Forms::Base + def self.settings_form + form do |f| + f = SettingsFormDecorator.new(f) + yield f + end + end + + def url_helpers + Rails.application.routes.url_helpers + end +end diff --git a/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb b/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb index f8a5f756220..db2fa302c4d 100644 --- a/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb +++ b/app/forms/custom_fields/inputs/base/autocomplete/multi_value_input.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb b/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb index d067a42478a..3a9bf73dd15 100644 --- a/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb +++ b/app/forms/custom_fields/inputs/base/autocomplete/single_value_input.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb b/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb index ad2460cf8c4..e2d17241aed 100644 --- a/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb +++ b/app/forms/custom_fields/inputs/base/autocomplete/user_query_utils.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/base/input.rb b/app/forms/custom_fields/inputs/base/input.rb index 5f00afda992..6e30709cc0f 100644 --- a/app/forms/custom_fields/inputs/base/input.rb +++ b/app/forms/custom_fields/inputs/base/input.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/base/utils.rb b/app/forms/custom_fields/inputs/base/utils.rb index fe786cc07fd..b6ee0ab0a2e 100644 --- a/app/forms/custom_fields/inputs/base/utils.rb +++ b/app/forms/custom_fields/inputs/base/utils.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/bool.rb b/app/forms/custom_fields/inputs/bool.rb index 69ee007427f..524ea846312 100644 --- a/app/forms/custom_fields/inputs/bool.rb +++ b/app/forms/custom_fields/inputs/bool.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/date.rb b/app/forms/custom_fields/inputs/date.rb index 2834b3a8a60..a2b90cb37b8 100644 --- a/app/forms/custom_fields/inputs/date.rb +++ b/app/forms/custom_fields/inputs/date.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/float.rb b/app/forms/custom_fields/inputs/float.rb index 62e45610b40..ccd79646d39 100644 --- a/app/forms/custom_fields/inputs/float.rb +++ b/app/forms/custom_fields/inputs/float.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/int.rb b/app/forms/custom_fields/inputs/int.rb index ab5fc29e50d..833a543e44a 100644 --- a/app/forms/custom_fields/inputs/int.rb +++ b/app/forms/custom_fields/inputs/int.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/multi_select_list.rb b/app/forms/custom_fields/inputs/multi_select_list.rb index f11f8cf5a39..832ddb524b4 100644 --- a/app/forms/custom_fields/inputs/multi_select_list.rb +++ b/app/forms/custom_fields/inputs/multi_select_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/multi_user_select_list.rb b/app/forms/custom_fields/inputs/multi_user_select_list.rb index 6dc05fe908e..f086b8b8948 100644 --- a/app/forms/custom_fields/inputs/multi_user_select_list.rb +++ b/app/forms/custom_fields/inputs/multi_user_select_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/multi_version_select_list.rb b/app/forms/custom_fields/inputs/multi_version_select_list.rb index 8092247ccb8..f03ce7672f6 100644 --- a/app/forms/custom_fields/inputs/multi_version_select_list.rb +++ b/app/forms/custom_fields/inputs/multi_version_select_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/single_select_list.rb b/app/forms/custom_fields/inputs/single_select_list.rb index 907200cb95d..6b86c9c3a61 100644 --- a/app/forms/custom_fields/inputs/single_select_list.rb +++ b/app/forms/custom_fields/inputs/single_select_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/single_user_select_list.rb b/app/forms/custom_fields/inputs/single_user_select_list.rb index 8203c534b49..0c763401a46 100644 --- a/app/forms/custom_fields/inputs/single_user_select_list.rb +++ b/app/forms/custom_fields/inputs/single_user_select_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/single_version_select_list.rb b/app/forms/custom_fields/inputs/single_version_select_list.rb index 19f832c916d..870929858e7 100644 --- a/app/forms/custom_fields/inputs/single_version_select_list.rb +++ b/app/forms/custom_fields/inputs/single_version_select_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/string.rb b/app/forms/custom_fields/inputs/string.rb index 8af06d84e6a..e1bd770bacd 100644 --- a/app/forms/custom_fields/inputs/string.rb +++ b/app/forms/custom_fields/inputs/string.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/custom_fields/inputs/text.rb b/app/forms/custom_fields/inputs/text.rb index adb224761a3..fc2feed8a14 100644 --- a/app/forms/custom_fields/inputs/text.rb +++ b/app/forms/custom_fields/inputs/text.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/project_custom_field_sections/name_form.rb b/app/forms/project_custom_field_sections/name_form.rb index caba64f6b8f..78e830c1e3d 100644 --- a/app/forms/project_custom_field_sections/name_form.rb +++ b/app/forms/project_custom_field_sections/name_form.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/projects/custom_fields/custom_field_mapping_form.rb b/app/forms/projects/custom_fields/custom_field_mapping_form.rb index 3db99fc5b2d..f637ea05993 100644 --- a/app/forms/projects/custom_fields/custom_field_mapping_form.rb +++ b/app/forms/projects/custom_fields/custom_field_mapping_form.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -38,18 +38,19 @@ module Projects::CustomFields visually_hide_label: true, validation_message: project_ids_error_message, autocomplete_options: { + with_search_icon: true, openDirectly: false, focusDirectly: false, multiple: true, dropdownPosition: "bottom", disabledProjects: projects_with_custom_field_mapping, - inputName: "project_custom_field_project_mapping[project_ids]" + inputName: "#{input_name}[project_ids]" } ) group.check_box( name: :include_sub_projects, - label: I18n.t("projects.settings.project_custom_fields.new_project_mapping_form.include_sub_projects"), + label: I18n.t(:label_include_sub_projects), checked: false, label_arguments: { class: "no-wrap" } ) @@ -72,10 +73,18 @@ module Projects::CustomFields end def projects_with_custom_field_mapping - ProjectCustomFieldProjectMapping + join_table .where(custom_field_id: @project_mapping.custom_field_id) .pluck(:project_id) .to_h { |id| [id, id] } end + + def join_table + @project_mapping.class + end + + def input_name + join_table.model_name.singular + end end end diff --git a/app/forms/projects/custom_fields/form.rb b/app/forms/projects/custom_fields/form.rb index 46704f69082..23dd7431657 100644 --- a/app/forms/projects/custom_fields/form.rb +++ b/app/forms/projects/custom_fields/form.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/settings_form_decorator.rb b/app/forms/settings_form_decorator.rb new file mode 100644 index 00000000000..3d79ef6d401 --- /dev/null +++ b/app/forms/settings_form_decorator.rb @@ -0,0 +1,109 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class SettingsFormDecorator + attr_reader :form + + def initialize(form) + @form = form + end + + def method_missing(method, ...) + form.send(method, ...) + end + + def respond_to_missing?(method, include_private = false) + form.respond_to?(method, include_private) + end + + def text_field(name:, **options) + options.reverse_merge!( + label: setting_label(name), + value: setting_value(name), + disabled: setting_disabled?(name) + ) + form.text_field(name:, **options) + end + + def check_box(name:, **options) + options.reverse_merge!( + label: setting_label(name), + checked: setting_value(name), + disabled: setting_disabled?(name) + ) + form.check_box(name:, **options) + end + + def radio_button_group(name:, values:, button_options: {}, **options) + radio_group_options = options.reverse_merge( + label: setting_label(name) + ) + form.radio_button_group( + name:, + disabled: setting_disabled?(name), + **radio_group_options + ) do |radio_group| + values.each do |value| + radio_group.radio_button( + **button_options.reverse_merge( + value:, + checked: setting_value(name) == value, + label: setting_label(name, value), + caption: setting_caption_html(name, value) + ) + ) + end + end + end + + def submit + form.submit(name: "submit", + label: I18n.t("button_save"), + scheme: :primary) + end + + protected + + def setting_label(*names) + I18n.t("setting_#{names.join('_')}") + end + + def setting_caption_html(*names) + I18n.t("setting_#{names.join('_')}_caption_html").html_safe + end + + def setting_value(name) + Setting[name] + end + + def setting_disabled?(name) + !Setting.send(:"#{name}_writable?") + end +end diff --git a/app/forms/shares/invitee.rb b/app/forms/shares/invitee.rb index 61d5a3d41ab..e8eb8f8407d 100644 --- a/app/forms/shares/invitee.rb +++ b/app/forms/shares/invitee.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/forms/work_packages/pre_14_4_progress_form.rb b/app/forms/work_packages/pre_14_4_progress_form.rb new file mode 100644 index 00000000000..2127f3fdb34 --- /dev/null +++ b/app/forms/work_packages/pre_14_4_progress_form.rb @@ -0,0 +1,213 @@ +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2010-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +# This file can be safely deleted once the feature flag :percent_complete_edition +# is removed, which should happen for OpenProject 15.0 release. +# +# Copied from commit 109b135b and modified to have the [work_package][initial] +# data needed by progress_controller +class WorkPackages::Pre144ProgressForm < ApplicationForm + ## + # Primer::Forms::BaseComponent or ApplicationForm will always autofocus the + # first input field with an error present on it. Despite this behavior being + # a11y-friendly, it breaks the modal's UX when an invalid input field + # is rendered. + # + # The reason for this is since we're implementing a "format on blur", when + # we make a request to the server that will set an input field in an invalid + # state and it is returned as such, any time we blur this autofocused field, + # we'll perform another request that will still have the input in an invalid + # state causing it to autofocus again and preventing us from leaving this + # "limbo state". + ## + def before_render + # no-op + end + + attr_reader :work_package, :mode + + def initialize(work_package:, + mode: :work_based, + focused_field: :remaining_hours, + touched_field_map: {}) + super() + + @work_package = work_package + @mode = mode + @focused_field = focused_field_by_selection(focused_field) + @touched_field_map = touched_field_map + ensure_only_one_error_for_remaining_work_exceeding_work + end + + form do |query_form| + query_form.group(layout: :horizontal) do |group| + if mode == :status_based + select_field_options = { name: :status_id, label: I18n.t(:label_percent_complete) }.tap do |options| + options.reverse_merge!(default_field_options(:status_id)) + options.merge!(disabled: @work_package.new_record?) + end + + group.select_list(**select_field_options) do |select_list| + WorkPackages::UpdateContract.new(@work_package, User.current) + .assignable_statuses + .find_each do |status| + select_list.option( + label: "#{status.name} (#{status.default_done_ratio}%)", + value: status.id + ) + end + end + + render_text_field(group, name: :estimated_hours, label: I18n.t(:label_work)) + render_readonly_text_field(group, name: :remaining_hours, label: I18n.t(:label_remaining_work)) + + # Add a hidden field in create forms as the select field is disabled and is otherwise not included in the form payload + group.hidden(name: :status_id) if @work_package.new_record? + + group.hidden(name: :status_id_touched, + value: @touched_field_map["status_id_touched"] || false, + data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", + "referrer-field": "work_package[status_id]" }) + group.hidden(name: :estimated_hours_touched, + value: @touched_field_map["estimated_hours_touched"] || false, + data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", + "referrer-field": "work_package[estimated_hours]" }) + else + render_text_field(group, name: :estimated_hours, label: I18n.t(:label_work)) + render_text_field(group, name: :remaining_hours, label: I18n.t(:label_remaining_work), + disabled: disabled_remaining_work_field?) + render_readonly_text_field(group, name: :done_ratio, label: I18n.t(:label_percent_complete)) + + group.hidden(name: :estimated_hours_touched, + value: @touched_field_map["estimated_hours_touched"] || false, + data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", + "referrer-field": "work_package[estimated_hours]" }) + group.hidden(name: :remaining_hours_touched, + value: @touched_field_map["remaining_hours_touched"] || false, + data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", + "referrer-field": "work_package[remaining_hours]" }) + end + group.fields_for(:initial) do |builder| + ::WorkPackages::ProgressForm::InitialValuesForm.new(builder, work_package:, mode:) + end + end + end + + private + + def ensure_only_one_error_for_remaining_work_exceeding_work + if work_package.errors.added?(:remaining_hours, :cant_exceed_work) && + work_package.errors.added?(:estimated_hours, :cant_be_inferior_to_remaining_work) + error_to_delete = + if @focused_field == :estimated_hours + :remaining_hours + else + :estimated_hours + end + work_package.errors.delete(error_to_delete) + end + end + + def focused_field_by_selection(field) + if field == :remaining_hours && disabled_remaining_work_field? + :estimated_hours + else + field + end + end + + def render_text_field(group, + name:, + label:, + disabled: false, + placeholder: nil) + text_field_options = { + name:, + value: field_value(name), + label:, + disabled:, + placeholder: + } + text_field_options.reverse_merge!(default_field_options(name)) + + group.text_field(**text_field_options) + end + + def render_readonly_text_field(group, + name:, + label:, + disabled: false, + placeholder: true) + text_field_options = { + name:, + value: field_value(name), + label:, + readonly: true, + disabled:, + classes: "input--readonly", + placeholder: ("-" if placeholder) + } + text_field_options.reverse_merge!(default_field_options(name)) + + group.text_field(**text_field_options) + end + + def field_value(name) + errors = @work_package.errors.where(name) + if (user_value = errors.map { |error| error.options[:value] }.find { !_1.nil? }) + user_value + elsif name == :done_ratio + format_to_smallest_fractional_part(@work_package.public_send(name)) + else + DurationConverter.output(@work_package.public_send(name)) + end + end + + def format_to_smallest_fractional_part(number) + return number if number.nil? + + number % 1 == 0 ? number.to_i : number + end + + def default_field_options(name) + data = { "work-packages--progress--preview-progress-target": "progressInput", + "work-packages--progress--touched-field-marker-target": "progressInput", + action: "input->work-packages--progress--touched-field-marker#markFieldAsTouched" } + + if @focused_field == name + data[:"work-packages--progress--focus-field-target"] = "fieldToFocus" + end + { data: } + end + + # Remaining work field is enabled when work is set, or when there are errors + # on fields so that they can be corrected. + def disabled_remaining_work_field? + @work_package.estimated_hours.nil? && @work_package.errors.empty? + end +end diff --git a/app/forms/work_packages/progress_form.rb b/app/forms/work_packages/progress_form.rb index 7399ef12a94..e61176221d2 100644 --- a/app/forms/work_packages/progress_form.rb +++ b/app/forms/work_packages/progress_form.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -44,7 +44,7 @@ class WorkPackages::ProgressForm < ApplicationForm # no-op end - attr_reader :work_package + attr_reader :work_package, :mode def initialize(work_package:, mode: :work_based, @@ -61,51 +61,24 @@ class WorkPackages::ProgressForm < ApplicationForm form do |query_form| query_form.group(layout: :horizontal) do |group| - if @mode == :status_based - select_field_options = { name: :status_id, label: I18n.t(:label_percent_complete) }.tap do |options| - options.reverse_merge!(default_field_options(:status_id)) - options.merge!(disabled: @work_package.new_record?) - end + if mode == :status_based + select_status_list(group) + text_field(group, name: :estimated_hours, label: I18n.t(:label_work)) + readonly_text_field(group, name: :remaining_hours, label: I18n.t(:label_remaining_work)) - group.select_list(**select_field_options) do |select_list| - WorkPackages::UpdateContract.new(@work_package, User.current) - .assignable_statuses - .find_each do |status| - select_list.option( - label: "#{status.name} (#{status.default_done_ratio}%)", - value: status.id - ) - end - end - - render_text_field(group, name: :estimated_hours, label: I18n.t(:label_work)) - render_readonly_text_field(group, name: :remaining_hours, label: I18n.t(:label_remaining_work)) - - # Add a hidden field in create forms as the select field is disabled and is otherwise not included in the form payload - group.hidden(name: :status_id) if @work_package.new_record? - - group.hidden(name: :status_id_touched, - value: @touched_field_map["status_id_touched"] || false, - data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", - "referrer-field": "work_package[status_id]" }) - group.hidden(name: :estimated_hours_touched, - value: @touched_field_map["estimated_hours_touched"] || false, - data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", - "referrer-field": "work_package[estimated_hours]" }) + hidden_touched_field(group, name: :status_id) + hidden_touched_field(group, name: :estimated_hours) else - render_text_field(group, name: :estimated_hours, label: I18n.t(:label_work)) - render_text_field(group, name: :remaining_hours, label: I18n.t(:label_remaining_work), - disabled: disabled_remaining_work_field?) - render_readonly_text_field(group, name: :done_ratio, label: I18n.t(:label_percent_complete)) + text_field(group, name: :estimated_hours, label: I18n.t(:label_work)) + text_field(group, name: :remaining_hours, label: I18n.t(:label_remaining_work)) + text_field(group, name: :done_ratio, label: I18n.t(:label_percent_complete)) - group.hidden(name: :estimated_hours_touched, - value: @touched_field_map["estimated_hours_touched"] || false, - data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", - "referrer-field": "work_package[estimated_hours]" }) - group.hidden(name: :remaining_hours_touched, - value: @touched_field_map["remaining_hours_touched"] || false, - data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", - "referrer-field": "work_package[remaining_hours]" }) + hidden_touched_field(group, name: :estimated_hours) + hidden_touched_field(group, name: :remaining_hours) + hidden_touched_field(group, name: :done_ratio) + end + group.fields_for(:initial) do |builder| + InitialValuesForm.new(builder, work_package:, mode:) end end end @@ -129,73 +102,108 @@ class WorkPackages::ProgressForm < ApplicationForm field end - def render_text_field(group, - name:, - label:, - disabled: false, - placeholder: nil) - text_field_options = { + def select_status_list(group) + # status selection is disabled in create forms + disabled = work_package.new_record? + + select_field_options = + default_field_options(:status_id) + .merge( + name: :status_id, + label: I18n.t(:label_percent_complete), + disabled: + ) + + group.select_list(**select_field_options) do |select_list| + WorkPackages::UpdateContract.new(work_package, User.current) + .assignable_statuses + .each do |status| # avoid find_each to keep ordering by position + select_list.option( + label: "#{status.name} (#{status.default_done_ratio}%)", + value: status.id + ) + end + end + + # Add a hidden field if the select field is disabled, otherwise it would not be included in the form payload + group.hidden(name: :status_id) if disabled + end + + def text_field(group, + name:, + label:) + text_field_options = default_field_options(name).merge( name:, value: field_value(name), label:, - disabled:, - placeholder: - } - text_field_options.reverse_merge!(default_field_options(name)) + caption: field_hint_message(name), + validation_message: validation_message(name) + ) group.text_field(**text_field_options) end - def render_readonly_text_field(group, - name:, - label:, - disabled: false, - placeholder: true) - text_field_options = { + def readonly_text_field(group, + name:, + label:, + placeholder: true) + text_field_options = default_field_options(name).merge( name:, value: field_value(name), label:, + caption: field_hint_message(name), readonly: true, - disabled:, classes: "input--readonly", placeholder: ("-" if placeholder) - } - text_field_options.reverse_merge!(default_field_options(name)) + ) group.text_field(**text_field_options) end + def hidden_touched_field(group, name:) + group.hidden(name: :"#{name}_touched", + value: touched(name), + data: { "work-packages--progress--touched-field-marker-target": "touchedFieldInput", + "referrer-field": "work_package[#{name}]" }) + end + + def touched(name) + @touched_field_map["#{name}_touched"] || false + end + def field_value(name) errors = @work_package.errors.where(name) if (user_value = errors.map { |error| error.options[:value] }.find { !_1.nil? }) user_value elsif name == :done_ratio - format_to_smallest_fractional_part(@work_package.public_send(name)) + as_percent(@work_package.public_send(name)) else DurationConverter.output(@work_package.public_send(name)) end end - def format_to_smallest_fractional_part(number) - return number if number.nil? + def field_hint_message(field_name) + work_package.derived_progress_hint(field_name)&.message + end - number % 1 == 0 ? number.to_i : number + def validation_message(name) + # it's ok to take the first error only, that's how primer_view_component does it anyway. + message = @work_package.errors.messages_for(name).first + message&.upcase_first + end + + def as_percent(value) + value ? "#{value}%" : nil end def default_field_options(name) data = { "work-packages--progress--preview-progress-target": "progressInput", "work-packages--progress--touched-field-marker-target": "progressInput", - action: "input->work-packages--progress--touched-field-marker#markFieldAsTouched" } + action: "work-packages--progress--touched-field-marker#markFieldAsTouched" } if @focused_field == name data[:"work-packages--progress--focus-field-target"] = "fieldToFocus" end { data: } end - - # Remaining work field is enabled when work is set, or when there are errors - # on fields so that they can be corrected. - def disabled_remaining_work_field? - @work_package.estimated_hours.nil? && @work_package.errors.empty? - end end diff --git a/app/forms/work_packages/progress_form/initial_values_form.rb b/app/forms/work_packages/progress_form/initial_values_form.rb new file mode 100644 index 00000000000..6ffe9618b53 --- /dev/null +++ b/app/forms/work_packages/progress_form/initial_values_form.rb @@ -0,0 +1,64 @@ +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2010-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +class WorkPackages::ProgressForm + class InitialValuesForm < ApplicationForm + attr_reader :work_package, :mode + + def initialize(work_package:, + mode: :work_based) + super() + + @work_package = work_package + @mode = mode + end + + form do |form| + if mode == :status_based + hidden_initial_field(form, name: :status_id) + hidden_initial_field(form, name: :estimated_hours) + else + hidden_initial_field(form, name: :estimated_hours) + hidden_initial_field(form, name: :remaining_hours) + # next line to be removed in 15.0 with :percent_complete_edition feature flag removal + next unless OpenProject::FeatureDecisions.percent_complete_edition_active? + + hidden_initial_field(form, name: :done_ratio) + end + end + + private + + def hidden_initial_field(form, name:) + form.hidden(name:, + value: work_package.public_send(:"#{name}_was"), + data: { "work-packages--progress--touched-field-marker-target": "initialValueInput", + "referrer-field": "work_package[#{name}]" }) + end + end +end diff --git a/app/helpers/accessibility_helper.rb b/app/helpers/accessibility_helper.rb index 155fd8269fa..c4854799522 100644 --- a/app/helpers/accessibility_helper.rb +++ b/app/helpers/accessibility_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/admin_helper.rb b/app/helpers/admin_helper.rb index d7578d9c5bb..ed4d6f1bb10 100644 --- a/app/helpers/admin_helper.rb +++ b/app/helpers/admin_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/angular_helper.rb b/app/helpers/angular_helper.rb index a287f2b40aa..a71af0216ab 100644 --- a/app/helpers/angular_helper.rb +++ b/app/helpers/angular_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/api_v3_helper.rb b/app/helpers/api_v3_helper.rb index 32f9e634329..01af528c844 100644 --- a/app/helpers/api_v3_helper.rb +++ b/app/helpers/api_v3_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index 661e0403c51..d7cca379cf7 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -33,6 +33,7 @@ module ApplicationHelper include OpenProject::TextFormatting include OpenProject::ObjectLinking include OpenProject::SafeParams + include OpPrimer::FormHelpers include I18n include ERB::Util include Redmine::I18n @@ -63,7 +64,7 @@ module ApplicationHelper html_options = args.shift parameters_for_method_reference = args - return unless authorize_for(options[:controller] || params[:controller], options[:action]) + return unless authorize_for(options[:controller] || controller_path, options[:action]) if block_given? link_to(options, html_options, *parameters_for_method_reference, &) @@ -172,9 +173,21 @@ module ApplicationHelper end def html_hours(text) - text.gsub(%r{(\d+)\.(\d+)}, - '\1.\2') - .html_safe + html_safe_gsub(text, + %r{(\d+)\.(\d+)}, + '\1.\2') + end + + def html_safe_gsub(string, *gsub_args, &) + html_safe = string.html_safe? + string.gsub(*gsub_args, &) + + # We only mark the string as safe if the previous string was already safe + if html_safe + string.html_safe # rubocop:disable Rails/OutputSafety + else + string + end end def authoring(created, author, options = {}) @@ -229,11 +242,11 @@ module ApplicationHelper # Returns the theme, controller name, and action as css classes for the # HTML body. def body_css_classes - css = ["theme-" + OpenProject::CustomStyles::Design.identifier.to_s] + css = ["theme-#{OpenProject::CustomStyles::Design.identifier}"] - if params[:controller] && params[:action] - css << ("controller-" + params[:controller]) - css << ("action-" + params[:action]) + if controller_path && action_name + css << ("controller-#{controller_path}") + css << ("action-#{action_name}") end css << "ee-banners-#{EnterpriseToken.show_banners? ? 'visible' : 'hidden'}" @@ -252,19 +265,18 @@ module ApplicationHelper # Same as Rails' simple_format helper without using paragraphs def simple_format_without_paragraph(text) - text.to_s - .gsub(/\r\n?/, "\n") # \r\n and \r -> \n - .gsub(/\n\n+/, "

    ") # 2+ newline -> 2 br - .gsub(/([^\n]\n)(?=[^\n])/, '\1
    ') # 1 newline -> br - .html_safe + html_safe_gsub(text.to_s, /\r\n?/, "\n") + .then { |res| html_safe_gsub(res, /\n\n+/, "

    ") } + .then { |res| html_safe_gsub(res, /([^\n]\n)(?=[^\n])/, '\1
    ') } end def lang_options_for_select(blank = true) - auto = if blank && (valid_languages - all_languages) == (all_languages - valid_languages) - [["(auto)", ""]] - else - [] - end + auto = + if blank && (valid_languages - all_languages) == (all_languages - valid_languages) + [["(auto)", ""]] + else + [] + end mapped_languages = valid_languages.map { |lang| translate_language(lang) } @@ -280,10 +292,9 @@ module ApplicationHelper def theme_options_for_select options = [ [t("themes.light"), "light"], - [t("themes.light_high_contrast"), "light_high_contrast"] + [t("themes.light_high_contrast"), "light_high_contrast"], + [t("themes.dark"), "dark"] ] - options.push([t("themes.dark"), "dark"]) if OpenProject::FeatureDecisions.dark_mode_active? - options end def user_theme_data_attributes @@ -345,10 +356,10 @@ module ApplicationHelper # A hash containing the following keys: # * width: (default '100px') the css-width for the progress bar # * legend: (default: '') the text displayed alond with the progress bar - def progress_bar(pcts, options = {}) + def progress_bar(pcts, options = {}) # rubocop:disable Metrics/AbcSize pcts = Array(pcts).map(&:round) closed = pcts[0] - done = pcts[1] || 0 + done = pcts[1] || 0 width = options[:width] || "100px;" legend = options[:legend] || "" total_progress = options[:hide_total_progress] ? "" : t(:total_progress) @@ -357,7 +368,7 @@ module ApplicationHelper content_tag :span do progress = content_tag :span, class: "progress-bar", style: "width: #{width}" do concat content_tag(:span, "", class: "inner-progress closed", style: "width: #{closed}%") - concat content_tag(:span, "", class: "inner-progress done", style: "width: #{done}%") + concat content_tag(:span, "", class: "inner-progress done", style: "width: #{done}%") end progress + content_tag(:span, "#{legend}#{percent_sign} #{total_progress}", class: "progress-bar-legend") end @@ -370,8 +381,10 @@ module ApplicationHelper end def calendar_for(*_args) - ActiveSupport::Deprecation.warn "calendar_for has been removed. Please use the op-basic-single-date-picker angular component instead", - caller + ActiveSupport::Deprecation.warn( + "calendar_for has been removed. Please use the opce-basic-single-date-picker angular component instead", + caller + ) end def locale_first_day_of_week @@ -436,7 +449,7 @@ module ApplicationHelper def translate_language(lang_code) # rename in-context translation language name for the language select box if lang_code.to_sym == Redmine::I18n::IN_CONTEXT_TRANSLATION_CODE && - ::I18n.locale != Redmine::I18n::IN_CONTEXT_TRANSLATION_CODE + ::I18n.locale != Redmine::I18n::IN_CONTEXT_TRANSLATION_CODE [Redmine::I18n::IN_CONTEXT_TRANSLATION_NAME, lang_code.to_s] else [I18n.t("cldr.language_name", locale: lang_code), lang_code.to_s] diff --git a/app/helpers/archived_projects_helper.rb b/app/helpers/archived_projects_helper.rb index 20535782cba..bd6256d8d7d 100644 --- a/app/helpers/archived_projects_helper.rb +++ b/app/helpers/archived_projects_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/attachments_helper.rb b/app/helpers/attachments_helper.rb index f94ba25e46f..f111406559c 100644 --- a/app/helpers/attachments_helper.rb +++ b/app/helpers/attachments_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/attribute_help_texts_helper.rb b/app/helpers/attribute_help_texts_helper.rb index 7754edba2e0..ca9c5e4c884 100644 --- a/app/helpers/attribute_help_texts_helper.rb +++ b/app/helpers/attribute_help_texts_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/augmenting_helper.rb b/app/helpers/augmenting_helper.rb index dd3f5ccf4b0..9e782ec33e1 100644 --- a/app/helpers/augmenting_helper.rb +++ b/app/helpers/augmenting_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/authentication_stage_path_helper.rb b/app/helpers/authentication_stage_path_helper.rb index f7ad862ea42..9253896bc50 100644 --- a/app/helpers/authentication_stage_path_helper.rb +++ b/app/helpers/authentication_stage_path_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/backup_helper.rb b/app/helpers/backup_helper.rb index c29f2f6e716..0245b986025 100644 --- a/app/helpers/backup_helper.rb +++ b/app/helpers/backup_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/breadcrumb_helper.rb b/app/helpers/breadcrumb_helper.rb index 00d26419e3e..39b3cf28b13 100644 --- a/app/helpers/breadcrumb_helper.rb +++ b/app/helpers/breadcrumb_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/calendars_helper.rb b/app/helpers/calendars_helper.rb index 8273fc5b3bf..be5615717c0 100644 --- a/app/helpers/calendars_helper.rb +++ b/app/helpers/calendars_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/colors_helper.rb b/app/helpers/colors_helper.rb index 3fa7694d6b7..ac61eaa323f 100644 --- a/app/helpers/colors_helper.rb +++ b/app/helpers/colors_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -139,9 +139,7 @@ module ColorsHelper end def default_variables_light - "--lightness-threshold: 0.453; - --border-threshold: 0.75; - --border-alpha: max(0, min(calc((var(--perceived-lightness) - var(--border-threshold)) * 100), 1));" + "--lightness-threshold: 0.453;" end def highlighted_background_dark @@ -158,7 +156,7 @@ module ColorsHelper if mode == "light_high_contrast" style += "border: 1px solid hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 75) * 1%), 1) !important;" else - style += "border: 1px solid hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 25) * 1%), var(--border-alpha)) !important;" + style += "border: 1px solid hsl(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - 15) * 1%)) !important;" end style @@ -172,9 +170,9 @@ module ColorsHelper mode = User.current.pref.theme if mode == "light_high_contrast" - "color: hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - (var(--color-l) * 0.5)) * 1%), 1); !important;" + "color: hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - (var(--color-l) * 0.5)) * 1%), 1) !important;" else - "color: hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - (var(--color-l) * 0.22)) * 1%), 1); !important;" + "color: hsla(var(--color-h), calc(var(--color-s) * 1%), calc((var(--color-l) - (var(--color-l) * 0.22)) * 1%), 1) !important;" end end # rubocop:enable Layout/LineLength diff --git a/app/helpers/confirmation_dialog_helper.rb b/app/helpers/confirmation_dialog_helper.rb index a0f7eed4a36..ddbd0ff0fc9 100644 --- a/app/helpers/confirmation_dialog_helper.rb +++ b/app/helpers/confirmation_dialog_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/custom_fields_helper.rb b/app/helpers/custom_fields_helper.rb index 6d93fdb5427..e5c8951c2e2 100644 --- a/app/helpers/custom_fields_helper.rb +++ b/app/helpers/custom_fields_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -63,7 +63,7 @@ module CustomFieldsHelper end # Return custom field html tag corresponding to its format - def custom_field_tag(name, custom_value) + def custom_field_tag(name, custom_value) # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity custom_field = custom_value.custom_field field_name = "#{name}[custom_field_values][#{custom_field.id}]" field_id = "#{name}_custom_field_values_#{custom_field.id}" @@ -72,7 +72,7 @@ module CustomFieldsHelper tag = case field_format.try(:edit_as) when "date" - angular_component_tag "op-basic-single-date-picker", + angular_component_tag "opce-basic-single-date-picker", inputs: { required: custom_field.is_required, value: custom_value.value, @@ -143,14 +143,14 @@ module CustomFieldsHelper custom_field_label_tag(name, custom_value) + custom_field_tag(name, custom_value) end - def custom_field_tag_for_bulk_edit(name, custom_field, project = nil) + def custom_field_tag_for_bulk_edit(name, custom_field, project = nil) # rubocop:disable Metrics/AbcSize field_name = "#{name}[custom_field_values][#{custom_field.id}]" field_id = "#{name}_custom_field_values_#{custom_field.id}" field_format = OpenProject::CustomFieldFormat.find_by_name(custom_field.field_format) case field_format.try(:edit_as) when "date" - angular_component_tag "op-modal-single-date-picker", + angular_component_tag "opce-modal-single-date-picker", inputs: { id: field_id, name: field_name diff --git a/app/helpers/custom_styles_helper.rb b/app/helpers/custom_styles_helper.rb index bfa9547b496..3e5ed244646 100644 --- a/app/helpers/custom_styles_helper.rb +++ b/app/helpers/custom_styles_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/error_message_helper.rb b/app/helpers/error_message_helper.rb index 1c435aafe89..0db5c3a59e2 100644 --- a/app/helpers/error_message_helper.rb +++ b/app/helpers/error_message_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/errors_helper.rb b/app/helpers/errors_helper.rb index a7c389dfe81..ee22b9eddd8 100644 --- a/app/helpers/errors_helper.rb +++ b/app/helpers/errors_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/favorite_helper.rb b/app/helpers/favorite_helper.rb index e2a28188ae0..fb54ce000ef 100644 --- a/app/helpers/favorite_helper.rb +++ b/app/helpers/favorite_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/flash_messages_helper.rb b/app/helpers/flash_messages_helper.rb index 36321e3ae4f..d05d7560886 100644 --- a/app/helpers/flash_messages_helper.rb +++ b/app/helpers/flash_messages_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/flash_messages_output_safety_helper.rb b/app/helpers/flash_messages_output_safety_helper.rb index 56307941979..782aa009a41 100644 --- a/app/helpers/flash_messages_output_safety_helper.rb +++ b/app/helpers/flash_messages_output_safety_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/frontend_asset_helper.rb b/app/helpers/frontend_asset_helper.rb index 3d1d30b9176..f016772c423 100644 --- a/app/helpers/frontend_asset_helper.rb +++ b/app/helpers/frontend_asset_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/groups_helper.rb b/app/helpers/groups_helper.rb index f64b3ef16da..55089af7184 100644 --- a/app/helpers/groups_helper.rb +++ b/app/helpers/groups_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/hide_sections_helper.rb b/app/helpers/hide_sections_helper.rb index 94e15d5316b..814dec4acbb 100644 --- a/app/helpers/hide_sections_helper.rb +++ b/app/helpers/hide_sections_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/homescreen_helper.rb b/app/helpers/homescreen_helper.rb index e0c624877b7..c828f5a6623 100644 --- a/app/helpers/homescreen_helper.rb +++ b/app/helpers/homescreen_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/icons_helper.rb b/app/helpers/icons_helper.rb index b9b6db8386a..7d5db8d4873 100644 --- a/app/helpers/icons_helper.rb +++ b/app/helpers/icons_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/individual_principal_hooks_helper.rb b/app/helpers/individual_principal_hooks_helper.rb index 07080e5681a..740d96c66c4 100644 --- a/app/helpers/individual_principal_hooks_helper.rb +++ b/app/helpers/individual_principal_hooks_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/journals_helper.rb b/app/helpers/journals_helper.rb index 1fcd32af5b6..85217057380 100644 --- a/app/helpers/journals_helper.rb +++ b/app/helpers/journals_helper.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/mail_digest_helper.rb b/app/helpers/mail_digest_helper.rb index a449114a15a..67a1951250e 100644 --- a/app/helpers/mail_digest_helper.rb +++ b/app/helpers/mail_digest_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,6 +27,8 @@ #++ module MailDigestHelper + include Redmine::I18n + def digest_summary_text(notification_count, mentioned_count) mentioned = mentioned_count > 1 ? "plural" : "singular" notifications = notification_count > 1 ? "plural" : "singular" @@ -75,9 +77,7 @@ module MailDigestHelper sanitize( I18n.t(:"mail.work_packages.#{value}_at", user:, - timestamp: journal.created_at.strftime( - "#{I18n.t(:"date.formats.default")}, #{I18n.t(:"time.formats.time")}" - )) + timestamp: format_time(journal.created_at)) ) end diff --git a/app/helpers/mail_layout_helper.rb b/app/helpers/mail_layout_helper.rb index 911fe514f0d..287a5506e9c 100644 --- a/app/helpers/mail_layout_helper.rb +++ b/app/helpers/mail_layout_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -23,7 +23,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# See docs/COPYRIGHT.rdoc for more details. +# See COPYRIGHT and LICENSE files for more details. #++ module MailLayoutHelper diff --git a/app/helpers/mail_notification_helper.rb b/app/helpers/mail_notification_helper.rb index 6adcbea006e..7219b8b3507 100644 --- a/app/helpers/mail_notification_helper.rb +++ b/app/helpers/mail_notification_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -23,7 +23,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# See docs/COPYRIGHT.rdoc for more details. +# See COPYRIGHT and LICENSE files for more details. #++ module MailNotificationHelper @@ -35,10 +35,6 @@ module MailNotificationHelper .uniq end - def notifications_path(id) - notifications_center_url(["details", id, "activity"]) - end - def type_color(type, default_fallback) color_id = selected_color(type) if color_id diff --git a/app/helpers/members_helper.rb b/app/helpers/members_helper.rb index 464e87e9f31..83adce4f65d 100644 --- a/app/helpers/members_helper.rb +++ b/app/helpers/members_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/menus/notifications.rb b/app/helpers/menus/notifications.rb new file mode 100644 index 00000000000..fcba2962fa2 --- /dev/null +++ b/app/helpers/menus/notifications.rb @@ -0,0 +1,116 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Menus + class Notifications + ENTERPRISE_REASONS = %w[shared date_alert].freeze + + include Rails.application.routes.url_helpers + + attr_reader :controller_path, :params, :current_user, + :query, :unread_by_reason, :unread_by_project + + def initialize(controller_path:, params:, current_user:) + # rubocop:disable Rails/HelperInstanceVariable + @controller_path = controller_path + @params = params + @current_user = current_user + @unread_by_reason = filter_unread_by_reason + @unread_by_project = filter_unread_by_project + # rubocop:enable Rails/HelperInstanceVariable + end + + def first_level_menu_items + [ + OpenProject::Menu::MenuGroup.new(header: nil, + children: [inbox_menu]), + OpenProject::Menu::MenuGroup.new(header: I18n.t("notifications.menu.by_reason"), + children: reason_filters), + OpenProject::Menu::MenuGroup.new(header: I18n.t("notifications.menu.by_project"), + children: project_filters) + ] + end + + private + + def filter_unread_by_reason + query = Queries::Notifications::NotificationQuery.new(user: current_user) + query.where(:read_ian, "=", "f") + query.group(:reason) + query.group_values + end + + def filter_unread_by_project + query = Queries::Notifications::NotificationQuery.new(user: current_user) + query.where(:read_ian, "=", "f") + query.group(:project) + query.group_values + end + + def inbox_menu + OpenProject::Menu::MenuItem.new(title: I18n.t("notifications.menu.inbox"), + icon: :inbox, + href: notifications_path, + selected: !(params[:name] && params[:filter])) + end + + def selected?(filter, name) + params[:filter] == filter && params[:name] == name + end + + def reason_filters + %w[mentioned assigned responsible watched date_alert shared].map do |reason| + count = unread_by_reason[reason] + OpenProject::Menu::MenuItem.new(title: I18n.t("mail.work_packages.reason.#{reason}"), + icon: icon_map.fetch(reason, reason), + href: notifications_path(filter: "reason", name: reason), + count: count == 0 ? nil : count, + selected: selected?("reason", reason)) + end + end + + def project_filters + unread_by_project.map do |project, count| + OpenProject::Menu::MenuItem.new(title: project.name, + href: notifications_path(filter: "project", name: project.id), + count:, + selected: selected?("project", project.id)) + end + end + + def icon_map + { + "mentioned" => :mention, + "responsible" => :accountable, + "watched" => :watching, + "shared" => :share, + "date_alert" => :"date-alert" + } + end + end +end diff --git a/app/helpers/messages_helper.rb b/app/helpers/messages_helper.rb index 9634f21d30b..4a370396b10 100644 --- a/app/helpers/messages_helper.rb +++ b/app/helpers/messages_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/meta_tags_helper.rb b/app/helpers/meta_tags_helper.rb index 480d244e13b..957c1fda074 100644 --- a/app/helpers/meta_tags_helper.rb +++ b/app/helpers/meta_tags_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,10 +30,11 @@ module MetaTagsHelper ## # Use meta-tags to output title and site name def output_title_and_meta_tags - display_meta_tags site: Setting.app_title, - title: html_title_parts, - separator: " | ", # Update the TitleService when changing this! - reverse: true + display_meta_tags title: page_title(*html_title_parts) + end + + def page_title(*parts) + (parts.reverse + [Setting.app_title]).join(" | ") end def initializer_meta_tag diff --git a/app/helpers/no_results_helper.rb b/app/helpers/no_results_helper.rb index 1e4e7f25a4b..4b3c4d9b936 100644 --- a/app/helpers/no_results_helper.rb +++ b/app/helpers/no_results_helper.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/oauth_helper.rb b/app/helpers/oauth_helper.rb index 52b85a0a25f..a98b0ffe03d 100644 --- a/app/helpers/oauth_helper.rb +++ b/app/helpers/oauth_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/omniauth_helper.rb b/app/helpers/omniauth_helper.rb index 94ff583fd7a..f716e973de8 100644 --- a/app/helpers/omniauth_helper.rb +++ b/app/helpers/omniauth_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/pagination_helper.rb b/app/helpers/pagination_helper.rb index 84ec198863b..7792aca72f6 100644 --- a/app/helpers/pagination_helper.rb +++ b/app/helpers/pagination_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -198,16 +198,29 @@ module PaginationHelper def previous_or_next_page(page, text, class_suffix) if page tag(:li, - link(text, page, { class: "op-pagination--item-link op-pagination--item-link_" + class_suffix }), - class: "op-pagination--item op-pagination--item_" + class_suffix) + link(text, page, { class: "op-pagination--item-link op-pagination--item-link_#{class_suffix}" }), + class: "op-pagination--item op-pagination--item_#{class_suffix}") else "" end end + private + + def link(text, target, attributes) + new_attributes = attributes.dup + new_attributes["data-turbo-stream"] = true if turbo? + + super(text, target, new_attributes) + end + def allowed_params @options[:allowed_params] # rubocop:disable Rails/HelperInstanceVariable end + + def turbo? + @options[:turbo] # rubocop:disable Rails/HelperInstanceVariable + end end private diff --git a/app/helpers/password_helper.rb b/app/helpers/password_helper.rb index fb2f3cf4736..8f4419a583c 100644 --- a/app/helpers/password_helper.rb +++ b/app/helpers/password_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/placeholder_users_helper.rb b/app/helpers/placeholder_users_helper.rb index 020b924a0c6..4945781c30d 100644 --- a/app/helpers/placeholder_users_helper.rb +++ b/app/helpers/placeholder_users_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/project_status_helper.rb b/app/helpers/project_status_helper.rb index c919bb61c82..1c054521cd0 100644 --- a/app/helpers/project_status_helper.rb +++ b/app/helpers/project_status_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/projects_helper.rb b/app/helpers/projects_helper.rb index 862942cf262..c9d8f2d0de3 100644 --- a/app/helpers/projects_helper.rb +++ b/app/helpers/projects_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/queries_helper.rb b/app/helpers/queries_helper.rb index 0593c74f6f9..ea8097bbc2e 100644 --- a/app/helpers/queries_helper.rb +++ b/app/helpers/queries_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/relations_helper.rb b/app/helpers/relations_helper.rb index 875f990de74..9a39c5dff4d 100644 --- a/app/helpers/relations_helper.rb +++ b/app/helpers/relations_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/removed_js_helpers_helper.rb b/app/helpers/removed_js_helpers_helper.rb index 1d0b68095e3..6ea7af9304d 100644 --- a/app/helpers/removed_js_helpers_helper.rb +++ b/app/helpers/removed_js_helpers_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/reorder_links_helper.rb b/app/helpers/reorder_links_helper.rb index 85e48232cbd..3265e09ec0d 100644 --- a/app/helpers/reorder_links_helper.rb +++ b/app/helpers/reorder_links_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/reports_helper.rb b/app/helpers/reports_helper.rb index 13f30ad0b89..cf9ff149578 100644 --- a/app/helpers/reports_helper.rb +++ b/app/helpers/reports_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/repositories_helper.rb b/app/helpers/repositories_helper.rb index 0fd7366f580..1eaaa41d364 100644 --- a/app/helpers/repositories_helper.rb +++ b/app/helpers/repositories_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/roles_helper.rb b/app/helpers/roles_helper.rb index f6edba5511a..3899c67a0aa 100644 --- a/app/helpers/roles_helper.rb +++ b/app/helpers/roles_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index fb9c7f17e2a..5abcabc4a49 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/security_badge_helper.rb b/app/helpers/security_badge_helper.rb index 63a75de8f46..780d1e4a1e0 100644 --- a/app/helpers/security_badge_helper.rb +++ b/app/helpers/security_badge_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb index 2b20df90282..33f22971aeb 100644 --- a/app/helpers/settings_helper.rb +++ b/app/helpers/settings_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -32,39 +32,12 @@ module SettingsHelper extend self include OpenProject::FormTagHelper - def system_settings_tabs - [ - { - name: "general", - controller: "/admin/settings/general_settings", - label: :label_general - }, - { - name: "languages", - controller: "/admin/settings/languages_settings", - label: :label_languages - }, - { - name: "projects", - controller: "/admin/settings/projects_settings", - label: :label_project_plural - }, - { - name: "repositories", - controller: "/admin/settings/repositories_settings", - label: :label_repository_plural - }, - { - name: "experimental", - controller: "/admin/settings/experimental_settings", - label: :label_experimental - } - ] - end - def setting_select(setting, choices, options = {}) - if blank_text = options.delete(:blank) - choices = [[blank_text.is_a?(Symbol) ? I18n.t(blank_text) : blank_text, ""]] + choices + blank_text = options.delete(:blank) + + if blank_text + translated_blank = blank_text.is_a?(Symbol) ? I18n.t(blank_text) : blank_text + choices.unshift([translated_blank, ""]) end setting_label(setting, options) + diff --git a/app/helpers/sort_helper.rb b/app/helpers/sort_helper.rb index cbbda73fd75..a5ec937ccaf 100644 --- a/app/helpers/sort_helper.rb +++ b/app/helpers/sort_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -286,7 +286,7 @@ module SortHelper allowed_params ||= %w[filters per_page expand columns] # Don't lose other params. - link_to_content_update(h(caption), safe_query_params(allowed_params).merge(sort_options), html_options) + link_to_content_update(h(caption), safe_query_params(allowed_params).merge(sort_options), html_options.merge(rel: :nofollow)) end # Returns a table header
    tag with a sort link for the named column @@ -319,11 +319,12 @@ module SortHelper default_order = options.delete(:default_order) || "asc" lang = options.delete(:lang) || nil param = options.delete(:param) || :sort + data = options.delete(:data) || {} options[:title] = sort_header_title(column, caption, options) within_sort_header_tag_hierarchy(options, sort_class(column)) do - sort_link(column, caption, default_order, allowed_params:, param:, lang:, title: options[:title]) + sort_link(column, caption, default_order, allowed_params:, param:, lang:, title: options[:title], data:) end end diff --git a/app/helpers/static_links_helper.rb b/app/helpers/static_links_helper.rb index 42a5352b74b..8587114c66a 100644 --- a/app/helpers/static_links_helper.rb +++ b/app/helpers/static_links_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/stimulus_helper.rb b/app/helpers/stimulus_helper.rb index 04a6268ce64..adb0c3b0e3a 100644 --- a/app/helpers/stimulus_helper.rb +++ b/app/helpers/stimulus_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/tabs_helper.rb b/app/helpers/tabs_helper.rb index c7db4c8fd8b..6305516475a 100644 --- a/app/helpers/tabs_helper.rb +++ b/app/helpers/tabs_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,10 +28,10 @@ module TabsHelper # Renders tabs and their content - def render_tabs(tabs, form = nil) + def render_tabs(tabs, form = nil, with_tab_nav: true) if tabs.any? selected = selected_tab(tabs) - render partial: "common/tabs", locals: { f: form, tabs:, selected_tab: selected } + render partial: "common/tabs", locals: { f: form, tabs:, selected_tab: selected, with_tab_nav: } else content_tag "p", I18n.t(:label_no_data), class: "nodata" end @@ -41,12 +41,10 @@ module TabsHelper tabs.detect { |t| t[:name] == params[:tab] } || tabs.first end - # Render tabs from the ui/extensible tabs manager - def render_extensible_tabs(key, params = {}) - tabs = ::OpenProject::Ui::ExtensibleTabs.enabled_tabs(key, params.reverse_merge(current_user:)).map do |tab| + def tabs_for_key(key, params = {}) + ::OpenProject::Ui::ExtensibleTabs.enabled_tabs(key, params.reverse_merge(current_user:)).map do |tab| path = tab[:path].respond_to?(:call) ? instance_exec(params, &tab[:path]) : tab[:path] tab.dup.merge(path:) end - render_tabs(tabs) end end diff --git a/app/helpers/text_formatting_helper.rb b/app/helpers/text_formatting_helper.rb index b2dc6b8dcc6..16fc2d953a1 100644 --- a/app/helpers/text_formatting_helper.rb +++ b/app/helpers/text_formatting_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/tooltip_helper.rb b/app/helpers/tooltip_helper.rb index bb81bdd0d59..71ad5241070 100644 --- a/app/helpers/tooltip_helper.rb +++ b/app/helpers/tooltip_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/types_helper.rb b/app/helpers/types_helper.rb index dd28b3e603d..fcac23fc709 100644 --- a/app/helpers/types_helper.rb +++ b/app/helpers/types_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/url_helper.rb b/app/helpers/url_helper.rb new file mode 100644 index 00000000000..c044acf0982 --- /dev/null +++ b/app/helpers/url_helper.rb @@ -0,0 +1,6 @@ +module UrlHelper + def url_for_with_params(**args) + query = request.query_parameters + url_for(**query.merge(args)) + end +end diff --git a/app/helpers/user_consent_helper.rb b/app/helpers/user_consent_helper.rb index b4ca59ecc3e..2e31d1978b6 100644 --- a/app/helpers/user_consent_helper.rb +++ b/app/helpers/user_consent_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/users_helper.rb b/app/helpers/users_helper.rb index 9c79821c750..bb7f0cfa86e 100644 --- a/app/helpers/users_helper.rb +++ b/app/helpers/users_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -87,41 +87,51 @@ module UsersHelper # Create buttons to lock/unlock a user and reset failed logins def build_change_user_status_action(user) - status = user.status.to_sym - blocked = !!user.failed_too_many_recent_login_attempts? - result = "".html_safe - (STATUS_CHANGE_ACTIONS[[status, blocked]] || []).each do |title, name| - result << ((yield I18n.t(title, scope: :user), name) + " ".html_safe) + iterate_user_statusses(user) do |title, name| + result << ((yield title, name) + " ") # rubocop:disable Style/StringConcatenation end result end + def iterate_user_statusses(user) + status = user.status.to_sym + blocked = !!user.failed_too_many_recent_login_attempts? + + (STATUS_CHANGE_ACTIONS[[status, blocked]] || []).each do |title, name| + yield I18n.t(title, scope: :user), name + end + end + def change_user_status_icons { - "unlock" => "unlocked", - "activate" => "unlocked", - "lock" => "locked" + "unlock" => "unlock", + "activate" => "unlock", + "lock" => "lock" } end def change_user_status_buttons(user) build_change_user_status_action(user) do |title, name| - button_tag(class: "button", name:, type: "submit", title:) do - concat op_icon("button--icon icon-#{change_user_status_icons[name]}") - concat content_tag(:span, title, class: "button--text") + render Primer::Beta::Button.new(name:, type: :submit, title:) do |button| + button.with_leading_visual_icon(icon: change_user_status_icons[name]) + title end end end def change_user_status_links(user) build_change_user_status_action(user) do |title, name| - link_to title, - change_status_user_path(user, - name.to_sym => "1", - back_url: request.fullpath), - method: :post, - class: "icon icon-#{change_user_status_icons[name]}" + render Primer::Beta::Button.new(tag: :a, + scheme: :link, + title:, + href: change_status_user_path(user, + name.to_sym => "1", + back_url: request.fullpath), + data: { method: :post }) do |button| + button.with_leading_visual_icon(icon: change_user_status_icons[name]) + title + end end end diff --git a/app/helpers/versions_helper.rb b/app/helpers/versions_helper.rb index 5019d024631..7a66bd1653d 100644 --- a/app/helpers/versions_helper.rb +++ b/app/helpers/versions_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/warning_bar_helper.rb b/app/helpers/warning_bar_helper.rb index d8aab4e8dc4..c7f15b60284 100644 --- a/app/helpers/warning_bar_helper.rb +++ b/app/helpers/warning_bar_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -50,7 +50,7 @@ module WarningBarHelper end def setting_hostname_mismatched? - Setting.host_name.gsub(/:\d+$/, "") != request.host + String(Setting.host_name).gsub(/:\d+$/, "") != request.host end def no_workflow_for_wp_edit_role? diff --git a/app/helpers/watchers_helper.rb b/app/helpers/watchers_helper.rb index 286e352ae4b..22e7fb2743b 100644 --- a/app/helpers/watchers_helper.rb +++ b/app/helpers/watchers_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/wiki_helper.rb b/app/helpers/wiki_helper.rb index ee894ddfd82..897db6b4483 100644 --- a/app/helpers/wiki_helper.rb +++ b/app/helpers/wiki_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -58,10 +58,6 @@ module WikiHelper breadcrumb_paths(*paths) end - def nl2br(content) - content.gsub(/(?:\n\r?|\r\n?)/, "
    ").html_safe - end - private def wiki_page_options_for_select_of_level(pages, diff --git a/app/helpers/wiki_pages/at_version.rb b/app/helpers/wiki_pages/at_version.rb index 00cfd4ce8e5..aaeec457ad3 100644 --- a/app/helpers/wiki_pages/at_version.rb +++ b/app/helpers/wiki_pages/at_version.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/work_packages/split_view_helper.rb b/app/helpers/work_packages/split_view_helper.rb new file mode 100644 index 00000000000..5f82668bd19 --- /dev/null +++ b/app/helpers/work_packages/split_view_helper.rb @@ -0,0 +1,11 @@ +module WorkPackages::SplitViewHelper + def render_work_package_split_view? + params[:work_package_split_view].present? + end + + def split_view_instance + WorkPackages::SplitViewComponent.new(id: params[:work_package_id], + tab: params[:tab], + base_route: split_view_base_route) + end +end diff --git a/app/helpers/work_packages_controller_helper.rb b/app/helpers/work_packages_controller_helper.rb index 9ba2df4975f..6e1ae6e7803 100644 --- a/app/helpers/work_packages_controller_helper.rb +++ b/app/helpers/work_packages_controller_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -35,7 +35,7 @@ module WorkPackagesControllerHelper end def check_allowed_export - return unless params[:format] == "pdf" && params[:gantt] == "true" + return unless params[:format] == "pdf" && params[:pdf_export_type] == "gantt" render_403 unless EnterpriseToken.allows_to?(:gantt_pdf_export) end diff --git a/app/helpers/work_packages_filter_helper.rb b/app/helpers/work_packages_filter_helper.rb index c9a867edcff..b3af10ace5d 100644 --- a/app/helpers/work_packages_filter_helper.rb +++ b/app/helpers/work_packages_filter_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/helpers/work_packages_helper.rb b/app/helpers/work_packages_helper.rb index c8369468f3a..8e237f03638 100644 --- a/app/helpers/work_packages_helper.rb +++ b/app/helpers/work_packages_helper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -223,7 +223,7 @@ module WorkPackagesHelper def selected_work_packages_columns_options Setting[:work_package_list_default_columns] - .map { |column| work_packages_columns_options.find { |c| c[:id] == column } } + .filter_map { |column| work_packages_columns_options.find { |c| c[:id] == column } } end def protected_work_packages_columns_options diff --git a/app/mailers/announcement_mailer.rb b/app/mailers/announcement_mailer.rb index 9bd24c380a3..5a66df5162c 100644 --- a/app/mailers/announcement_mailer.rb +++ b/app/mailers/announcement_mailer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/mailers/application_mailer.rb b/app/mailers/application_mailer.rb index e8b14ceb952..58ce970fe75 100644 --- a/app/mailers/application_mailer.rb +++ b/app/mailers/application_mailer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/mailers/digest_mailer.rb b/app/mailers/digest_mailer.rb index 90bbb5e8cd0..797941d6e12 100644 --- a/app/mailers/digest_mailer.rb +++ b/app/mailers/digest_mailer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -82,10 +82,9 @@ class DigestMailer < ApplicationMailer def load_notifications(notification_ids) Notification .where(id: notification_ids) - .includes(:project, :resource) + .includes(:resource) .reject do |notification| notification.resource.nil? || - notification.project.nil? || (notification.journal.nil? && !notification.date_alert?) end end diff --git a/app/mailers/member_mailer.rb b/app/mailers/member_mailer.rb index e6eca04f94d..b83e0102ccb 100644 --- a/app/mailers/member_mailer.rb +++ b/app/mailers/member_mailer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/mailers/project_mailer.rb b/app/mailers/project_mailer.rb index 4ca7351a943..bb4e9ac2f0a 100644 --- a/app/mailers/project_mailer.rb +++ b/app/mailers/project_mailer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/mailers/sharing_mailer.rb b/app/mailers/sharing_mailer.rb index db6e63fa297..22bbd9d77d7 100644 --- a/app/mailers/sharing_mailer.rb +++ b/app/mailers/sharing_mailer.rb @@ -15,7 +15,7 @@ class SharingMailer < ApplicationMailer @role_rights = derive_role_rights(role) @allowed_work_package_actions = derive_allowed_work_package_actions(role) @url = optionally_activated_url(work_package_url(@work_package.id), @invitation_token) - @notification_url = optionally_activated_url(notifications_path(@work_package.id), @invitation_token) + @notification_url = optionally_activated_url(details_notifications_url(@work_package.id, tab: :activity), @invitation_token) set_open_project_headers(@work_package) message_id(membership, sharer) diff --git a/app/mailers/user_mailer.rb b/app/mailers/user_mailer.rb index 3838cecfdcf..ea6bcf6d4b1 100644 --- a/app/mailers/user_mailer.rb +++ b/app/mailers/user_mailer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/mailers/work_package_mailer.rb b/app/mailers/work_package_mailer.rb index 151506314e7..e96b30a6c44 100644 --- a/app/mailers/work_package_mailer.rb +++ b/app/mailers/work_package_mailer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/menus/members/menu.rb b/app/menus/members/menu.rb index 795148e108b..c339780c47d 100644 --- a/app/menus/members/menu.rb +++ b/app/menus/members/menu.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -47,8 +47,8 @@ module Members OpenProject::Menu::MenuItem.new(title: I18n.t("members.menu.all"), href: project_members_path(project), selected: active_filter_count == 0), - menu_item(I18n.t("members.menu.locked"), status: :locked), - menu_item(I18n.t("members.menu.invited"), status: :invited) + menu_item(title: I18n.t("members.menu.locked"), query_params: { status: :locked }), + menu_item(title: I18n.t("members.menu.invited"), query_params: { status: :invited }) ] end @@ -57,13 +57,13 @@ module Members .where(id: MemberRole.where(member_id: @project.members.select(:id)).select(:role_id)) .distinct .pluck(:id, :name) - .map { |id, name| menu_item(name, role_id: id) } + .map { |id, name| menu_item(title: name, query_params: { role_id: id }) } end def permission_menu_entries Members::UserFilterComponent .share_options - .map { |name, id| menu_item(name, shared_role_id: id) } + .map { |name, id| menu_item(title: name, query_params: { shared_role_id: id }) } end def project_group_entries @@ -72,7 +72,7 @@ module Members .order(lastname: :asc) .distinct .pluck(:id, :lastname) - .map { |id, name| menu_item(name, group_id: id) } + .map { |id, name| menu_item(title: name, query_params: { group_id: id }) } end def selected?(query_params) diff --git a/app/menus/notifications/menu.rb b/app/menus/notifications/menu.rb new file mode 100644 index 00000000000..5488c610d32 --- /dev/null +++ b/app/menus/notifications/menu.rb @@ -0,0 +1,145 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Notifications + class Menu < Submenu + ENTERPRISE_REASONS = %w[shared date_alert].freeze + + include Rails.application.routes.url_helpers + + attr_reader :params, :current_user, + :query, :unread, :unread_by_reason, :unread_by_project + + def initialize(params:, current_user:) + @params = params + @current_user = current_user + @unread = filter_unread + @unread_by_reason = filter_unread_by_reason + @unread_by_project = filter_unread_by_project + + super(view_type: nil, project: nil, params:) + end + + def menu_items + [ + OpenProject::Menu::MenuGroup.new(header: nil, children: [inbox_menu]), + OpenProject::Menu::MenuGroup.new(header: I18n.t("notifications.menu.by_reason"), + children: reason_filters), + OpenProject::Menu::MenuGroup.new(header: I18n.t("notifications.menu.by_project"), + children: project_filters) + ] + end + + private + + def inbox_menu + count = unread + menu_item(title: I18n.t("notifications.menu.inbox"), icon_key: :inbox, count: count == 0 ? nil : count) + end + + def reason_filters + %w[mentioned assigned responsible watched dateAlert shared].map do |reason| + count = unread_by_reason[reason] + menu_item(title: I18n.t("notifications.reasons.#{reason}"), + icon_key: reason, + count: count == 0 ? nil : count, + query_params: query_params("reason", reason), + show_enterprise_icon: show_enterprise_icon?(reason)) + end + end + + def project_filters + unread_by_project.map do |project, count| + menu_item(title: (project.parent.present? ? "... " : "") + project.name, + count:, + query_params: query_params("project", project.id)) + end + end + + def base_query + Queries::Notifications::NotificationQuery.new(user: current_user) + .where(:read_ian, "=", "f") + end + + def filter_unread + query = base_query + query.results.count + end + + def filter_unread_by_reason + query = base_query + query.group(:reason) + query.group_values + end + + def filter_unread_by_project + query = base_query + query.group(:project) + query.group_values + end + + def query_params(filter, name) + { filter:, name: } + end + + def selected?(query_params) + params[:filter] == query_params[:filter] && params[:name] == query_params[:name].to_s + end + + def query_path(query_params) + if query_params[:name] == "shared" && show_enterprise_icon?("shared") + return notifications_share_upsale_path(query_params) + elsif query_params[:name] == "dateAlert" && show_enterprise_icon?("dateAlert") + return notifications_date_alert_upsale_path(query_params) + end + + notifications_center_path(query_params) + end + + def icon_map + { + "mentioned" => :mention, + "assigned" => :"op-person-assigned", + "responsible" => :"op-person-accountable", + "watched" => :eye, + "shared" => :"share-android", + "dateAlert" => :"op-calendar-alert" + } + end + + def show_enterprise_icon?(reason) + if reason == "shared" + !EnterpriseToken.allows_to?(:work_package_sharing) + elsif reason == "dateAlert" + !EnterpriseToken.allows_to?(:date_alerts) + else + false + end + end + end +end diff --git a/app/menus/projects/menu.rb b/app/menus/projects/menu.rb index affc4ecbc9f..9617ccea87b 100644 --- a/app/menus/projects/menu.rb +++ b/app/menus/projects/menu.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -43,8 +43,7 @@ module Projects def menu_items [ OpenProject::Menu::MenuGroup.new(header: nil, children: main_static_filters), - OpenProject::Menu::MenuGroup.new(header: I18n.t(:"projects.lists.public"), children: public_filters), - OpenProject::Menu::MenuGroup.new(header: I18n.t(:"projects.lists.my_private"), children: my_filters), + OpenProject::Menu::MenuGroup.new(header: I18n.t(:"projects.lists.my_lists"), children: my_filters), OpenProject::Menu::MenuGroup.new(header: I18n.t(:"projects.lists.shared"), children: shared_filters), OpenProject::Menu::MenuGroup.new(header: I18n.t(:"activerecord.attributes.project.status_code"), children: status_static_filters) @@ -96,28 +95,20 @@ module Projects def static_filters(ids) ids.map do |id| - menu_item(::Queries::Projects::Factory.static_query(id).name, query_id: id) + menu_item(title: ::Queries::Projects::Factory.static_query(id).name, query_params: { query_id: id }) end end - def public_filters - persisted_filters - .select(&:public?) - .map { |query| menu_item(query.name, query_id: query.id) } - end - def my_filters persisted_filters - .reject(&:public?) - .select { |query| query.user == current_user } - .map { |query| menu_item(query.name, query_id: query.id) } + .select { |query| !query.public? && query.user == current_user } + .map { |query| menu_item(title: query.name, query_params: { query_id: query.id }) } end def shared_filters persisted_filters - .reject(&:public?) - .reject { |query| query.user == current_user } - .map { |query| menu_item(query.name, query_id: query.id) } + .select { |query| query.public? || query.user != current_user } + .map { |query| menu_item(title: query.name, query_params: { query_id: query.id }) } end def persisted_filters diff --git a/app/menus/submenu.rb b/app/menus/submenu.rb index 1359df701a7..ef3a9a7ee24 100644 --- a/app/menus/submenu.rb +++ b/app/menus/submenu.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -48,8 +48,8 @@ class Submenu base_query .where("starred" => "t") .pluck(:id, :name) - .map { |id, name| menu_item(name, query_params(id)) } - .sort_by(&:title) + .map { |id, name| menu_item(title: name, query_params: query_params(id)) } + .sort_by { |item| item.title.downcase } end def default_queries @@ -61,8 +61,8 @@ class Submenu .where("starred" => "f") .where("public" => "t") .pluck(:id, :name) - .map { |id, name| menu_item(name, query_params(id)) } - .sort_by(&:title) + .map { |id, name| menu_item(title: name, query_params: query_params(id)) } + .sort_by { |item| item.title.downcase } end def custom_queries @@ -70,8 +70,8 @@ class Submenu .where("starred" => "f") .where("public" => "f") .pluck(:id, :name) - .map { |id, name| menu_item(name, query_params(id)) } - .sort_by(&:title) + .map { |id, name| menu_item(title: name, query_params: query_params(id)) } + .sort_by { |item| item.title.downcase } end def base_query @@ -92,15 +92,19 @@ class Submenu { query_id: id } end - def menu_item(name, query_params) - OpenProject::Menu::MenuItem.new(title: name, + def menu_item(title:, icon_key: nil, count: nil, show_enterprise_icon: false, query_params: {}) + OpenProject::Menu::MenuItem.new(title:, href: query_path(query_params), + icon: icon_map.fetch(icon_key, icon_key), + count:, selected: selected?(query_params), - favored: favored?(query_params)) + favored: favored?(query_params), + show_enterprise_icon:) end def selected?(query_params) query_params.each_key do |filter_key| + next if filter_key == :show_enterprise_icon if params[filter_key] != query_params[filter_key].to_s return false end @@ -117,6 +121,10 @@ class Submenu false end + def icon_map + {} + end + def query_path(query_params) raise NotImplementedError end diff --git a/app/menus/work_packages/menu.rb b/app/menus/work_packages/menu.rb index d4c4b3628e6..e2415fa4fc9 100644 --- a/app/menus/work_packages/menu.rb +++ b/app/menus/work_packages/menu.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -43,15 +43,15 @@ module WorkPackages next if params.nil? menu_item( - I18n.t("js.work_packages.default_queries.#{query_key}"), - params + title: I18n.t("js.work_packages.default_queries.#{query_key}"), + query_params: params, + show_enterprise_icon: params[:show_enterprise_icon].present? ) end end def query_path(query_params) - if !EnterpriseToken.allows_to?(:work_package_sharing) && - %i[shared_with_users shared_with_me].any?(query_params[:name]) + if query_params[:show_enterprise_icon].present? return ee_upsale_path(query_params) end diff --git a/app/models/action.rb b/app/models/action.rb index 8e69476666b..0ae3927bf26 100644 --- a/app/models/action.rb +++ b/app/models/action.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/actions/scopes/default.rb b/app/models/actions/scopes/default.rb index 18eeea9417b..dd1be87feac 100644 --- a/app/models/actions/scopes/default.rb +++ b/app/models/actions/scopes/default.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/base_activity_provider.rb b/app/models/activities/base_activity_provider.rb index 9c7e90fac57..1c9e5f2906d 100644 --- a/app/models/activities/base_activity_provider.rb +++ b/app/models/activities/base_activity_provider.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/changeset_activity_provider.rb b/app/models/activities/changeset_activity_provider.rb index 395e5b89e5c..61cb1e168a1 100644 --- a/app/models/activities/changeset_activity_provider.rb +++ b/app/models/activities/changeset_activity_provider.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/event.rb b/app/models/activities/event.rb index c36540cd454..078988d8757 100644 --- a/app/models/activities/event.rb +++ b/app/models/activities/event.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/event_mapper.rb b/app/models/activities/event_mapper.rb index d8b4e78d047..9c0b1990751 100644 --- a/app/models/activities/event_mapper.rb +++ b/app/models/activities/event_mapper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/fetcher.rb b/app/models/activities/fetcher.rb index 2422359bb52..8eddb163198 100644 --- a/app/models/activities/fetcher.rb +++ b/app/models/activities/fetcher.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/message_activity_provider.rb b/app/models/activities/message_activity_provider.rb index 5b5189d40e0..500b69730a5 100644 --- a/app/models/activities/message_activity_provider.rb +++ b/app/models/activities/message_activity_provider.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/news_activity_provider.rb b/app/models/activities/news_activity_provider.rb index ee8f9ae6297..599848a6213 100644 --- a/app/models/activities/news_activity_provider.rb +++ b/app/models/activities/news_activity_provider.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/project_activity_provider.rb b/app/models/activities/project_activity_provider.rb index 3ca1eb6f0c6..990850a22a6 100644 --- a/app/models/activities/project_activity_provider.rb +++ b/app/models/activities/project_activity_provider.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/wiki_page_activity_provider.rb b/app/models/activities/wiki_page_activity_provider.rb index 3913de39db6..6144b9d5596 100644 --- a/app/models/activities/wiki_page_activity_provider.rb +++ b/app/models/activities/wiki_page_activity_provider.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/activities/work_package_activity_provider.rb b/app/models/activities/work_package_activity_provider.rb index 32d9c6444ef..7817fa4e505 100644 --- a/app/models/activities/work_package_activity_provider.rb +++ b/app/models/activities/work_package_activity_provider.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/anonymous_user.rb b/app/models/anonymous_user.rb index 441bd8e39ec..27e4514d656 100644 --- a/app/models/anonymous_user.rb +++ b/app/models/anonymous_user.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/models/associations/groupable.rb b/app/models/associations/groupable.rb index 396fcd677d8..14f01c3871d 100644 --- a/app/models/associations/groupable.rb +++ b/app/models/associations/groupable.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/attachment.rb b/app/models/attachment.rb index 874d4dca4a1..b1d7ae1942c 100644 --- a/app/models/attachment.rb +++ b/app/models/attachment.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/attribute_help_text.rb b/app/models/attribute_help_text.rb index 342d0774ecc..558991547ad 100644 --- a/app/models/attribute_help_text.rb +++ b/app/models/attribute_help_text.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/attribute_help_text/project.rb b/app/models/attribute_help_text/project.rb index c17dc9fd8a6..24a7d45054e 100644 --- a/app/models/attribute_help_text/project.rb +++ b/app/models/attribute_help_text/project.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/attribute_help_text/work_package.rb b/app/models/attribute_help_text/work_package.rb index 37dff8e30de..8ba82dd5b67 100644 --- a/app/models/attribute_help_text/work_package.rb +++ b/app/models/attribute_help_text/work_package.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/auth_provider.rb b/app/models/auth_provider.rb new file mode 100644 index 00000000000..69d724c0fae --- /dev/null +++ b/app/models/auth_provider.rb @@ -0,0 +1,47 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class AuthProvider < ApplicationRecord + belongs_to :creator, class_name: "User" + + validates :display_name, presence: true + validates :display_name, uniqueness: true + + def self.slug_fragment + raise NotImplementedError + end + + def auth_url + root_url = OpenProject::StaticRouting::StaticUrlHelpers.new.root_url + URI.join(root_url, "auth/#{slug}/").to_s + end + + def callback_url + URI.join(auth_url, "callback").to_s + end +end diff --git a/app/models/capabilities/scopes/default.rb b/app/models/capabilities/scopes/default.rb index 756647227a8..67832ad2ff3 100644 --- a/app/models/capabilities/scopes/default.rb +++ b/app/models/capabilities/scopes/default.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/capability.rb b/app/models/capability.rb index 457f93e6cb5..1d7c9729835 100644 --- a/app/models/capability.rb +++ b/app/models/capability.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/category.rb b/app/models/category.rb index cd53e8468ce..cd635929c8c 100644 --- a/app/models/category.rb +++ b/app/models/category.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/change.rb b/app/models/change.rb index 416cd420c7c..a23ca0cf013 100644 --- a/app/models/change.rb +++ b/app/models/change.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/changeset.rb b/app/models/changeset.rb index 1aaeaf51c78..6c8309923e0 100644 --- a/app/models/changeset.rb +++ b/app/models/changeset.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/color.rb b/app/models/color.rb index c9152ce4ad3..9a47108bb0c 100644 --- a/app/models/color.rb +++ b/app/models/color.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/colors/hex_color.rb b/app/models/colors/hex_color.rb index 2d063c2e9b3..7825f306f1b 100644 --- a/app/models/colors/hex_color.rb +++ b/app/models/colors/hex_color.rb @@ -5,11 +5,11 @@ module Colors # If the color is light, use a dark font. # Otherwise, use a white font. def color_styles(light_color: "#FFFFFF", dark_color: "#333333") - if bright? - { color: dark_color, "background-color": hexcode } - else - { color: light_color, "background-color": hexcode } - end + { color: contrasting_font_color(light: light_color, dark: dark_color), "background-color": hexcode } + end + + def contrasting_font_color(light: "#FFFFFF", dark: "#333333") + bright? ? dark : light end ## diff --git a/app/models/comment.rb b/app/models/comment.rb index b69674f6273..76f44982481 100644 --- a/app/models/comment.rb +++ b/app/models/comment.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/concerns/has_members.rb b/app/models/concerns/has_members.rb index d5f05035053..cb690996d50 100644 --- a/app/models/concerns/has_members.rb +++ b/app/models/concerns/has_members.rb @@ -1,6 +1,6 @@ # --copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/concerns/inexistent_model.rb b/app/models/concerns/inexistent_model.rb index cceba9103f3..b097ef2e0a0 100644 --- a/app/models/concerns/inexistent_model.rb +++ b/app/models/concerns/inexistent_model.rb @@ -1,6 +1,6 @@ # --copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/concerns/subclass_registry.rb b/app/models/concerns/subclass_registry.rb new file mode 100644 index 00000000000..37159680d38 --- /dev/null +++ b/app/models/concerns/subclass_registry.rb @@ -0,0 +1,45 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module SubclassRegistry + extend ActiveSupport::Concern + + included do + class_attribute :registered_subclasses, default: [] + end + + class_methods do + def register_subclass(subclass) + raise ArgumentError, "#{subclass} needs to inherit from #{self}" unless subclass < self + + unless registered_subclasses.include?(subclass) + registered_subclasses << subclass + end + end + end +end diff --git a/app/models/concerns/tableless.rb b/app/models/concerns/tableless.rb index 976fb1c5917..70224951bac 100644 --- a/app/models/concerns/tableless.rb +++ b/app/models/concerns/tableless.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/concerns/virtual_attribute.rb b/app/models/concerns/virtual_attribute.rb index 55558d41e30..8796bf83107 100644 --- a/app/models/concerns/virtual_attribute.rb +++ b/app/models/concerns/virtual_attribute.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_action.rb b/app/models/custom_action.rb index 0d3f1f70c54..95194da83f9 100644 --- a/app/models/custom_action.rb +++ b/app/models/custom_action.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/assigned_to.rb b/app/models/custom_actions/actions/assigned_to.rb index cb07040dab1..1aee8d1f99d 100644 --- a/app/models/custom_actions/actions/assigned_to.rb +++ b/app/models/custom_actions/actions/assigned_to.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/base.rb b/app/models/custom_actions/actions/base.rb index 46de397c5eb..8b64662449b 100644 --- a/app/models/custom_actions/actions/base.rb +++ b/app/models/custom_actions/actions/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/custom_field.rb b/app/models/custom_actions/actions/custom_field.rb index f46bb53467f..c1b0a82eba8 100644 --- a/app/models/custom_actions/actions/custom_field.rb +++ b/app/models/custom_actions/actions/custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/date.rb b/app/models/custom_actions/actions/date.rb index 5b853c391af..49eb1a64e87 100644 --- a/app/models/custom_actions/actions/date.rb +++ b/app/models/custom_actions/actions/date.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/done_ratio.rb b/app/models/custom_actions/actions/done_ratio.rb index 4843e43f547..894b22d0ee5 100644 --- a/app/models/custom_actions/actions/done_ratio.rb +++ b/app/models/custom_actions/actions/done_ratio.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/due_date.rb b/app/models/custom_actions/actions/due_date.rb index 0376f1044c2..6e9e331588e 100644 --- a/app/models/custom_actions/actions/due_date.rb +++ b/app/models/custom_actions/actions/due_date.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/estimated_hours.rb b/app/models/custom_actions/actions/estimated_hours.rb index 299ed03f87c..fce9bed4be6 100644 --- a/app/models/custom_actions/actions/estimated_hours.rb +++ b/app/models/custom_actions/actions/estimated_hours.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/inexistent.rb b/app/models/custom_actions/actions/inexistent.rb index f5574f85e0d..0f83b9f1bad 100644 --- a/app/models/custom_actions/actions/inexistent.rb +++ b/app/models/custom_actions/actions/inexistent.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/notify.rb b/app/models/custom_actions/actions/notify.rb index ab750301e65..a21e51f04ff 100644 --- a/app/models/custom_actions/actions/notify.rb +++ b/app/models/custom_actions/actions/notify.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/priority.rb b/app/models/custom_actions/actions/priority.rb index ff7bd4e235c..1efeb9764a4 100644 --- a/app/models/custom_actions/actions/priority.rb +++ b/app/models/custom_actions/actions/priority.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/project.rb b/app/models/custom_actions/actions/project.rb index 45f304eb8ec..d4d42bf6f02 100644 --- a/app/models/custom_actions/actions/project.rb +++ b/app/models/custom_actions/actions/project.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/responsible.rb b/app/models/custom_actions/actions/responsible.rb index 521135ec3f9..862a0e069e3 100644 --- a/app/models/custom_actions/actions/responsible.rb +++ b/app/models/custom_actions/actions/responsible.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/serializer.rb b/app/models/custom_actions/actions/serializer.rb index d4d3ea0744a..6f9377a1e9a 100644 --- a/app/models/custom_actions/actions/serializer.rb +++ b/app/models/custom_actions/actions/serializer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/start_date.rb b/app/models/custom_actions/actions/start_date.rb index c0f7387d6a8..fe3dd49aaf7 100644 --- a/app/models/custom_actions/actions/start_date.rb +++ b/app/models/custom_actions/actions/start_date.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/status.rb b/app/models/custom_actions/actions/status.rb index cfc04fe9364..7a0bbbf2c64 100644 --- a/app/models/custom_actions/actions/status.rb +++ b/app/models/custom_actions/actions/status.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/associated.rb b/app/models/custom_actions/actions/strategies/associated.rb index 83401b99de4..e257ab55f7f 100644 --- a/app/models/custom_actions/actions/strategies/associated.rb +++ b/app/models/custom_actions/actions/strategies/associated.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/associated_custom_field.rb b/app/models/custom_actions/actions/strategies/associated_custom_field.rb index 5f806a2c5a1..fd2709b7121 100644 --- a/app/models/custom_actions/actions/strategies/associated_custom_field.rb +++ b/app/models/custom_actions/actions/strategies/associated_custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/custom_field.rb b/app/models/custom_actions/actions/strategies/custom_field.rb index 8b7bfac6049..6949a58f6b2 100644 --- a/app/models/custom_actions/actions/strategies/custom_field.rb +++ b/app/models/custom_actions/actions/strategies/custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/date.rb b/app/models/custom_actions/actions/strategies/date.rb index 7193ce36ad5..b92f524663f 100644 --- a/app/models/custom_actions/actions/strategies/date.rb +++ b/app/models/custom_actions/actions/strategies/date.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/date_property.rb b/app/models/custom_actions/actions/strategies/date_property.rb index ab51c0153ff..25d97751977 100644 --- a/app/models/custom_actions/actions/strategies/date_property.rb +++ b/app/models/custom_actions/actions/strategies/date_property.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/float.rb b/app/models/custom_actions/actions/strategies/float.rb index f6ea441cccf..b42b949cc2c 100644 --- a/app/models/custom_actions/actions/strategies/float.rb +++ b/app/models/custom_actions/actions/strategies/float.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/integer.rb b/app/models/custom_actions/actions/strategies/integer.rb index 45377c88498..60c9b580fa3 100644 --- a/app/models/custom_actions/actions/strategies/integer.rb +++ b/app/models/custom_actions/actions/strategies/integer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/link.rb b/app/models/custom_actions/actions/strategies/link.rb index 46abcb71971..85bde80177f 100644 --- a/app/models/custom_actions/actions/strategies/link.rb +++ b/app/models/custom_actions/actions/strategies/link.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/me_associated.rb b/app/models/custom_actions/actions/strategies/me_associated.rb index 7ae0a30c42d..ba73d23f0f3 100644 --- a/app/models/custom_actions/actions/strategies/me_associated.rb +++ b/app/models/custom_actions/actions/strategies/me_associated.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/string.rb b/app/models/custom_actions/actions/strategies/string.rb index 10ee4cc9860..c483ecf64ef 100644 --- a/app/models/custom_actions/actions/strategies/string.rb +++ b/app/models/custom_actions/actions/strategies/string.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/text.rb b/app/models/custom_actions/actions/strategies/text.rb index b3deb53d8ba..d4720d14920 100644 --- a/app/models/custom_actions/actions/strategies/text.rb +++ b/app/models/custom_actions/actions/strategies/text.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/user_custom_field.rb b/app/models/custom_actions/actions/strategies/user_custom_field.rb index feac280bb46..3b0bc41e3c9 100644 --- a/app/models/custom_actions/actions/strategies/user_custom_field.rb +++ b/app/models/custom_actions/actions/strategies/user_custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/validate_in_range.rb b/app/models/custom_actions/actions/strategies/validate_in_range.rb index 14ac3a9c155..b802b2388d4 100644 --- a/app/models/custom_actions/actions/strategies/validate_in_range.rb +++ b/app/models/custom_actions/actions/strategies/validate_in_range.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/strategies/values_to_string.rb b/app/models/custom_actions/actions/strategies/values_to_string.rb index e7f839ce8a4..23e9e814f79 100644 --- a/app/models/custom_actions/actions/strategies/values_to_string.rb +++ b/app/models/custom_actions/actions/strategies/values_to_string.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/actions/type.rb b/app/models/custom_actions/actions/type.rb index c0104383b53..43241b7cad0 100644 --- a/app/models/custom_actions/actions/type.rb +++ b/app/models/custom_actions/actions/type.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/conditions/base.rb b/app/models/custom_actions/conditions/base.rb index bc63a7abc9d..93828f8d388 100644 --- a/app/models/custom_actions/conditions/base.rb +++ b/app/models/custom_actions/conditions/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/conditions/inexistent.rb b/app/models/custom_actions/conditions/inexistent.rb index f0080c2e4ec..399f88eddfd 100644 --- a/app/models/custom_actions/conditions/inexistent.rb +++ b/app/models/custom_actions/conditions/inexistent.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/conditions/project.rb b/app/models/custom_actions/conditions/project.rb index a13596839c1..5c8015a0f29 100644 --- a/app/models/custom_actions/conditions/project.rb +++ b/app/models/custom_actions/conditions/project.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/conditions/role.rb b/app/models/custom_actions/conditions/role.rb index f978a67251f..d6c7756b03f 100644 --- a/app/models/custom_actions/conditions/role.rb +++ b/app/models/custom_actions/conditions/role.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/conditions/status.rb b/app/models/custom_actions/conditions/status.rb index 801fa7587fa..4f2c3feb2ea 100644 --- a/app/models/custom_actions/conditions/status.rb +++ b/app/models/custom_actions/conditions/status.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/conditions/type.rb b/app/models/custom_actions/conditions/type.rb index 4b16c3b21da..f56f69acb25 100644 --- a/app/models/custom_actions/conditions/type.rb +++ b/app/models/custom_actions/conditions/type.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/register.rb b/app/models/custom_actions/register.rb index 1d999642d7a..76084cb57f2 100644 --- a/app/models/custom_actions/register.rb +++ b/app/models/custom_actions/register.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_actions/values_to_integer.rb b/app/models/custom_actions/values_to_integer.rb index 34869def462..0270c214468 100644 --- a/app/models/custom_actions/values_to_integer.rb +++ b/app/models/custom_actions/values_to_integer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_field.rb b/app/models/custom_field.rb index 140ab414d3a..076d972709d 100644 --- a/app/models/custom_field.rb +++ b/app/models/custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -69,12 +69,15 @@ class CustomField < ApplicationRecord validates :min_length, numericality: { less_than_or_equal_to: :max_length, message: :smaller_than_or_equal_to_max_length }, unless: Proc.new { |cf| cf.max_length.blank? } + validates :multi_value, absence: true, unless: :multi_value_possible? + validates :allow_non_open_versions, absence: true, unless: :allow_non_open_versions_possible? + before_validation :check_searchability after_destroy :destroy_help_text # make sure int, float, date, and bool are not searchable def check_searchability - self.searchable = false if %w(int float date bool).include?(field_format) + self.searchable = false if %w(int float date bool user version).include?(field_format) true end @@ -265,6 +268,10 @@ class CustomField < ApplicationRecord field_format == "list" end + def user? + field_format == "user" + end + def version? field_format == "version" end @@ -277,22 +284,12 @@ class CustomField < ApplicationRecord field_format == "bool" end - def multi_value? - multi_value - end - def multi_value_possible? - %w[version user list].include?(field_format) && - [ProjectCustomField, WorkPackageCustomField, TimeEntryCustomField, VersionCustomField].include?(self.class) - end - - def allow_non_open_versions? - allow_non_open_versions + version? || user? || list? end def allow_non_open_versions_possible? - version? && - [ProjectCustomField, WorkPackageCustomField, TimeEntryCustomField, VersionCustomField].include?(self.class) + version? end ## diff --git a/app/models/custom_field/order_statements.rb b/app/models/custom_field/order_statements.rb index 3c96ec5cf17..c4be1d1fc81 100644 --- a/app/models/custom_field/order_statements.rb +++ b/app/models/custom_field/order_statements.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -38,12 +38,8 @@ module CustomField::OrderStatements else [select_custom_option_position] end - when "string", "text", "date", "bool" - if multi_value? - [select_custom_values_as_group] - else - [coalesce_select_custom_value_as_string] - end + when "string", "date", "bool", "link" + [coalesce_select_custom_value_as_string] when "int", "float" # Make the database cast values into numeric # Postgresql will raise an error if a value can not be casted! diff --git a/app/models/custom_field_section.rb b/app/models/custom_field_section.rb index 8ca5ae147a0..e6b800be66a 100644 --- a/app/models/custom_field_section.rb +++ b/app/models/custom_field_section.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_fields_project.rb b/app/models/custom_fields_project.rb index 7be8bef4502..402c7c58405 100644 --- a/app/models/custom_fields_project.rb +++ b/app/models/custom_fields_project.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_option.rb b/app/models/custom_option.rb index c32b738908f..210da4d58fb 100644 --- a/app/models/custom_option.rb +++ b/app/models/custom_option.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value.rb b/app/models/custom_value.rb index d3b55b63bb0..5208e36cc60 100644 --- a/app/models/custom_value.rb +++ b/app/models/custom_value.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -42,7 +42,7 @@ class CustomValue < ApplicationRecord to: :strategy delegate :editable?, - :visible?, + :admin_only?, :required?, :max_length, :min_length, diff --git a/app/models/custom_value/ar_object_strategy.rb b/app/models/custom_value/ar_object_strategy.rb index 0e4f35e7f01..8037e6bec0b 100644 --- a/app/models/custom_value/ar_object_strategy.rb +++ b/app/models/custom_value/ar_object_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/bool_strategy.rb b/app/models/custom_value/bool_strategy.rb index 57311a4246a..54b12051c8f 100644 --- a/app/models/custom_value/bool_strategy.rb +++ b/app/models/custom_value/bool_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/date_strategy.rb b/app/models/custom_value/date_strategy.rb index 6dd1095a403..d355b0187db 100644 --- a/app/models/custom_value/date_strategy.rb +++ b/app/models/custom_value/date_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/empty_strategy.rb b/app/models/custom_value/empty_strategy.rb index cddf7c7ae21..0cac71a7684 100644 --- a/app/models/custom_value/empty_strategy.rb +++ b/app/models/custom_value/empty_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/float_strategy.rb b/app/models/custom_value/float_strategy.rb index 3b13c0aa2c9..658bf294fcf 100644 --- a/app/models/custom_value/float_strategy.rb +++ b/app/models/custom_value/float_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/format_strategy.rb b/app/models/custom_value/format_strategy.rb index e473970f5b5..917dbef5134 100644 --- a/app/models/custom_value/format_strategy.rb +++ b/app/models/custom_value/format_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/formattable_strategy.rb b/app/models/custom_value/formattable_strategy.rb index 884c9346d1d..87401986330 100644 --- a/app/models/custom_value/formattable_strategy.rb +++ b/app/models/custom_value/formattable_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/int_strategy.rb b/app/models/custom_value/int_strategy.rb index 93423c56669..e4ed1c7b8dc 100644 --- a/app/models/custom_value/int_strategy.rb +++ b/app/models/custom_value/int_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/link_strategy.rb b/app/models/custom_value/link_strategy.rb index 04975fb25fb..3e6951d6dec 100644 --- a/app/models/custom_value/link_strategy.rb +++ b/app/models/custom_value/link_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/list_strategy.rb b/app/models/custom_value/list_strategy.rb index 381e74d5289..a65c9de837b 100644 --- a/app/models/custom_value/list_strategy.rb +++ b/app/models/custom_value/list_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/string_strategy.rb b/app/models/custom_value/string_strategy.rb index b7622af0e3b..91a594397ab 100644 --- a/app/models/custom_value/string_strategy.rb +++ b/app/models/custom_value/string_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/user_strategy.rb b/app/models/custom_value/user_strategy.rb index f219f51e046..c93522e04cf 100644 --- a/app/models/custom_value/user_strategy.rb +++ b/app/models/custom_value/user_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/custom_value/version_strategy.rb b/app/models/custom_value/version_strategy.rb index 128a88e803a..4f2d2db3a99 100644 --- a/app/models/custom_value/version_strategy.rb +++ b/app/models/custom_value/version_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/day.rb b/app/models/day.rb index 8e4874682f3..6c006389c79 100644 --- a/app/models/day.rb +++ b/app/models/day.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/deleted_user.rb b/app/models/deleted_user.rb index 3685dbe3a9f..ae65cfb4af7 100644 --- a/app/models/deleted_user.rb +++ b/app/models/deleted_user.rb @@ -11,19 +11,13 @@ class DeletedUser < User end # Overrides a few properties - def logged?; false end - - def builtin?; true end - - def admin; false end - - def name(*_args); I18n.t("user.deleted") end - - def mail; nil end - - def time_zone; nil end - - def rss_key; nil end - - def destroy; false end + def available_custom_fields = [] + def logged? = false + def builtin? = true + def admin = false + def name(*_args) = I18n.t("user.deleted") + def mail = nil + def time_zone = nil + def rss_key = nil + def destroy = false end diff --git a/app/models/design_color.rb b/app/models/design_color.rb index e649011ed7d..9c0a0161a69 100644 --- a/app/models/design_color.rb +++ b/app/models/design_color.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/enabled_module.rb b/app/models/enabled_module.rb index 3fab8e33157..0cda62a046e 100644 --- a/app/models/enabled_module.rb +++ b/app/models/enabled_module.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/enterprise_token.rb b/app/models/enterprise_token.rb index 06f510a2d21..1e064f48c2c 100644 --- a/app/models/enterprise_token.rb +++ b/app/models/enterprise_token.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/enumeration.rb b/app/models/enumeration.rb index b6e1f6f4b65..da80df87146 100644 --- a/app/models/enumeration.rb +++ b/app/models/enumeration.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,6 +27,8 @@ #++ class Enumeration < ApplicationRecord + include SubclassRegistry + default_scope { order("#{Enumeration.table_name}.position ASC") } belongs_to :project, optional: true diff --git a/app/models/exports/concerns/csv.rb b/app/models/exports/concerns/csv.rb index d8229338021..859e6e0ccaa 100644 --- a/app/models/exports/concerns/csv.rb +++ b/app/models/exports/concerns/csv.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -53,7 +53,7 @@ module Exports ::Exports::Result .new format: :csv, title: csv_export_filename, - content: serialized, + content: "\xEF\xBB\xBF#{serialized}", # Make Excel open CSV happy by append UTF8 BOM mime_type: "text/csv" end diff --git a/app/models/exports/export_error.rb b/app/models/exports/export_error.rb index 56285b89c84..541bfa209eb 100644 --- a/app/models/exports/export_error.rb +++ b/app/models/exports/export_error.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/exports/exporter.rb b/app/models/exports/exporter.rb index b06f614c244..195c9237e43 100644 --- a/app/models/exports/exporter.rb +++ b/app/models/exports/exporter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/exports/register.rb b/app/models/exports/register.rb index 4e51c017984..b1bd4d46ab9 100644 --- a/app/models/exports/register.rb +++ b/app/models/exports/register.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/exports/result.rb b/app/models/exports/result.rb index 083eabf1336..26e66c2cc12 100644 --- a/app/models/exports/result.rb +++ b/app/models/exports/result.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/favorite.rb b/app/models/favorite.rb index 99907152df7..bbf19596d0c 100644 --- a/app/models/favorite.rb +++ b/app/models/favorite.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/forum.rb b/app/models/forum.rb index f59d608c695..8ec7377bee1 100644 --- a/app/models/forum.rb +++ b/app/models/forum.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/global_role.rb b/app/models/global_role.rb index d829da2edd4..5600bfd1e0d 100644 --- a/app/models/global_role.rb +++ b/app/models/global_role.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/group.rb b/app/models/group.rb index b15997ae0c3..277f6871d71 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/group_custom_field.rb b/app/models/group_custom_field.rb index 225be7d60eb..cec58c141ef 100644 --- a/app/models/group_custom_field.rb +++ b/app/models/group_custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/group_user.rb b/app/models/group_user.rb index 5237147d225..1372dddd446 100644 --- a/app/models/group_user.rb +++ b/app/models/group_user.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/groups/scopes/visible.rb b/app/models/groups/scopes/visible.rb index 69bd8a7121d..7436d14eb59 100644 --- a/app/models/groups/scopes/visible.rb +++ b/app/models/groups/scopes/visible.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/issue_priority.rb b/app/models/issue_priority.rb index a159030f600..340dbf52203 100644 --- a/app/models/issue_priority.rb +++ b/app/models/issue_priority.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journable/historic_active_record_relation.rb b/app/models/journable/historic_active_record_relation.rb index 2282061bfab..1a1a3d986ca 100644 --- a/app/models/journable/historic_active_record_relation.rb +++ b/app/models/journable/historic_active_record_relation.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journable/timestamps.rb b/app/models/journable/timestamps.rb index b38fdb17590..2f49da5e546 100644 --- a/app/models/journable/timestamps.rb +++ b/app/models/journable/timestamps.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journable/with_historic_attributes.rb b/app/models/journable/with_historic_attributes.rb index 63a1c7aced3..2a1d3482b85 100644 --- a/app/models/journable/with_historic_attributes.rb +++ b/app/models/journable/with_historic_attributes.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -242,7 +242,7 @@ class Journable::WithHistoricAttributes < SimpleDelegator # of the association name (`custom_fields` in this instance), to map the association fields. That # will result in a changes hash containing { "custom_fields_1" => ... }. This makes sense in the case # of journal changes, because the formatted fields have the convention for plural lookup for journals - # defined in the `register_journal_formatted_fields(:custom_field, /custom_fields_\d+/)`. + # defined in the `register_journal_formatted_fields(/custom_fields_\d+/, formatter_key: :custom_field)`. # In this case the diff is part of the WorkPackageAtTimestampRepresenter where the `representable_map` # contains the singular names (`custom_field_1`), hence we need to map the diffs to match that format. # As a food for thought, I think it would be more handy to use the singular naming everywhere. diff --git a/app/models/journable/with_historic_attributes/loader.rb b/app/models/journable/with_historic_attributes/loader.rb index 1749bbcc4d9..ff36d790a9f 100644 --- a/app/models/journable/with_historic_attributes/loader.rb +++ b/app/models/journable/with_historic_attributes/loader.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal.rb b/app/models/journal.rb index 1a9229a397a..d393198b913 100644 --- a/app/models/journal.rb +++ b/app/models/journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -35,30 +35,28 @@ class Journal < ApplicationRecord include ::Acts::Journalized::FormatHooks include Journal::Timestamps - register_journal_formatter :diff, OpenProject::JournalFormatter::Diff - register_journal_formatter :attachment, OpenProject::JournalFormatter::Attachment - register_journal_formatter :custom_field, OpenProject::JournalFormatter::CustomField - register_journal_formatter :schedule_manually, OpenProject::JournalFormatter::ScheduleManually - register_journal_formatter :ignore_non_working_days, OpenProject::JournalFormatter::IgnoreNonWorkingDays - register_journal_formatter :active_status, OpenProject::JournalFormatter::ActiveStatus - register_journal_formatter :project_status_code, OpenProject::JournalFormatter::ProjectStatusCode - register_journal_formatter :template, OpenProject::JournalFormatter::Template - register_journal_formatter :visibility, OpenProject::JournalFormatter::Visibility - register_journal_formatter :subproject_named_association, OpenProject::JournalFormatter::SubprojectNamedAssociation - register_journal_formatter :time_entry_hours, OpenProject::JournalFormatter::TimeEntryHours - register_journal_formatter :wiki_diff, OpenProject::JournalFormatter::WikiDiff - register_journal_formatter :time_entry_named_association, OpenProject::JournalFormatter::TimeEntryNamedAssociation - register_journal_formatter :cause, OpenProject::JournalFormatter::Cause - register_journal_formatter :file_link, OpenProject::JournalFormatter::FileLink - register_journal_formatter :meeting_start_time, OpenProject::JournalFormatter::MeetingStartTime - register_journal_formatter :agenda_item_position, OpenProject::JournalFormatter::AgendaItemPosition - register_journal_formatter :agenda_item_duration, OpenProject::JournalFormatter::AgendaItemDuration - register_journal_formatter :agenda_item_diff, OpenProject::JournalFormatter::AgendaItemDiff - register_journal_formatter :agenda_item_title, OpenProject::JournalFormatter::AgendaItemTitle - register_journal_formatter :meeting_work_package_id, OpenProject::JournalFormatter::MeetingWorkPackageId - register_journal_formatter :meeting_state, OpenProject::JournalFormatter::MeetingState - register_journal_formatter :agenda_item_diff, OpenProject::JournalFormatter::AgendaItemDiff - register_journal_formatter :agenda_item_title, OpenProject::JournalFormatter::AgendaItemTitle + register_journal_formatter OpenProject::JournalFormatter::ActiveStatus + register_journal_formatter OpenProject::JournalFormatter::AgendaItemDiff + register_journal_formatter OpenProject::JournalFormatter::AgendaItemDuration + register_journal_formatter OpenProject::JournalFormatter::AgendaItemPosition + register_journal_formatter OpenProject::JournalFormatter::AgendaItemTitle + register_journal_formatter OpenProject::JournalFormatter::Attachment + register_journal_formatter OpenProject::JournalFormatter::Cause + register_journal_formatter OpenProject::JournalFormatter::CustomField + register_journal_formatter OpenProject::JournalFormatter::Diff + register_journal_formatter OpenProject::JournalFormatter::FileLink + register_journal_formatter OpenProject::JournalFormatter::IgnoreNonWorkingDays + register_journal_formatter OpenProject::JournalFormatter::MeetingStartTime + register_journal_formatter OpenProject::JournalFormatter::MeetingState + register_journal_formatter OpenProject::JournalFormatter::MeetingWorkPackageId + register_journal_formatter OpenProject::JournalFormatter::ProjectStatusCode + register_journal_formatter OpenProject::JournalFormatter::ScheduleManually + register_journal_formatter OpenProject::JournalFormatter::SubprojectNamedAssociation + register_journal_formatter OpenProject::JournalFormatter::Template + register_journal_formatter OpenProject::JournalFormatter::TimeEntryHours + register_journal_formatter OpenProject::JournalFormatter::TimeEntryNamedAssociation + register_journal_formatter OpenProject::JournalFormatter::Visibility + register_journal_formatter OpenProject::JournalFormatter::WikiDiff # Attributes related to the cause are stored in a JSONB column so we can easily add new relations and related # attributes without a heavy database migration. Fields will be prefixed with `cause_` but are stored in the JSONB diff --git a/app/models/journal/associated_journal.rb b/app/models/journal/associated_journal.rb index 706ddfd39ce..9de071a0e57 100644 --- a/app/models/journal/associated_journal.rb +++ b/app/models/journal/associated_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/attachable_journal.rb b/app/models/journal/attachable_journal.rb index 43a721b8b21..e756aeef847 100644 --- a/app/models/journal/attachable_journal.rb +++ b/app/models/journal/attachable_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/attachment_journal.rb b/app/models/journal/attachment_journal.rb index 9f2e6f42a9e..82a968eaf58 100644 --- a/app/models/journal/attachment_journal.rb +++ b/app/models/journal/attachment_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/base_journal.rb b/app/models/journal/base_journal.rb index 8f7f28041d8..ea9cd0fa094 100644 --- a/app/models/journal/base_journal.rb +++ b/app/models/journal/base_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/caused_by_progress_mode_changed_to_status_based.rb b/app/models/journal/caused_by_progress_mode_changed_to_status_based.rb index 84a78eb674d..f5d56d8362d 100644 --- a/app/models/journal/caused_by_progress_mode_changed_to_status_based.rb +++ b/app/models/journal/caused_by_progress_mode_changed_to_status_based.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/caused_by_status_changed.rb b/app/models/journal/caused_by_status_changed.rb index 4e28458fbc7..d4eb7329464 100644 --- a/app/models/journal/caused_by_status_changed.rb +++ b/app/models/journal/caused_by_status_changed.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/caused_by_system_update.rb b/app/models/journal/caused_by_system_update.rb index a3634fd4eb1..b21b745daf7 100644 --- a/app/models/journal/caused_by_system_update.rb +++ b/app/models/journal/caused_by_system_update.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/caused_by_work_package_child_change.rb b/app/models/journal/caused_by_work_package_child_change.rb index 0389aa4da3d..e9949e94fdb 100644 --- a/app/models/journal/caused_by_work_package_child_change.rb +++ b/app/models/journal/caused_by_work_package_child_change.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/caused_by_work_package_parent_change.rb b/app/models/journal/caused_by_work_package_parent_change.rb index f76a8566284..662e5a61d19 100644 --- a/app/models/journal/caused_by_work_package_parent_change.rb +++ b/app/models/journal/caused_by_work_package_parent_change.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/caused_by_work_package_predecessor_change.rb b/app/models/journal/caused_by_work_package_predecessor_change.rb index 7eada4e8c0b..b18d2ac74be 100644 --- a/app/models/journal/caused_by_work_package_predecessor_change.rb +++ b/app/models/journal/caused_by_work_package_predecessor_change.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/caused_by_work_package_related_change.rb b/app/models/journal/caused_by_work_package_related_change.rb index afa6257679d..3253c117ded 100644 --- a/app/models/journal/caused_by_work_package_related_change.rb +++ b/app/models/journal/caused_by_work_package_related_change.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/caused_by_working_day_changes.rb b/app/models/journal/caused_by_working_day_changes.rb index 98a4752eaab..97c0cfc0afa 100644 --- a/app/models/journal/caused_by_working_day_changes.rb +++ b/app/models/journal/caused_by_working_day_changes.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/changeset_journal.rb b/app/models/journal/changeset_journal.rb index 6413c97b1e4..d324b98d19e 100644 --- a/app/models/journal/changeset_journal.rb +++ b/app/models/journal/changeset_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/customizable_journal.rb b/app/models/journal/customizable_journal.rb index 49a5179625a..eaa09ef30f9 100644 --- a/app/models/journal/customizable_journal.rb +++ b/app/models/journal/customizable_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/message_journal.rb b/app/models/journal/message_journal.rb index eb764928a8e..bc75b161b45 100644 --- a/app/models/journal/message_journal.rb +++ b/app/models/journal/message_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/news_journal.rb b/app/models/journal/news_journal.rb index 1c0d62f2969..cb784c5c398 100644 --- a/app/models/journal/news_journal.rb +++ b/app/models/journal/news_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/notification_configuration.rb b/app/models/journal/notification_configuration.rb index f8732f20b30..c5fa1c7bcb5 100644 --- a/app/models/journal/notification_configuration.rb +++ b/app/models/journal/notification_configuration.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/project_journal.rb b/app/models/journal/project_journal.rb index 3b3212505f5..17ef40976cf 100644 --- a/app/models/journal/project_journal.rb +++ b/app/models/journal/project_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/storable_journal.rb b/app/models/journal/storable_journal.rb index 94d7524fb07..8b026f9828b 100644 --- a/app/models/journal/storable_journal.rb +++ b/app/models/journal/storable_journal.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/timestamps.rb b/app/models/journal/timestamps.rb index 50f3aa85e39..ecc732949da 100644 --- a/app/models/journal/timestamps.rb +++ b/app/models/journal/timestamps.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/wiki_page_journal.rb b/app/models/journal/wiki_page_journal.rb index 45cf69c63fc..ce40d02b8c9 100644 --- a/app/models/journal/wiki_page_journal.rb +++ b/app/models/journal/wiki_page_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/journal/work_package_journal.rb b/app/models/journal/work_package_journal.rb index bc4b0f9bccf..40941aa14bb 100644 --- a/app/models/journal/work_package_journal.rb +++ b/app/models/journal/work_package_journal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/ldap_auth_source.rb b/app/models/ldap_auth_source.rb index a2a4920b6ac..d6cd746c2ac 100644 --- a/app/models/ldap_auth_source.rb +++ b/app/models/ldap_auth_source.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/mail_handler.rb b/app/models/mail_handler.rb index 24b2c994849..3525d0d6ba2 100644 --- a/app/models/mail_handler.rb +++ b/app/models/mail_handler.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -377,17 +377,18 @@ class MailHandler < ActionMailer::Base # Returns a Hash of issue attributes extracted from keywords in the email body def wp_attributes_from_keywords(work_package) { - "type_id" => wp_type_from_keywords(work_package), - "status_id" => wp_status_from_keywords, - "parent_id" => wp_parent_from_keywords, - "priority_id" => wp_priority_from_keywords, - "category_id" => wp_category_from_keywords(work_package), "assigned_to_id" => wp_assignee_from_keywords(work_package), - "version_id" => wp_version_from_keywords(work_package), - "start_date" => wp_start_date_from_keywords, + "category_id" => wp_category_from_keywords(work_package), "due_date" => wp_due_date_from_keywords, "estimated_hours" => wp_estimated_hours_from_keywords, - "remaining_hours" => wp_remaining_hours_from_keywords + "parent_id" => wp_parent_from_keywords, + "priority_id" => wp_priority_from_keywords, + "remaining_hours" => wp_remaining_hours_from_keywords, + "responsible_id" => wp_accountable_from_keywords(work_package), + "start_date" => wp_start_date_from_keywords, + "status_id" => wp_status_from_keywords, + "type_id" => wp_type_from_keywords(work_package), + "version_id" => wp_version_from_keywords(work_package) }.compact_blank! end @@ -541,8 +542,16 @@ class MailHandler < ActionMailer::Base lookup_case_insensitive_key(work_package.project.categories, :category) end + def wp_accountable_from_keywords(work_package) + get_assignable_principal_from_keywords(:responsible, work_package) + end + def wp_assignee_from_keywords(work_package) - keyword = get_keyword(:assigned_to, override: true) + get_assignable_principal_from_keywords(:assigned_to, work_package) + end + + def get_assignable_principal_from_keywords(keyword, work_package) + keyword = get_keyword(keyword, override: true) return nil if keyword.blank? diff --git a/app/models/mail_handler/user_creator.rb b/app/models/mail_handler/user_creator.rb index b6952828b75..7a50f506836 100644 --- a/app/models/mail_handler/user_creator.rb +++ b/app/models/mail_handler/user_creator.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/member.rb b/app/models/member.rb index 0419e68cb3f..837ab5d053f 100644 --- a/app/models/member.rb +++ b/app/models/member.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/member_role.rb b/app/models/member_role.rb index 5ced0d30985..c204d24cdb9 100644 --- a/app/models/member_role.rb +++ b/app/models/member_role.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/roles_diff.rb b/app/models/members/roles_diff.rb index 53b53e6c744..9fe82cb083f 100644 --- a/app/models/members/roles_diff.rb +++ b/app/models/members/roles_diff.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/assignable.rb b/app/models/members/scopes/assignable.rb index eecdec9fd7a..47dc8a084e4 100644 --- a/app/models/members/scopes/assignable.rb +++ b/app/models/members/scopes/assignable.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/global.rb b/app/models/members/scopes/global.rb index 08a9031a164..dd7402347c7 100644 --- a/app/models/members/scopes/global.rb +++ b/app/models/members/scopes/global.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/not_locked.rb b/app/models/members/scopes/not_locked.rb index 7eaa2ad215e..a32b961ba7c 100644 --- a/app/models/members/scopes/not_locked.rb +++ b/app/models/members/scopes/not_locked.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/of_any_entity.rb b/app/models/members/scopes/of_any_entity.rb index 11c4e582393..3ea86390a4a 100644 --- a/app/models/members/scopes/of_any_entity.rb +++ b/app/models/members/scopes/of_any_entity.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/of_any_project.rb b/app/models/members/scopes/of_any_project.rb index b3086825347..06569ec1cd3 100644 --- a/app/models/members/scopes/of_any_project.rb +++ b/app/models/members/scopes/of_any_project.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/of_any_work_package.rb b/app/models/members/scopes/of_any_work_package.rb index b7beb0be5ed..c069083ec31 100644 --- a/app/models/members/scopes/of_any_work_package.rb +++ b/app/models/members/scopes/of_any_work_package.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/of_anything_in_project.rb b/app/models/members/scopes/of_anything_in_project.rb index 2e7b5892d03..9ef03254535 100644 --- a/app/models/members/scopes/of_anything_in_project.rb +++ b/app/models/members/scopes/of_anything_in_project.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/of_entity.rb b/app/models/members/scopes/of_entity.rb index 4ebf97108f6..69842225abe 100644 --- a/app/models/members/scopes/of_entity.rb +++ b/app/models/members/scopes/of_entity.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/of_project.rb b/app/models/members/scopes/of_project.rb index 1ee85bacd21..2b82311b489 100644 --- a/app/models/members/scopes/of_project.rb +++ b/app/models/members/scopes/of_project.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/of_work_package.rb b/app/models/members/scopes/of_work_package.rb index ba4a9b896e7..88ebe74a75b 100644 --- a/app/models/members/scopes/of_work_package.rb +++ b/app/models/members/scopes/of_work_package.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/visible.rb b/app/models/members/scopes/visible.rb index b9857d740a9..9d9c7316068 100644 --- a/app/models/members/scopes/visible.rb +++ b/app/models/members/scopes/visible.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/with_shared_work_packages_info.rb b/app/models/members/scopes/with_shared_work_packages_info.rb index d205914cef3..4a942203663 100644 --- a/app/models/members/scopes/with_shared_work_packages_info.rb +++ b/app/models/members/scopes/with_shared_work_packages_info.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/members/scopes/without_inherited_roles.rb b/app/models/members/scopes/without_inherited_roles.rb index 4b99a90216c..e93363bcc0e 100644 --- a/app/models/members/scopes/without_inherited_roles.rb +++ b/app/models/members/scopes/without_inherited_roles.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/menu_item.rb b/app/models/menu_item.rb index 6ca7377944c..957cec47fb8 100644 --- a/app/models/menu_item.rb +++ b/app/models/menu_item.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/menu_items/wiki_menu_item.rb b/app/models/menu_items/wiki_menu_item.rb index 14a84a89bd8..495bfd98be3 100644 --- a/app/models/menu_items/wiki_menu_item.rb +++ b/app/models/menu_items/wiki_menu_item.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/message.rb b/app/models/message.rb index c6551361e03..cfc378fcc0a 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/news.rb b/app/models/news.rb index eced61e2b18..46218c37f7f 100644 --- a/app/models/news.rb +++ b/app/models/news.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/notification.rb b/app/models/notification.rb index f38a59e1dfd..65dff4c23ab 100644 --- a/app/models/notification.rb +++ b/app/models/notification.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -48,7 +48,6 @@ class Notification < ApplicationRecord belongs_to :recipient, class_name: "User" belongs_to :actor, class_name: "User" - belongs_to :project belongs_to :journal belongs_to :resource, polymorphic: true diff --git a/app/models/notification_settings/scopes/applicable.rb b/app/models/notification_settings/scopes/applicable.rb index 40d3693fed8..3485f76f447 100644 --- a/app/models/notification_settings/scopes/applicable.rb +++ b/app/models/notification_settings/scopes/applicable.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/notifications/scopes/mail_alert_unsent.rb b/app/models/notifications/scopes/mail_alert_unsent.rb index 7c889e524e5..2cdf3788aa6 100644 --- a/app/models/notifications/scopes/mail_alert_unsent.rb +++ b/app/models/notifications/scopes/mail_alert_unsent.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/notifications/scopes/mail_reminder_unsent.rb b/app/models/notifications/scopes/mail_reminder_unsent.rb index 2da88c6d7b3..854566c69c7 100644 --- a/app/models/notifications/scopes/mail_reminder_unsent.rb +++ b/app/models/notifications/scopes/mail_reminder_unsent.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/notifications/scopes/recipient.rb b/app/models/notifications/scopes/recipient.rb index 3e85ce3f057..4c8611d5c32 100644 --- a/app/models/notifications/scopes/recipient.rb +++ b/app/models/notifications/scopes/recipient.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/notifications/scopes/unsent_reminders_before.rb b/app/models/notifications/scopes/unsent_reminders_before.rb index 4434f0b5032..92b089ff18f 100644 --- a/app/models/notifications/scopes/unsent_reminders_before.rb +++ b/app/models/notifications/scopes/unsent_reminders_before.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/notifications/scopes/visible.rb b/app/models/notifications/scopes/visible.rb index 53b5393b99c..8c284fbf6cc 100644 --- a/app/models/notifications/scopes/visible.rb +++ b/app/models/notifications/scopes/visible.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/oauth_client.rb b/app/models/oauth_client.rb index adee82bac33..3b25763d6b0 100644 --- a/app/models/oauth_client.rb +++ b/app/models/oauth_client.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,6 +28,7 @@ class OAuthClient < ApplicationRecord belongs_to :integration, polymorphic: true + has_many :remote_identities, dependent: :destroy def redirect_uri File.join(Rails.application.root_url, "oauth_clients", client_id, "callback") diff --git a/app/models/oauth_client_token.rb b/app/models/oauth_client_token.rb index de72c6730bb..a1baede5100 100644 --- a/app/models/oauth_client_token.rb +++ b/app/models/oauth_client_token.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/ordered_work_package.rb b/app/models/ordered_work_package.rb index 1726effee0f..af5d92ea5bb 100644 --- a/app/models/ordered_work_package.rb +++ b/app/models/ordered_work_package.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/permitted_params.rb b/app/models/permitted_params.rb index fd947aef170..944f962afaa 100644 --- a/app/models/permitted_params.rb +++ b/app/models/permitted_params.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -472,7 +472,7 @@ class PermittedParams :possible_values, :regexp, :searchable, - :visible, + :admin_only, :default_value, :possible_values, :multi_value, @@ -549,6 +549,7 @@ class PermittedParams :name, :redirect_uri, :confidential, + :enabled, :client_credentials_user_id, { scopes: [] } ], diff --git a/app/models/placeholder_user.rb b/app/models/placeholder_user.rb index fc5c6858566..61b3a826cbc 100644 --- a/app/models/placeholder_user.rb +++ b/app/models/placeholder_user.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/models/placeholder_users/scopes/visible.rb b/app/models/placeholder_users/scopes/visible.rb index 0a60b641f29..728c14e4af2 100644 --- a/app/models/placeholder_users/scopes/visible.rb +++ b/app/models/placeholder_users/scopes/visible.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principal.rb b/app/models/principal.rb index 5e6b4bb3bed..20a0b51e10a 100644 --- a/app/models/principal.rb +++ b/app/models/principal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/having_entity_membership.rb b/app/models/principals/scopes/having_entity_membership.rb index 449403181f7..defe67df697 100644 --- a/app/models/principals/scopes/having_entity_membership.rb +++ b/app/models/principals/scopes/having_entity_membership.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/human.rb b/app/models/principals/scopes/human.rb index a94d9f294fe..c4eb3e949c3 100644 --- a/app/models/principals/scopes/human.rb +++ b/app/models/principals/scopes/human.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/like.rb b/app/models/principals/scopes/like.rb index c194ec51050..ea8064cab83 100644 --- a/app/models/principals/scopes/like.rb +++ b/app/models/principals/scopes/like.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/not_builtin.rb b/app/models/principals/scopes/not_builtin.rb index 17de232478e..2585c06b984 100644 --- a/app/models/principals/scopes/not_builtin.rb +++ b/app/models/principals/scopes/not_builtin.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/ordered_by_name.rb b/app/models/principals/scopes/ordered_by_name.rb index c72bab93d72..39f8f004c5e 100644 --- a/app/models/principals/scopes/ordered_by_name.rb +++ b/app/models/principals/scopes/ordered_by_name.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/possible_assignee.rb b/app/models/principals/scopes/possible_assignee.rb index 2f19ddd21b3..dfb5f0a382b 100644 --- a/app/models/principals/scopes/possible_assignee.rb +++ b/app/models/principals/scopes/possible_assignee.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/possible_member.rb b/app/models/principals/scopes/possible_member.rb index eef5ff35e87..64e42fd30b6 100644 --- a/app/models/principals/scopes/possible_member.rb +++ b/app/models/principals/scopes/possible_member.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/status.rb b/app/models/principals/scopes/status.rb index c04a360c985..17ab459f8ab 100644 --- a/app/models/principals/scopes/status.rb +++ b/app/models/principals/scopes/status.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/user.rb b/app/models/principals/scopes/user.rb index 114e8f544c7..affe880e5f7 100644 --- a/app/models/principals/scopes/user.rb +++ b/app/models/principals/scopes/user.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/principals/scopes/visible.rb b/app/models/principals/scopes/visible.rb index 077f425373c..177bb1aa43e 100644 --- a/app/models/principals/scopes/visible.rb +++ b/app/models/principals/scopes/visible.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/priority/inexistent_priority.rb b/app/models/priority/inexistent_priority.rb index 5c35da2680e..649b8349628 100644 --- a/app/models/priority/inexistent_priority.rb +++ b/app/models/priority/inexistent_priority.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/project.rb b/app/models/project.rb index 1bb82198272..cb377c6b5ad 100644 --- a/app/models/project.rb +++ b/app/models/project.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -44,7 +44,7 @@ class Project < ApplicationRecord IDENTIFIER_MAX_LENGTH = 100 # reserved identifiers - RESERVED_IDENTIFIERS = %w[new menu queries].freeze + RESERVED_IDENTIFIERS = %w[new menu queries export_list_modal].freeze has_many :members, -> { # TODO: check whether this should @@ -107,16 +107,14 @@ class Project < ApplicationRecord author: nil, datetime: :created_at - register_journal_formatted_fields(:active_status, "active") - register_journal_formatted_fields(:template, "templated") - register_journal_formatted_fields(:plaintext, "identifier") - register_journal_formatted_fields(:plaintext, "name") - register_journal_formatted_fields(:diff, "status_explanation") - register_journal_formatted_fields(:diff, "description") - register_journal_formatted_fields(:project_status_code, "status_code") - register_journal_formatted_fields(:visibility, "public") - register_journal_formatted_fields(:subproject_named_association, "parent_id") - register_journal_formatted_fields(:custom_field, /custom_fields_\d+/) + register_journal_formatted_fields "active", formatter_key: :active_status + register_journal_formatted_fields "templated", formatter_key: :template + register_journal_formatted_fields "identifier", "name", formatter_key: :plaintext + register_journal_formatted_fields "status_explanation", "description", formatter_key: :diff + register_journal_formatted_fields "status_code", formatter_key: :project_status_code + register_journal_formatted_fields "public", formatter_key: :visibility + register_journal_formatted_fields "parent_id", formatter_key: :subproject_named_association + register_journal_formatted_fields /custom_fields_\d+/, formatter_key: :custom_field has_paper_trail @@ -155,7 +153,8 @@ class Project < ApplicationRecord friendly_id :identifier, use: :finders - scopes :allowed_to, + scopes :activated_in_storage, + :allowed_to, :available_custom_fields, :visible diff --git a/app/models/project_custom_field.rb b/app/models/project_custom_field.rb index d1aa6fe6077..df4c67428ff 100644 --- a/app/models/project_custom_field.rb +++ b/app/models/project_custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -38,16 +38,36 @@ class ProjectCustomField < CustomField validates :custom_field_section_id, presence: true - def type_name - :label_project_plural + class << self + def visible(user = User.current, project: nil) + if user.admin? + all + elsif user.allowed_in_any_project?(:select_project_custom_fields) || user.allowed_globally?(:add_project) + where(admin_only: false) + else + where(admin_only: false).where(mappings_with_view_project_attributes_permission(user, project).exists) + end + end + + private + + def mappings_with_view_project_attributes_permission(user, project) # rubocop:disable Metrics/AbcSize + allowed_projects = Project.allowed_to(user, :view_project_attributes) + mapping_table = ProjectCustomFieldProjectMapping.arel_table + + mapping_condition = mapping_table[:custom_field_id].eq(arel_table[:id]) + .and(mapping_table[:project_id].in(allowed_projects.select(:id).arel)) + + if project&.persisted? + mapping_condition = mapping_condition.and(mapping_table[:project_id].eq(project.id)) + end + + mapping_table.project(Arel.star).where(mapping_condition) + end end - def self.visible(user = User.current) - if user.admin? - all - else - where(visible: true) - end + def type_name + :label_project_plural end def activate_required_field_in_all_projects diff --git a/app/models/project_custom_field_project_mapping.rb b/app/models/project_custom_field_project_mapping.rb index f2832d96a6d..4836280fb95 100644 --- a/app/models/project_custom_field_project_mapping.rb +++ b/app/models/project_custom_field_project_mapping.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/project_custom_field_section.rb b/app/models/project_custom_field_section.rb index 589de4ed3ba..06e3f113a16 100644 --- a/app/models/project_custom_field_section.rb +++ b/app/models/project_custom_field_section.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/project_queries/scopes/allowed_to.rb b/app/models/project_queries/scopes/allowed_to.rb index 91629e53bc4..48801acabe9 100644 --- a/app/models/project_queries/scopes/allowed_to.rb +++ b/app/models/project_queries/scopes/allowed_to.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/project_query.rb b/app/models/project_query.rb index f7bb92f27f9..de590fab0eb 100644 --- a/app/models/project_query.rb +++ b/app/models/project_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -80,4 +80,11 @@ class ProjectQuery < ApplicationRecord super.where(id: Project.visible) end end + + def advanced_filters + filters.reject do |filter| + # Skip the name filter as we have it present as a permanent filter with a text input. + filter.is_a?(Queries::Projects::Filters::NameAndIdentifierFilter) + end + end end diff --git a/app/models/project_query_role.rb b/app/models/project_query_role.rb index dc29a9905b1..aacb99b36c7 100644 --- a/app/models/project_query_role.rb +++ b/app/models/project_query_role.rb @@ -3,7 +3,7 @@ # #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/project_role.rb b/app/models/project_role.rb index ce7cf3eb985..f8a69e76fff 100644 --- a/app/models/project_role.rb +++ b/app/models/project_role.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/activity.rb b/app/models/projects/activity.rb index e0b5f64c301..c550464e103 100644 --- a/app/models/projects/activity.rb +++ b/app/models/projects/activity.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/ancestors_from_root.rb b/app/models/projects/ancestors_from_root.rb index e75bddb8ac9..061a60f11b6 100644 --- a/app/models/projects/ancestors_from_root.rb +++ b/app/models/projects/ancestors_from_root.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/custom_fields.rb b/app/models/projects/custom_fields.rb index 2bbac410817..5dfaa963a00 100644 --- a/app/models/projects/custom_fields.rb +++ b/app/models/projects/custom_fields.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -32,16 +32,16 @@ module Projects::CustomFields attr_accessor :_limit_custom_fields_validation_to_section_id included do - has_many :project_custom_field_project_mappings, class_name: "ProjectCustomFieldProjectMapping", foreign_key: :project_id, - dependent: :destroy, inverse_of: :project - has_many :project_custom_fields, through: :project_custom_field_project_mappings, class_name: "ProjectCustomField" + has_many :project_custom_field_project_mappings, class_name: "ProjectCustomFieldProjectMapping", + foreign_key: :project_id, dependent: :destroy, + inverse_of: :project + has_many :project_custom_fields, through: :project_custom_field_project_mappings, + class_name: "ProjectCustomField" def available_custom_fields - visible_fields = all_available_custom_fields.visible - return visible_fields if new_record? + return all_visible_custom_fields if new_record? - visible_fields.where(id: project_custom_field_project_mappings.select(:custom_field_id)) - .or(ProjectCustomField.required) + all_visible_custom_fields.where(id: project_custom_field_project_mappings.select(:custom_field_id)) end # Note: @@ -59,6 +59,10 @@ module Projects::CustomFields .order("custom_field_sections.position", :position_in_custom_field_section) end + def all_visible_custom_fields + all_available_custom_fields.visible(project: self) + end + def custom_field_values_to_validate # Limit the set of available custom fields when the validation is limited to a section if _limit_custom_fields_validation_to_section_id diff --git a/app/models/projects/exports/csv.rb b/app/models/projects/exports/csv.rb index 4a841119a16..18e0786f8d9 100644 --- a/app/models/projects/exports/csv.rb +++ b/app/models/projects/exports/csv.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/exports/formatters/active.rb b/app/models/projects/exports/formatters/active.rb index 93a78add354..a54a2e44d3a 100644 --- a/app/models/projects/exports/formatters/active.rb +++ b/app/models/projects/exports/formatters/active.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/exports/formatters/description.rb b/app/models/projects/exports/formatters/description.rb index d07fadb55c9..45e87d214ff 100644 --- a/app/models/projects/exports/formatters/description.rb +++ b/app/models/projects/exports/formatters/description.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/exports/formatters/public.rb b/app/models/projects/exports/formatters/public.rb index deb4deb0301..e475d63a42b 100644 --- a/app/models/projects/exports/formatters/public.rb +++ b/app/models/projects/exports/formatters/public.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/exports/formatters/status.rb b/app/models/projects/exports/formatters/status.rb index b138306b3be..f7e8d170856 100644 --- a/app/models/projects/exports/formatters/status.rb +++ b/app/models/projects/exports/formatters/status.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/exports/query_exporter.rb b/app/models/projects/exports/query_exporter.rb index 35a236a82a9..e4a110afd9b 100644 --- a/app/models/projects/exports/query_exporter.rb +++ b/app/models/projects/exports/query_exporter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -32,7 +32,7 @@ module Projects::Exports alias :query :object def columns - @columns ||= (forced_columns + selected_columns) + @columns ||= selected_columns end def page @@ -51,13 +51,6 @@ module Projects::Exports private - def forced_columns - [ - { name: :id, caption: Project.human_attribute_name(:id) }, - { name: :identifier, caption: Project.human_attribute_name(:identifier) } - ] - end - def selected_columns query .selects diff --git a/app/models/projects/hierarchy.rb b/app/models/projects/hierarchy.rb index aaa262bc0f3..5f7fe739973 100644 --- a/app/models/projects/hierarchy.rb +++ b/app/models/projects/hierarchy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/scopes/activated_in_storage.rb b/app/models/projects/scopes/activated_in_storage.rb new file mode 100644 index 00000000000..80800d7849e --- /dev/null +++ b/app/models/projects/scopes/activated_in_storage.rb @@ -0,0 +1,53 @@ +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +module Projects::Scopes + module ActivatedInStorage + extend ActiveSupport::Concern + + class_methods do + def activated_in_storage(storage_ids) + subquery = project_storages_subquery(storage_ids:) + where(id: subquery) + end + + def not_activated_in_storage(storage_ids) + subquery = project_storages_subquery(storage_ids:) + where.not(id: subquery) + end + + private + + def project_storages_subquery(storage_ids:) + Storages::ProjectStorage + .select(:project_id) + .where(storage_id: storage_ids) + end + end + end +end diff --git a/app/models/projects/scopes/allowed_to.rb b/app/models/projects/scopes/allowed_to.rb index e1596abe33e..80691e4e245 100644 --- a/app/models/projects/scopes/allowed_to.rb +++ b/app/models/projects/scopes/allowed_to.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/scopes/available_custom_fields.rb b/app/models/projects/scopes/available_custom_fields.rb index 7a4834884fc..e8a18cbd97b 100644 --- a/app/models/projects/scopes/available_custom_fields.rb +++ b/app/models/projects/scopes/available_custom_fields.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -32,20 +32,30 @@ module Projects::Scopes class_methods do def with_available_custom_fields(custom_field_ids) - subquery = project_custom_fields_project_mapping_subquery(custom_field_ids:) - where(id: subquery) + where(id: project_custom_fields_join_table_subquery(custom_field_ids:)) + end + + def with_available_project_custom_fields(custom_field_ids) + where(id: project_custom_fields_project_mapping_subquery(custom_field_ids:)) end def without_available_custom_fields(custom_field_ids) - subquery = project_custom_fields_project_mapping_subquery(custom_field_ids:) - where.not(id: subquery) + where.not(id: project_custom_fields_join_table_subquery(custom_field_ids:)) + end + + def without_available_project_custom_fields(custom_field_ids) + where.not(id: project_custom_fields_project_mapping_subquery(custom_field_ids:)) end private def project_custom_fields_project_mapping_subquery(custom_field_ids:) - ProjectCustomFieldProjectMapping.select(:project_id) - .where(custom_field_id: custom_field_ids) + project_custom_fields_join_table_subquery(custom_field_ids:, join_table: ProjectCustomFieldProjectMapping) + end + + def project_custom_fields_join_table_subquery(custom_field_ids:, join_table: CustomFieldsProject) + join_table.select(:project_id) + .where(custom_field_id: custom_field_ids) end end end diff --git a/app/models/projects/scopes/visible.rb b/app/models/projects/scopes/visible.rb index fa2810fdd76..51cfbd27ec3 100644 --- a/app/models/projects/scopes/visible.rb +++ b/app/models/projects/scopes/visible.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/storage.rb b/app/models/projects/storage.rb index 40d70e8c195..de39e35cd53 100644 --- a/app/models/projects/storage.rb +++ b/app/models/projects/storage.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/types.rb b/app/models/projects/types.rb index 0f0f7e429f5..8a5fe58d26c 100644 --- a/app/models/projects/types.rb +++ b/app/models/projects/types.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/versions.rb b/app/models/projects/versions.rb index 31be3b3594b..b271f8d6852 100644 --- a/app/models/projects/versions.rb +++ b/app/models/projects/versions.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/projects/work_package_custom_fields.rb b/app/models/projects/work_package_custom_fields.rb index 9df42bbe268..be08573c2ae 100644 --- a/app/models/projects/work_package_custom_fields.rb +++ b/app/models/projects/work_package_custom_fields.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/actions.rb b/app/models/queries/actions.rb index c3eebe5e751..8d6a951ef73 100644 --- a/app/models/queries/actions.rb +++ b/app/models/queries/actions.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/actions/action_query.rb b/app/models/queries/actions/action_query.rb index d00b821998d..8990574100f 100644 --- a/app/models/queries/actions/action_query.rb +++ b/app/models/queries/actions/action_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/actions/filters/action_filter.rb b/app/models/queries/actions/filters/action_filter.rb index 970b7dfb9c4..d46d2c226b4 100644 --- a/app/models/queries/actions/filters/action_filter.rb +++ b/app/models/queries/actions/filters/action_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/actions/filters/id_filter.rb b/app/models/queries/actions/filters/id_filter.rb index 37f658e8724..93079ff43bf 100644 --- a/app/models/queries/actions/filters/id_filter.rb +++ b/app/models/queries/actions/filters/id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/base_query.rb b/app/models/queries/base_query.rb index 48bb38fc16d..686a29781fc 100644 --- a/app/models/queries/base_query.rb +++ b/app/models/queries/base_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -51,14 +51,13 @@ module Queries::BaseQuery :activerecord end - # Use the Query class' error messages. - # So everything under + # Also use the Query class' as a lookup ancestor so that error messages, etc can be shared. + # So if nothing is defined for the specific query class, we fall back to the generic query class. # + # This is useful for error messages, because we can fall back to error messages, etc in # activerecord.errors.models.query - # - # is found. def lookup_ancestors - [Query] + super + [Query] end end @@ -133,7 +132,7 @@ module Queries::BaseQuery end def find_active_filter(name) - filters.index_by(&:name)[name] + filters.detect { |f| f.name == name } end def find_available_filter(name) diff --git a/app/models/queries/capabilities.rb b/app/models/queries/capabilities.rb index 68f63b79a05..722b55cebac 100644 --- a/app/models/queries/capabilities.rb +++ b/app/models/queries/capabilities.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/capabilities/capability_query.rb b/app/models/queries/capabilities/capability_query.rb index deeefb56151..e6ec2100c8f 100644 --- a/app/models/queries/capabilities/capability_query.rb +++ b/app/models/queries/capabilities/capability_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/capabilities/filters/action_filter.rb b/app/models/queries/capabilities/filters/action_filter.rb index 54d7e5329a5..39c2140c020 100644 --- a/app/models/queries/capabilities/filters/action_filter.rb +++ b/app/models/queries/capabilities/filters/action_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/capabilities/filters/capability_filter.rb b/app/models/queries/capabilities/filters/capability_filter.rb index ee8a200699c..d979619ffdb 100644 --- a/app/models/queries/capabilities/filters/capability_filter.rb +++ b/app/models/queries/capabilities/filters/capability_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/capabilities/filters/context_filter.rb b/app/models/queries/capabilities/filters/context_filter.rb index 8b90562ac48..130e9eae3f6 100644 --- a/app/models/queries/capabilities/filters/context_filter.rb +++ b/app/models/queries/capabilities/filters/context_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/capabilities/filters/id_filter.rb b/app/models/queries/capabilities/filters/id_filter.rb index c6a674f73ba..75334459c9e 100644 --- a/app/models/queries/capabilities/filters/id_filter.rb +++ b/app/models/queries/capabilities/filters/id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/capabilities/filters/principal_id_filter.rb b/app/models/queries/capabilities/filters/principal_id_filter.rb index b6737b0d2bf..439032307f9 100644 --- a/app/models/queries/capabilities/filters/principal_id_filter.rb +++ b/app/models/queries/capabilities/filters/principal_id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/capabilities/orders/id_order.rb b/app/models/queries/capabilities/orders/id_order.rb index 419f346175a..2d855e2cc60 100644 --- a/app/models/queries/capabilities/orders/id_order.rb +++ b/app/models/queries/capabilities/orders/id_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/days.rb b/app/models/queries/days.rb index 8da349e95f6..6dfee67303a 100644 --- a/app/models/queries/days.rb +++ b/app/models/queries/days.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/days/day_query.rb b/app/models/queries/days/day_query.rb index c1a185c9b86..38db47af417 100644 --- a/app/models/queries/days/day_query.rb +++ b/app/models/queries/days/day_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/days/filters/dates_interval_filter.rb b/app/models/queries/days/filters/dates_interval_filter.rb index 303e79128a7..54ea13a022b 100644 --- a/app/models/queries/days/filters/dates_interval_filter.rb +++ b/app/models/queries/days/filters/dates_interval_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/days/filters/day_filter.rb b/app/models/queries/days/filters/day_filter.rb index ed5593487f1..267f3d5cd60 100644 --- a/app/models/queries/days/filters/day_filter.rb +++ b/app/models/queries/days/filters/day_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/days/filters/working_filter.rb b/app/models/queries/days/filters/working_filter.rb index 22d69f3a219..919f6e7b430 100644 --- a/app/models/queries/days/filters/working_filter.rb +++ b/app/models/queries/days/filters/working_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters.rb b/app/models/queries/filters.rb index 4f5fbf38d98..293f2469f20 100644 --- a/app/models/queries/filters.rb +++ b/app/models/queries/filters.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/available_filters.rb b/app/models/queries/filters/available_filters.rb index 4e6fe76d8f8..82743637922 100644 --- a/app/models/queries/filters/available_filters.rb +++ b/app/models/queries/filters/available_filters.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -55,6 +55,13 @@ module Queries initialized_filters.select(&:available?) end + def available_advanced_filters + available_filters.reject do |filter| + # Skip the name filter as we have it present as a permanent filter with a text input. + filter.is_a?(::Queries::Projects::Filters::NameAndIdentifierFilter) + end + end + def filter_for(key, no_memoization: false) filter = get_initialized_filter(key, no_memoization) diff --git a/app/models/queries/filters/base.rb b/app/models/queries/filters/base.rb index 633837aef96..25741918337 100644 --- a/app/models/queries/filters/base.rb +++ b/app/models/queries/filters/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/empty_filter.rb b/app/models/queries/filters/empty_filter.rb index b6c509972aa..8a7adaef918 100644 --- a/app/models/queries/filters/empty_filter.rb +++ b/app/models/queries/filters/empty_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/me_value.rb b/app/models/queries/filters/me_value.rb index bc6492ab824..bc31a371b11 100644 --- a/app/models/queries/filters/me_value.rb +++ b/app/models/queries/filters/me_value.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/not_existing_filter.rb b/app/models/queries/filters/not_existing_filter.rb index 43ea54e45f7..8bacd5b3581 100644 --- a/app/models/queries/filters/not_existing_filter.rb +++ b/app/models/queries/filters/not_existing_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/serializable.rb b/app/models/queries/filters/serializable.rb index df1e8535441..77e8acffbd8 100644 --- a/app/models/queries/filters/serializable.rb +++ b/app/models/queries/filters/serializable.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/any_user_name_attribute_filter.rb b/app/models/queries/filters/shared/any_user_name_attribute_filter.rb index 02fc3ba6ec8..498466a67f9 100644 --- a/app/models/queries/filters/shared/any_user_name_attribute_filter.rb +++ b/app/models/queries/filters/shared/any_user_name_attribute_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/boolean_filter.rb b/app/models/queries/filters/shared/boolean_filter.rb index 6ba3c3e4243..e2788fd1688 100644 --- a/app/models/queries/filters/shared/boolean_filter.rb +++ b/app/models/queries/filters/shared/boolean_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/custom_field_filter.rb b/app/models/queries/filters/shared/custom_field_filter.rb index 92f65774728..1e3cea7c7d5 100644 --- a/app/models/queries/filters/shared/custom_field_filter.rb +++ b/app/models/queries/filters/shared/custom_field_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/custom_fields/base.rb b/app/models/queries/filters/shared/custom_fields/base.rb index 86030ed6b3b..1a6bc559cf7 100644 --- a/app/models/queries/filters/shared/custom_fields/base.rb +++ b/app/models/queries/filters/shared/custom_fields/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -116,7 +116,10 @@ module Queries::Filters::Shared protected def condition - operator_strategy.sql_for_field(values_replaced, CustomValue.table_name, "value") + [ + custom_field_context.where_subselect_conditions, + operator_strategy.sql_for_field(values_replaced, CustomValue.table_name, "value") + ].compact.join(" AND ") end def type_strategy_class diff --git a/app/models/queries/filters/shared/custom_fields/bool.rb b/app/models/queries/filters/shared/custom_fields/bool.rb index 78ee68e955f..f8ecd690cd1 100644 --- a/app/models/queries/filters/shared/custom_fields/bool.rb +++ b/app/models/queries/filters/shared/custom_fields/bool.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/custom_fields/list_optional.rb b/app/models/queries/filters/shared/custom_fields/list_optional.rb index da8e2b8be56..9cd7176678b 100644 --- a/app/models/queries/filters/shared/custom_fields/list_optional.rb +++ b/app/models/queries/filters/shared/custom_fields/list_optional.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/custom_fields/user.rb b/app/models/queries/filters/shared/custom_fields/user.rb index a928b051ea4..af6b480ce0c 100644 --- a/app/models/queries/filters/shared/custom_fields/user.rb +++ b/app/models/queries/filters/shared/custom_fields/user.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/group_filter.rb b/app/models/queries/filters/shared/group_filter.rb index 5356e842ddb..f7c3401c58e 100644 --- a/app/models/queries/filters/shared/group_filter.rb +++ b/app/models/queries/filters/shared/group_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/me_value_filter.rb b/app/models/queries/filters/shared/me_value_filter.rb index 4ed3200ce18..8f64be62967 100644 --- a/app/models/queries/filters/shared/me_value_filter.rb +++ b/app/models/queries/filters/shared/me_value_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/parsed_filter.rb b/app/models/queries/filters/shared/parsed_filter.rb index afa913405dd..f2de8c896b7 100644 --- a/app/models/queries/filters/shared/parsed_filter.rb +++ b/app/models/queries/filters/shared/parsed_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/project_filter.rb b/app/models/queries/filters/shared/project_filter/optional.rb similarity index 95% rename from app/models/queries/filters/shared/project_filter.rb rename to app/models/queries/filters/shared/project_filter/optional.rb index 88aaf7fe07d..dcc59d20952 100644 --- a/app/models/queries/filters/shared/project_filter.rb +++ b/app/models/queries/filters/shared/project_filter/optional.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Queries::Filters::Shared::ProjectFilter +module Queries::Filters::Shared::ProjectFilter::Optional def self.included(base) base.include(InstanceMethods) base.extend(ClassMethods) diff --git a/app/models/queries/filters/shared/project_filter/required.rb b/app/models/queries/filters/shared/project_filter/required.rb new file mode 100644 index 00000000000..12682a6a507 --- /dev/null +++ b/app/models/queries/filters/shared/project_filter/required.rb @@ -0,0 +1,59 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module Queries::Filters::Shared::ProjectFilter::Required + def self.included(base) + base.include(InstanceMethods) + base.extend(ClassMethods) + end + + module InstanceMethods + def allowed_values + # We don't care for the first value as we do not display the values visibly + @allowed_values ||= ::Project.visible.pluck(:id).map { |id| [id, id.to_s] } + end + + def type + :list + end + + def type_strategy + # Instead of getting the IDs of all the projects a user is allowed + # to see we only check that the value is an integer. Non valid ids + # will then simply create an empty result but will not cause any + # harm. + @type_strategy ||= ::Queries::Filters::Strategies::IntegerList.new(self) + end + end + + module ClassMethods + def key + :project_id + end + end +end diff --git a/app/models/queries/filters/shared/user_blocked_filter.rb b/app/models/queries/filters/shared/user_blocked_filter.rb index e073adcd96d..98597375ff1 100644 --- a/app/models/queries/filters/shared/user_blocked_filter.rb +++ b/app/models/queries/filters/shared/user_blocked_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/user_name_filter.rb b/app/models/queries/filters/shared/user_name_filter.rb index 74a3f976512..2de87015a13 100644 --- a/app/models/queries/filters/shared/user_name_filter.rb +++ b/app/models/queries/filters/shared/user_name_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/shared/user_status_filter.rb b/app/models/queries/filters/shared/user_status_filter.rb index 1ef5664c738..84b5427f267 100644 --- a/app/models/queries/filters/shared/user_status_filter.rb +++ b/app/models/queries/filters/shared/user_status_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies.rb b/app/models/queries/filters/strategies.rb index 35b58fda706..0e3df80bf35 100644 --- a/app/models/queries/filters/strategies.rb +++ b/app/models/queries/filters/strategies.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/base_strategy.rb b/app/models/queries/filters/strategies/base_strategy.rb index 5782ebe1fa8..a877dd5247d 100644 --- a/app/models/queries/filters/strategies/base_strategy.rb +++ b/app/models/queries/filters/strategies/base_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/boolean_list.rb b/app/models/queries/filters/strategies/boolean_list.rb index f9fba17b42a..13310741593 100644 --- a/app/models/queries/filters/strategies/boolean_list.rb +++ b/app/models/queries/filters/strategies/boolean_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/boolean_list_strict.rb b/app/models/queries/filters/strategies/boolean_list_strict.rb index f3d093c63a9..cdbd2da4beb 100644 --- a/app/models/queries/filters/strategies/boolean_list_strict.rb +++ b/app/models/queries/filters/strategies/boolean_list_strict.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/cf_float.rb b/app/models/queries/filters/strategies/cf_float.rb index c29a3d13e5e..a35be01a72b 100644 --- a/app/models/queries/filters/strategies/cf_float.rb +++ b/app/models/queries/filters/strategies/cf_float.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/cf_integer.rb b/app/models/queries/filters/strategies/cf_integer.rb index dae02f668f2..8bd94b3e5e0 100644 --- a/app/models/queries/filters/strategies/cf_integer.rb +++ b/app/models/queries/filters/strategies/cf_integer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/cf_list_optional.rb b/app/models/queries/filters/strategies/cf_list_optional.rb index f6c5e4e1ca3..4df6beee392 100644 --- a/app/models/queries/filters/strategies/cf_list_optional.rb +++ b/app/models/queries/filters/strategies/cf_list_optional.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/cf_numeric.rb b/app/models/queries/filters/strategies/cf_numeric.rb index 818dfab9b6e..dd23c119a00 100644 --- a/app/models/queries/filters/strategies/cf_numeric.rb +++ b/app/models/queries/filters/strategies/cf_numeric.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/date.rb b/app/models/queries/filters/strategies/date.rb index 422b26946e8..afa7b660a86 100644 --- a/app/models/queries/filters/strategies/date.rb +++ b/app/models/queries/filters/strategies/date.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/date_interval.rb b/app/models/queries/filters/strategies/date_interval.rb index 307e9d1b786..1087a9dafa2 100644 --- a/app/models/queries/filters/strategies/date_interval.rb +++ b/app/models/queries/filters/strategies/date_interval.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/date_time_past.rb b/app/models/queries/filters/strategies/date_time_past.rb index f7e666874ba..b06f0455183 100644 --- a/app/models/queries/filters/strategies/date_time_past.rb +++ b/app/models/queries/filters/strategies/date_time_past.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/empty_value.rb b/app/models/queries/filters/strategies/empty_value.rb index 86f808a222e..544d2f39b31 100644 --- a/app/models/queries/filters/strategies/empty_value.rb +++ b/app/models/queries/filters/strategies/empty_value.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/float.rb b/app/models/queries/filters/strategies/float.rb index 443cc9c203e..ce4cefcf3cb 100644 --- a/app/models/queries/filters/strategies/float.rb +++ b/app/models/queries/filters/strategies/float.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/float_numeric.rb b/app/models/queries/filters/strategies/float_numeric.rb index 3f638d9cd19..2058a58b254 100644 --- a/app/models/queries/filters/strategies/float_numeric.rb +++ b/app/models/queries/filters/strategies/float_numeric.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/huge_list.rb b/app/models/queries/filters/strategies/huge_list.rb index 64407468a96..83ab9ac173b 100644 --- a/app/models/queries/filters/strategies/huge_list.rb +++ b/app/models/queries/filters/strategies/huge_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/inexistent.rb b/app/models/queries/filters/strategies/inexistent.rb index 4e509cad719..e3f9f9a55db 100644 --- a/app/models/queries/filters/strategies/inexistent.rb +++ b/app/models/queries/filters/strategies/inexistent.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/integer.rb b/app/models/queries/filters/strategies/integer.rb index 629ad3441df..663b3303663 100644 --- a/app/models/queries/filters/strategies/integer.rb +++ b/app/models/queries/filters/strategies/integer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/integer_list.rb b/app/models/queries/filters/strategies/integer_list.rb index f00103456a6..21a52d42ea4 100644 --- a/app/models/queries/filters/strategies/integer_list.rb +++ b/app/models/queries/filters/strategies/integer_list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/integer_list_optional.rb b/app/models/queries/filters/strategies/integer_list_optional.rb index 708d03b2598..df55d434c6c 100644 --- a/app/models/queries/filters/strategies/integer_list_optional.rb +++ b/app/models/queries/filters/strategies/integer_list_optional.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/integer_numeric.rb b/app/models/queries/filters/strategies/integer_numeric.rb index f66d926b70d..224e47ca1ba 100644 --- a/app/models/queries/filters/strategies/integer_numeric.rb +++ b/app/models/queries/filters/strategies/integer_numeric.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/list.rb b/app/models/queries/filters/strategies/list.rb index e02720cdc17..6476b0984fe 100644 --- a/app/models/queries/filters/strategies/list.rb +++ b/app/models/queries/filters/strategies/list.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/list_all.rb b/app/models/queries/filters/strategies/list_all.rb index 61da8689e67..7b9c13a0173 100644 --- a/app/models/queries/filters/strategies/list_all.rb +++ b/app/models/queries/filters/strategies/list_all.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/list_optional.rb b/app/models/queries/filters/strategies/list_optional.rb index 3e4f59d3c08..ff13c17f5c2 100644 --- a/app/models/queries/filters/strategies/list_optional.rb +++ b/app/models/queries/filters/strategies/list_optional.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/numeric.rb b/app/models/queries/filters/strategies/numeric.rb index bf4814397f1..802c5f58232 100644 --- a/app/models/queries/filters/strategies/numeric.rb +++ b/app/models/queries/filters/strategies/numeric.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/relation.rb b/app/models/queries/filters/strategies/relation.rb index a17ea247cc8..236390d3294 100644 --- a/app/models/queries/filters/strategies/relation.rb +++ b/app/models/queries/filters/strategies/relation.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/search.rb b/app/models/queries/filters/strategies/search.rb index 7fb9a07970c..a541a048ca2 100644 --- a/app/models/queries/filters/strategies/search.rb +++ b/app/models/queries/filters/strategies/search.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/string.rb b/app/models/queries/filters/strategies/string.rb index f5e063ec58d..7998342d797 100644 --- a/app/models/queries/filters/strategies/string.rb +++ b/app/models/queries/filters/strategies/string.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/text.rb b/app/models/queries/filters/strategies/text.rb index 057ab43c2d4..27fec37d84d 100644 --- a/app/models/queries/filters/strategies/text.rb +++ b/app/models/queries/filters/strategies/text.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/validations.rb b/app/models/queries/filters/strategies/validations.rb index 8c9623270fb..bd17a263a05 100644 --- a/app/models/queries/filters/strategies/validations.rb +++ b/app/models/queries/filters/strategies/validations.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/strategies/work_packages/shared_with_user/list_optional.rb b/app/models/queries/filters/strategies/work_packages/shared_with_user/list_optional.rb index 1bae91005a1..93e69b4c28c 100644 --- a/app/models/queries/filters/strategies/work_packages/shared_with_user/list_optional.rb +++ b/app/models/queries/filters/strategies/work_packages/shared_with_user/list_optional.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/filters/templated_value.rb b/app/models/queries/filters/templated_value.rb index fc17c3b62c7..648ad803c51 100644 --- a/app/models/queries/filters/templated_value.rb +++ b/app/models/queries/filters/templated_value.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/group_bys/available_group_bys.rb b/app/models/queries/group_bys/available_group_bys.rb index e933e61bd85..93620f5a187 100644 --- a/app/models/queries/group_bys/available_group_bys.rb +++ b/app/models/queries/group_bys/available_group_bys.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/group_bys/base.rb b/app/models/queries/group_bys/base.rb index b4038a4d07b..5d4a3c3a8e5 100644 --- a/app/models/queries/group_bys/base.rb +++ b/app/models/queries/group_bys/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/group_bys/not_existing_group_by.rb b/app/models/queries/group_bys/not_existing_group_by.rb index cf2dffebfc6..3e9cd550333 100644 --- a/app/models/queries/group_bys/not_existing_group_by.rb +++ b/app/models/queries/group_bys/not_existing_group_by.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/groups.rb b/app/models/queries/groups.rb index 85d7c789bf4..1e7069e8038 100644 --- a/app/models/queries/groups.rb +++ b/app/models/queries/groups.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/groups/group_query.rb b/app/models/queries/groups/group_query.rb index e691edfe491..e94cf7e2c1b 100644 --- a/app/models/queries/groups/group_query.rb +++ b/app/models/queries/groups/group_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/groups/orders/default_order.rb b/app/models/queries/groups/orders/default_order.rb index 6829895453d..2a186355105 100644 --- a/app/models/queries/groups/orders/default_order.rb +++ b/app/models/queries/groups/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/individual_principals/orders/group_order.rb b/app/models/queries/individual_principals/orders/group_order.rb index a6ab10f0c97..2b937c816a0 100644 --- a/app/models/queries/individual_principals/orders/group_order.rb +++ b/app/models/queries/individual_principals/orders/group_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/individual_principals/orders/name_order.rb b/app/models/queries/individual_principals/orders/name_order.rb index 658d5ca59f0..d175e5c8348 100644 --- a/app/models/queries/individual_principals/orders/name_order.rb +++ b/app/models/queries/individual_principals/orders/name_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members.rb b/app/models/queries/members.rb index e1b56bfe2c6..cf00d8fd04f 100644 --- a/app/models/queries/members.rb +++ b/app/models/queries/members.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/also_project_member_filter.rb b/app/models/queries/members/filters/also_project_member_filter.rb index 74b411f80a2..8f09811be27 100644 --- a/app/models/queries/members/filters/also_project_member_filter.rb +++ b/app/models/queries/members/filters/also_project_member_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/any_name_attribute_filter.rb b/app/models/queries/members/filters/any_name_attribute_filter.rb index 42470591116..ff278d33a80 100644 --- a/app/models/queries/members/filters/any_name_attribute_filter.rb +++ b/app/models/queries/members/filters/any_name_attribute_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/blocked_filter.rb b/app/models/queries/members/filters/blocked_filter.rb index f393a83ca90..ea71a3f97ad 100644 --- a/app/models/queries/members/filters/blocked_filter.rb +++ b/app/models/queries/members/filters/blocked_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/created_at_filter.rb b/app/models/queries/members/filters/created_at_filter.rb index 17979bac4db..44a71bcc7ee 100644 --- a/app/models/queries/members/filters/created_at_filter.rb +++ b/app/models/queries/members/filters/created_at_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/entity_id_filter.rb b/app/models/queries/members/filters/entity_id_filter.rb index b5c39bc9e46..e5c60271c09 100644 --- a/app/models/queries/members/filters/entity_id_filter.rb +++ b/app/models/queries/members/filters/entity_id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/entity_type_filter.rb b/app/models/queries/members/filters/entity_type_filter.rb index 60f3be86a86..3c539db0c72 100644 --- a/app/models/queries/members/filters/entity_type_filter.rb +++ b/app/models/queries/members/filters/entity_type_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/group_filter.rb b/app/models/queries/members/filters/group_filter.rb index f9377152c73..a62f825bde8 100644 --- a/app/models/queries/members/filters/group_filter.rb +++ b/app/models/queries/members/filters/group_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/member_filter.rb b/app/models/queries/members/filters/member_filter.rb index a977b19837f..f4edabb61c0 100644 --- a/app/models/queries/members/filters/member_filter.rb +++ b/app/models/queries/members/filters/member_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/name_filter.rb b/app/models/queries/members/filters/name_filter.rb index b07c7b3fbff..300a954d62a 100644 --- a/app/models/queries/members/filters/name_filter.rb +++ b/app/models/queries/members/filters/name_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/only_project_member_filter.rb b/app/models/queries/members/filters/only_project_member_filter.rb index 5064881d677..a7842f66c62 100644 --- a/app/models/queries/members/filters/only_project_member_filter.rb +++ b/app/models/queries/members/filters/only_project_member_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/principal_filter.rb b/app/models/queries/members/filters/principal_filter.rb index ac5c8bc912c..e5ab2edcd0d 100644 --- a/app/models/queries/members/filters/principal_filter.rb +++ b/app/models/queries/members/filters/principal_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/principal_type_filter.rb b/app/models/queries/members/filters/principal_type_filter.rb index 68a72c4e614..cf7e62ab51d 100644 --- a/app/models/queries/members/filters/principal_type_filter.rb +++ b/app/models/queries/members/filters/principal_type_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/project_filter.rb b/app/models/queries/members/filters/project_filter.rb index c1be8bef96b..80f867b75a9 100644 --- a/app/models/queries/members/filters/project_filter.rb +++ b/app/models/queries/members/filters/project_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,5 +27,5 @@ #++ class Queries::Members::Filters::ProjectFilter < Queries::Members::Filters::MemberFilter - include Queries::Filters::Shared::ProjectFilter + include Queries::Filters::Shared::ProjectFilter::Optional end diff --git a/app/models/queries/members/filters/role_filter.rb b/app/models/queries/members/filters/role_filter.rb index f25ea244296..0629760e8d0 100644 --- a/app/models/queries/members/filters/role_filter.rb +++ b/app/models/queries/members/filters/role_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/status_filter.rb b/app/models/queries/members/filters/status_filter.rb index 7a7b2dec0e5..4245996fb9e 100644 --- a/app/models/queries/members/filters/status_filter.rb +++ b/app/models/queries/members/filters/status_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/filters/updated_at_filter.rb b/app/models/queries/members/filters/updated_at_filter.rb index 9e952b95982..639d4ccb501 100644 --- a/app/models/queries/members/filters/updated_at_filter.rb +++ b/app/models/queries/members/filters/updated_at_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/member_query.rb b/app/models/queries/members/member_query.rb index 2dd2b1e6ff8..94fb72a8192 100644 --- a/app/models/queries/members/member_query.rb +++ b/app/models/queries/members/member_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/non_inherited_member_query.rb b/app/models/queries/members/non_inherited_member_query.rb index 87349f0d1f8..b67461815ff 100644 --- a/app/models/queries/members/non_inherited_member_query.rb +++ b/app/models/queries/members/non_inherited_member_query.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/orders/default_order.rb b/app/models/queries/members/orders/default_order.rb index 7694ba9a411..163a2cb1d52 100644 --- a/app/models/queries/members/orders/default_order.rb +++ b/app/models/queries/members/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/orders/email_order.rb b/app/models/queries/members/orders/email_order.rb index 506b8fab12c..6a94c8c32bc 100644 --- a/app/models/queries/members/orders/email_order.rb +++ b/app/models/queries/members/orders/email_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/orders/name_order.rb b/app/models/queries/members/orders/name_order.rb index 21c71844dd3..e292a420a56 100644 --- a/app/models/queries/members/orders/name_order.rb +++ b/app/models/queries/members/orders/name_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/members/orders/status_order.rb b/app/models/queries/members/orders/status_order.rb index 94cc431f8f3..739baac86fa 100644 --- a/app/models/queries/members/orders/status_order.rb +++ b/app/models/queries/members/orders/status_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/news.rb b/app/models/queries/news.rb index c726cb0a051..a349d1030e3 100644 --- a/app/models/queries/news.rb +++ b/app/models/queries/news.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/news/filters/news_filter.rb b/app/models/queries/news/filters/news_filter.rb index 30c41d13364..0e243021067 100644 --- a/app/models/queries/news/filters/news_filter.rb +++ b/app/models/queries/news/filters/news_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/news/filters/project_filter.rb b/app/models/queries/news/filters/project_filter.rb index 50ae63c0855..3ab6091cc08 100644 --- a/app/models/queries/news/filters/project_filter.rb +++ b/app/models/queries/news/filters/project_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,5 +27,5 @@ #++ class Queries::News::Filters::ProjectFilter < Queries::News::Filters::NewsFilter - include Queries::Filters::Shared::ProjectFilter + include Queries::Filters::Shared::ProjectFilter::Optional end diff --git a/app/models/queries/news/news_query.rb b/app/models/queries/news/news_query.rb index b9e84cb5bd4..feb4ae749d4 100644 --- a/app/models/queries/news/news_query.rb +++ b/app/models/queries/news/news_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/news/orders/default_order.rb b/app/models/queries/news/orders/default_order.rb index f6dd79beb65..beb0ffe9840 100644 --- a/app/models/queries/news/orders/default_order.rb +++ b/app/models/queries/news/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/non_working_days.rb b/app/models/queries/non_working_days.rb index ab218f4ee17..a26bfdb397f 100644 --- a/app/models/queries/non_working_days.rb +++ b/app/models/queries/non_working_days.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/non_working_days/filters/dates_interval_filter.rb b/app/models/queries/non_working_days/filters/dates_interval_filter.rb index dff733da37a..a473914cce1 100644 --- a/app/models/queries/non_working_days/filters/dates_interval_filter.rb +++ b/app/models/queries/non_working_days/filters/dates_interval_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/non_working_days/filters/non_working_day_filter.rb b/app/models/queries/non_working_days/filters/non_working_day_filter.rb index 3e6df852872..e230031a411 100644 --- a/app/models/queries/non_working_days/filters/non_working_day_filter.rb +++ b/app/models/queries/non_working_days/filters/non_working_day_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/non_working_days/non_working_day_query.rb b/app/models/queries/non_working_days/non_working_day_query.rb index ba9378e856b..d1b9eb9fe76 100644 --- a/app/models/queries/non_working_days/non_working_day_query.rb +++ b/app/models/queries/non_working_days/non_working_day_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications.rb b/app/models/queries/notifications.rb index 5a94bff3b57..538d3987194 100644 --- a/app/models/queries/notifications.rb +++ b/app/models/queries/notifications.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/models/queries/notifications/filters/id_filter.rb b/app/models/queries/notifications/filters/id_filter.rb index b5b9934c92a..d85b9fac38b 100644 --- a/app/models/queries/notifications/filters/id_filter.rb +++ b/app/models/queries/notifications/filters/id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/filters/notification_filter.rb b/app/models/queries/notifications/filters/notification_filter.rb index 1240eb00fe6..bd0d6d04a95 100644 --- a/app/models/queries/notifications/filters/notification_filter.rb +++ b/app/models/queries/notifications/filters/notification_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/filters/project_filter.rb b/app/models/queries/notifications/filters/project_filter.rb index 276f118317d..c1f1a844aac 100644 --- a/app/models/queries/notifications/filters/project_filter.rb +++ b/app/models/queries/notifications/filters/project_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,5 +27,16 @@ #++ class Queries::Notifications::Filters::ProjectFilter < Queries::Notifications::Filters::NotificationFilter - include Queries::Filters::Shared::ProjectFilter + include Queries::Filters::Shared::ProjectFilter::Optional + + # This is currently work package specific same as all the other parts of the NotificationQuery + self.model = WorkPackage + + def joins + <<~SQL.squish + JOIN #{WorkPackage.table_name} + ON #{WorkPackage.table_name}.id = #{Notification.table_name}.resource_id + AND #{Notification.table_name}.resource_type = 'WorkPackage' + SQL + end end diff --git a/app/models/queries/notifications/filters/read_ian_filter.rb b/app/models/queries/notifications/filters/read_ian_filter.rb index 5241eed59ee..35b1ed49608 100644 --- a/app/models/queries/notifications/filters/read_ian_filter.rb +++ b/app/models/queries/notifications/filters/read_ian_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/filters/reason_filter.rb b/app/models/queries/notifications/filters/reason_filter.rb index 3bfb23c3d16..fe76399187c 100644 --- a/app/models/queries/notifications/filters/reason_filter.rb +++ b/app/models/queries/notifications/filters/reason_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/filters/resource_id_filter.rb b/app/models/queries/notifications/filters/resource_id_filter.rb index 41d28ed554d..10ef33adab4 100644 --- a/app/models/queries/notifications/filters/resource_id_filter.rb +++ b/app/models/queries/notifications/filters/resource_id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/filters/resource_type_filter.rb b/app/models/queries/notifications/filters/resource_type_filter.rb index 03fe4017b86..4974982cb35 100644 --- a/app/models/queries/notifications/filters/resource_type_filter.rb +++ b/app/models/queries/notifications/filters/resource_type_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/group_bys/group_by_project.rb b/app/models/queries/notifications/group_bys/group_by_project.rb index 7e353634825..e2b58346358 100644 --- a/app/models/queries/notifications/group_bys/group_by_project.rb +++ b/app/models/queries/notifications/group_bys/group_by_project.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -33,6 +33,16 @@ class Queries::Notifications::GroupBys::GroupByProject < Queries::GroupBys::Base :project end + def joins + # Only Notifications for work_packages are currently supported via the query. + # E.g. the visible statement used in the query is WorkPackage specific. + <<~SQL.squish + JOIN work_packages + ON notifications.resource_id = work_packages.id + AND notifications.resource_type = 'WorkPackage' + SQL + end + def name :project_id end diff --git a/app/models/queries/notifications/group_bys/group_by_reason.rb b/app/models/queries/notifications/group_bys/group_by_reason.rb index be48f9f11bd..2c51e01fb3d 100644 --- a/app/models/queries/notifications/group_bys/group_by_reason.rb +++ b/app/models/queries/notifications/group_bys/group_by_reason.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/notification_query.rb b/app/models/queries/notifications/notification_query.rb index 2fd7587a4b9..2bb91ec02b6 100644 --- a/app/models/queries/notifications/notification_query.rb +++ b/app/models/queries/notifications/notification_query.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/models/queries/notifications/orders/default_order.rb b/app/models/queries/notifications/orders/default_order.rb index 73babdbcc28..c4ed27a8411 100644 --- a/app/models/queries/notifications/orders/default_order.rb +++ b/app/models/queries/notifications/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/orders/project_order.rb b/app/models/queries/notifications/orders/project_order.rb index 00501fb174e..31cc82702d5 100644 --- a/app/models/queries/notifications/orders/project_order.rb +++ b/app/models/queries/notifications/orders/project_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -34,15 +34,23 @@ class Queries::Notifications::Orders::ProjectOrder < Queries::Orders::Base end def joins - :project + <<~SQL.squish + JOIN #{WorkPackage.table_name} work_packages_order + ON work_packages_order.id = #{Notification.table_name}.resource_id + AND #{Notification.table_name}.resource_type = 'WorkPackage' + JOIN #{Project.table_name} + ON #{Project.table_name}.id = work_packages_order.project_id + SQL end protected def order(scope) - order_string = "projects.name" - order_string += " DESC" if direction == :desc + with_raise_on_invalid do + order_string = "#{Project.table_name}.name" + order_string += " DESC" if direction == :desc - scope.order(order_string) + scope.order(order_string) + end end end diff --git a/app/models/queries/notifications/orders/read_ian_order.rb b/app/models/queries/notifications/orders/read_ian_order.rb index a498a695a00..6968b70a39d 100644 --- a/app/models/queries/notifications/orders/read_ian_order.rb +++ b/app/models/queries/notifications/orders/read_ian_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/notifications/orders/reason_order.rb b/app/models/queries/notifications/orders/reason_order.rb index 8f84a2ab7c6..ddfe50fa6f3 100644 --- a/app/models/queries/notifications/orders/reason_order.rb +++ b/app/models/queries/notifications/orders/reason_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators.rb b/app/models/queries/operators.rb index 6a125c2fcc5..7581f53237b 100644 --- a/app/models/queries/operators.rb +++ b/app/models/queries/operators.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/ago.rb b/app/models/queries/operators/ago.rb index 5101a2a4cef..0ad737920c5 100644 --- a/app/models/queries/operators/ago.rb +++ b/app/models/queries/operators/ago.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/all.rb b/app/models/queries/operators/all.rb index 2f56ac12f10..60b288d236e 100644 --- a/app/models/queries/operators/all.rb +++ b/app/models/queries/operators/all.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/all_and_non_blank.rb b/app/models/queries/operators/all_and_non_blank.rb index 157e17739ab..46b2183427c 100644 --- a/app/models/queries/operators/all_and_non_blank.rb +++ b/app/models/queries/operators/all_and_non_blank.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/base.rb b/app/models/queries/operators/base.rb index eb638992ab2..59a7487a5d4 100644 --- a/app/models/queries/operators/base.rb +++ b/app/models/queries/operators/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/between_date.rb b/app/models/queries/operators/between_date.rb index 9e9256db3da..0f935166885 100644 --- a/app/models/queries/operators/between_date.rb +++ b/app/models/queries/operators/between_date.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/between_date_time.rb b/app/models/queries/operators/between_date_time.rb index 8fe2a297124..62ff8b47401 100644 --- a/app/models/queries/operators/between_date_time.rb +++ b/app/models/queries/operators/between_date_time.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/blocked.rb b/app/models/queries/operators/blocked.rb index e3f0f3f1194..70bc1232476 100644 --- a/app/models/queries/operators/blocked.rb +++ b/app/models/queries/operators/blocked.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/blocks.rb b/app/models/queries/operators/blocks.rb index 9939cba1b61..0312f3e7f47 100644 --- a/app/models/queries/operators/blocks.rb +++ b/app/models/queries/operators/blocks.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/boolean_equals.rb b/app/models/queries/operators/boolean_equals.rb index 0f609a0069e..bb04b31eb26 100644 --- a/app/models/queries/operators/boolean_equals.rb +++ b/app/models/queries/operators/boolean_equals.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/boolean_equals_strict.rb b/app/models/queries/operators/boolean_equals_strict.rb index c8c88b5ba45..75d64407c5b 100644 --- a/app/models/queries/operators/boolean_equals_strict.rb +++ b/app/models/queries/operators/boolean_equals_strict.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/boolean_not_equals.rb b/app/models/queries/operators/boolean_not_equals.rb index 780118c6969..11f693d80f0 100644 --- a/app/models/queries/operators/boolean_not_equals.rb +++ b/app/models/queries/operators/boolean_not_equals.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/casted_greater_or_equal.rb b/app/models/queries/operators/casted_greater_or_equal.rb index f3998780db4..a365f5cc62c 100644 --- a/app/models/queries/operators/casted_greater_or_equal.rb +++ b/app/models/queries/operators/casted_greater_or_equal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/casted_less_or_equal.rb b/app/models/queries/operators/casted_less_or_equal.rb index bc23fd9a145..75c83abd818 100644 --- a/app/models/queries/operators/casted_less_or_equal.rb +++ b/app/models/queries/operators/casted_less_or_equal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/child.rb b/app/models/queries/operators/child.rb index 522edb7164b..8bb8bd20517 100644 --- a/app/models/queries/operators/child.rb +++ b/app/models/queries/operators/child.rb @@ -1,6 +1,6 @@ # --copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/children.rb b/app/models/queries/operators/children.rb index 5df6761409a..a87dc584535 100644 --- a/app/models/queries/operators/children.rb +++ b/app/models/queries/operators/children.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/closed_work_packages.rb b/app/models/queries/operators/closed_work_packages.rb index 7f2a05c2dbf..050941d713b 100644 --- a/app/models/queries/operators/closed_work_packages.rb +++ b/app/models/queries/operators/closed_work_packages.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/concerns/contains_all_values.rb b/app/models/queries/operators/concerns/contains_all_values.rb index d766baa7443..42913b8f488 100644 --- a/app/models/queries/operators/concerns/contains_all_values.rb +++ b/app/models/queries/operators/concerns/contains_all_values.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/contains.rb b/app/models/queries/operators/contains.rb index a27a8ca65a0..907df3ad4be 100644 --- a/app/models/queries/operators/contains.rb +++ b/app/models/queries/operators/contains.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/custom_fields/equals_all.rb b/app/models/queries/operators/custom_fields/equals_all.rb index 507dc0585dc..ccaeb0b0b8a 100644 --- a/app/models/queries/operators/custom_fields/equals_all.rb +++ b/app/models/queries/operators/custom_fields/equals_all.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/custom_fields/not_equals_all.rb b/app/models/queries/operators/custom_fields/not_equals_all.rb index 159fda5c753..a3cbf8d8742 100644 --- a/app/models/queries/operators/custom_fields/not_equals_all.rb +++ b/app/models/queries/operators/custom_fields/not_equals_all.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/date_range_clauses.rb b/app/models/queries/operators/date_range_clauses.rb index 158c3a18552..3b41a14105f 100644 --- a/app/models/queries/operators/date_range_clauses.rb +++ b/app/models/queries/operators/date_range_clauses.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/datetime_range_clauses.rb b/app/models/queries/operators/datetime_range_clauses.rb index f3326c0f8f5..c40c33cc48e 100644 --- a/app/models/queries/operators/datetime_range_clauses.rb +++ b/app/models/queries/operators/datetime_range_clauses.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/duplicated.rb b/app/models/queries/operators/duplicated.rb index 7fd0d6058a5..c7e04a47e0e 100644 --- a/app/models/queries/operators/duplicated.rb +++ b/app/models/queries/operators/duplicated.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/duplicates.rb b/app/models/queries/operators/duplicates.rb index 45025a1b0eb..d0c01e06779 100644 --- a/app/models/queries/operators/duplicates.rb +++ b/app/models/queries/operators/duplicates.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/equals.rb b/app/models/queries/operators/equals.rb index 38555acb54b..cb5550f6eec 100644 --- a/app/models/queries/operators/equals.rb +++ b/app/models/queries/operators/equals.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/equals_all.rb b/app/models/queries/operators/equals_all.rb index 31c4b8fe1d1..bfdcd670417 100644 --- a/app/models/queries/operators/equals_all.rb +++ b/app/models/queries/operators/equals_all.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/equals_or.rb b/app/models/queries/operators/equals_or.rb index dae58119871..ad036044b03 100644 --- a/app/models/queries/operators/equals_or.rb +++ b/app/models/queries/operators/equals_or.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/everywhere.rb b/app/models/queries/operators/everywhere.rb index 52152bde431..2c1358160f4 100644 --- a/app/models/queries/operators/everywhere.rb +++ b/app/models/queries/operators/everywhere.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/follows.rb b/app/models/queries/operators/follows.rb index 53cb5c6f207..5d913afdac0 100644 --- a/app/models/queries/operators/follows.rb +++ b/app/models/queries/operators/follows.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/greater_or_equal.rb b/app/models/queries/operators/greater_or_equal.rb index 075eb190b34..22818d45001 100644 --- a/app/models/queries/operators/greater_or_equal.rb +++ b/app/models/queries/operators/greater_or_equal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/in.rb b/app/models/queries/operators/in.rb index bf27ff0662d..3151bf37c8e 100644 --- a/app/models/queries/operators/in.rb +++ b/app/models/queries/operators/in.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/in_less_than.rb b/app/models/queries/operators/in_less_than.rb index b9ee542a48d..b803f54fb84 100644 --- a/app/models/queries/operators/in_less_than.rb +++ b/app/models/queries/operators/in_less_than.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/in_more_than.rb b/app/models/queries/operators/in_more_than.rb index 3b789f52801..22717dc2067 100644 --- a/app/models/queries/operators/in_more_than.rb +++ b/app/models/queries/operators/in_more_than.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/includes.rb b/app/models/queries/operators/includes.rb index fa073d90e4b..fad03d261b3 100644 --- a/app/models/queries/operators/includes.rb +++ b/app/models/queries/operators/includes.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/less_or_equal.rb b/app/models/queries/operators/less_or_equal.rb index f90656a0519..12c4a52aa86 100644 --- a/app/models/queries/operators/less_or_equal.rb +++ b/app/models/queries/operators/less_or_equal.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/less_than_ago.rb b/app/models/queries/operators/less_than_ago.rb index 44335cd8ac8..c2761971425 100644 --- a/app/models/queries/operators/less_than_ago.rb +++ b/app/models/queries/operators/less_than_ago.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/more_than_ago.rb b/app/models/queries/operators/more_than_ago.rb index b157e8fc5f4..bd8f836de76 100644 --- a/app/models/queries/operators/more_than_ago.rb +++ b/app/models/queries/operators/more_than_ago.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/none.rb b/app/models/queries/operators/none.rb index 6021c430cfe..6ac7a1d2d90 100644 --- a/app/models/queries/operators/none.rb +++ b/app/models/queries/operators/none.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/none_or_blank.rb b/app/models/queries/operators/none_or_blank.rb index f89b93aeab7..09b1e929ee1 100644 --- a/app/models/queries/operators/none_or_blank.rb +++ b/app/models/queries/operators/none_or_blank.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/not_contains.rb b/app/models/queries/operators/not_contains.rb index 9635ab9427c..09c399ea60a 100644 --- a/app/models/queries/operators/not_contains.rb +++ b/app/models/queries/operators/not_contains.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/not_equals.rb b/app/models/queries/operators/not_equals.rb index 37748bdec1f..4e2387a0cdf 100644 --- a/app/models/queries/operators/not_equals.rb +++ b/app/models/queries/operators/not_equals.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/on_date.rb b/app/models/queries/operators/on_date.rb index e8479e7f9e7..4987c3dfa20 100644 --- a/app/models/queries/operators/on_date.rb +++ b/app/models/queries/operators/on_date.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/on_date_time.rb b/app/models/queries/operators/on_date_time.rb index 3dca0ea7539..b4f034298e3 100644 --- a/app/models/queries/operators/on_date_time.rb +++ b/app/models/queries/operators/on_date_time.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/open_work_packages.rb b/app/models/queries/operators/open_work_packages.rb index 4fea1ddc95c..f197cb037ce 100644 --- a/app/models/queries/operators/open_work_packages.rb +++ b/app/models/queries/operators/open_work_packages.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/ordered_work_packages.rb b/app/models/queries/operators/ordered_work_packages.rb index 211a84ccf75..58344e7ad3f 100644 --- a/app/models/queries/operators/ordered_work_packages.rb +++ b/app/models/queries/operators/ordered_work_packages.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/parent.rb b/app/models/queries/operators/parent.rb index a16b694a70c..e76ea68f5bd 100644 --- a/app/models/queries/operators/parent.rb +++ b/app/models/queries/operators/parent.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/part_of.rb b/app/models/queries/operators/part_of.rb index 768dc7c0ce5..c321d499c07 100644 --- a/app/models/queries/operators/part_of.rb +++ b/app/models/queries/operators/part_of.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/precedes.rb b/app/models/queries/operators/precedes.rb index ad2e1651674..6a5f59ad70f 100644 --- a/app/models/queries/operators/precedes.rb +++ b/app/models/queries/operators/precedes.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/relates.rb b/app/models/queries/operators/relates.rb index 4aee30551e1..391fef4e43a 100644 --- a/app/models/queries/operators/relates.rb +++ b/app/models/queries/operators/relates.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/required.rb b/app/models/queries/operators/required.rb index 2e5f06992fb..c514322478b 100644 --- a/app/models/queries/operators/required.rb +++ b/app/models/queries/operators/required.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/requires.rb b/app/models/queries/operators/requires.rb index 6ae66bb2f44..0cb203730b8 100644 --- a/app/models/queries/operators/requires.rb +++ b/app/models/queries/operators/requires.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/this_week.rb b/app/models/queries/operators/this_week.rb index b8dbcae3cc8..1d5af0993f5 100644 --- a/app/models/queries/operators/this_week.rb +++ b/app/models/queries/operators/this_week.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/today.rb b/app/models/queries/operators/today.rb index ebed001804c..cdb67928a57 100644 --- a/app/models/queries/operators/today.rb +++ b/app/models/queries/operators/today.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/operators/work_packages/shared_with_user/any.rb b/app/models/queries/operators/work_packages/shared_with_user/any.rb index 0d0e06c76cf..f576765836e 100644 --- a/app/models/queries/operators/work_packages/shared_with_user/any.rb +++ b/app/models/queries/operators/work_packages/shared_with_user/any.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/orders/available_orders.rb b/app/models/queries/orders/available_orders.rb index 9528a533dbb..acd1963a94c 100644 --- a/app/models/queries/orders/available_orders.rb +++ b/app/models/queries/orders/available_orders.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/orders/base.rb b/app/models/queries/orders/base.rb index 53f3f4b69f4..9cda8338ab3 100644 --- a/app/models/queries/orders/base.rb +++ b/app/models/queries/orders/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/orders/not_existing_order.rb b/app/models/queries/orders/not_existing_order.rb index 07bba0c6917..c39d2c5d496 100644 --- a/app/models/queries/orders/not_existing_order.rb +++ b/app/models/queries/orders/not_existing_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users.rb b/app/models/queries/placeholder_users.rb index d17dbfc0e06..c2dabcf6266 100644 --- a/app/models/queries/placeholder_users.rb +++ b/app/models/queries/placeholder_users.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/models/queries/placeholder_users/filters/any_name_attribute_filter.rb b/app/models/queries/placeholder_users/filters/any_name_attribute_filter.rb index ba4ee046e69..347d35bdb80 100644 --- a/app/models/queries/placeholder_users/filters/any_name_attribute_filter.rb +++ b/app/models/queries/placeholder_users/filters/any_name_attribute_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users/filters/group_filter.rb b/app/models/queries/placeholder_users/filters/group_filter.rb index 7624aede19d..2b897c0cf8b 100644 --- a/app/models/queries/placeholder_users/filters/group_filter.rb +++ b/app/models/queries/placeholder_users/filters/group_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users/filters/name_filter.rb b/app/models/queries/placeholder_users/filters/name_filter.rb index 7bbd9235764..e674d4a05cc 100644 --- a/app/models/queries/placeholder_users/filters/name_filter.rb +++ b/app/models/queries/placeholder_users/filters/name_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users/filters/placeholder_user_filter.rb b/app/models/queries/placeholder_users/filters/placeholder_user_filter.rb index 5a5af308c01..237f5befff9 100644 --- a/app/models/queries/placeholder_users/filters/placeholder_user_filter.rb +++ b/app/models/queries/placeholder_users/filters/placeholder_user_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users/filters/status_filter.rb b/app/models/queries/placeholder_users/filters/status_filter.rb index 72d5f5b554f..eab7994cbe1 100644 --- a/app/models/queries/placeholder_users/filters/status_filter.rb +++ b/app/models/queries/placeholder_users/filters/status_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users/orders/default_order.rb b/app/models/queries/placeholder_users/orders/default_order.rb index b0715e84e00..a56743a21d0 100644 --- a/app/models/queries/placeholder_users/orders/default_order.rb +++ b/app/models/queries/placeholder_users/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users/orders/group_order.rb b/app/models/queries/placeholder_users/orders/group_order.rb index aa3f5543d6e..bd3b281848d 100644 --- a/app/models/queries/placeholder_users/orders/group_order.rb +++ b/app/models/queries/placeholder_users/orders/group_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users/orders/name_order.rb b/app/models/queries/placeholder_users/orders/name_order.rb index caa0170e5c9..ba7ba8cbb02 100644 --- a/app/models/queries/placeholder_users/orders/name_order.rb +++ b/app/models/queries/placeholder_users/orders/name_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/placeholder_users/placeholder_user_query.rb b/app/models/queries/placeholder_users/placeholder_user_query.rb index d167ad15578..ee592f7b7d9 100644 --- a/app/models/queries/placeholder_users/placeholder_user_query.rb +++ b/app/models/queries/placeholder_users/placeholder_user_query.rb @@ -1,12 +1,12 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. # # OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: -# Copyright (C) 2006-2017 Jean-Philippe Lang +# Copyright (C) 2006-2013 Jean-Philippe Lang # Copyright (C) 2010-2013 the ChiliProject Team # # This program is free software; you can redistribute it and/or diff --git a/app/models/queries/principals.rb b/app/models/queries/principals.rb index 79f415112b9..378f53019ef 100644 --- a/app/models/queries/principals.rb +++ b/app/models/queries/principals.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/access_to_anything_in_project_filter.rb b/app/models/queries/principals/filters/access_to_anything_in_project_filter.rb index 66c3c3cfa27..3cc25a6612a 100644 --- a/app/models/queries/principals/filters/access_to_anything_in_project_filter.rb +++ b/app/models/queries/principals/filters/access_to_anything_in_project_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/any_name_attribute_filter.rb b/app/models/queries/principals/filters/any_name_attribute_filter.rb index cb534f7f97d..9e6c470666b 100644 --- a/app/models/queries/principals/filters/any_name_attribute_filter.rb +++ b/app/models/queries/principals/filters/any_name_attribute_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/id_filter.rb b/app/models/queries/principals/filters/id_filter.rb index 51005c7198a..0c8267ecce0 100644 --- a/app/models/queries/principals/filters/id_filter.rb +++ b/app/models/queries/principals/filters/id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/member_filter.rb b/app/models/queries/principals/filters/member_filter.rb index bda7af54f09..f3391e4d1c9 100644 --- a/app/models/queries/principals/filters/member_filter.rb +++ b/app/models/queries/principals/filters/member_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb b/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb index 11bde23035e..2b1bab0a046 100644 --- a/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb +++ b/app/models/queries/principals/filters/mentionable_on_work_package_filter.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/name_filter.rb b/app/models/queries/principals/filters/name_filter.rb index 8e5fb6a54de..ab80395656e 100644 --- a/app/models/queries/principals/filters/name_filter.rb +++ b/app/models/queries/principals/filters/name_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/principal_filter.rb b/app/models/queries/principals/filters/principal_filter.rb index 340943324ff..4cef141f83e 100644 --- a/app/models/queries/principals/filters/principal_filter.rb +++ b/app/models/queries/principals/filters/principal_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/status_filter.rb b/app/models/queries/principals/filters/status_filter.rb index 3372d2f0529..c0cfccb93a5 100644 --- a/app/models/queries/principals/filters/status_filter.rb +++ b/app/models/queries/principals/filters/status_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/type_filter.rb b/app/models/queries/principals/filters/type_filter.rb index 7e75536e4ba..7b6dd0970e8 100644 --- a/app/models/queries/principals/filters/type_filter.rb +++ b/app/models/queries/principals/filters/type_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/filters/typeahead_filter.rb b/app/models/queries/principals/filters/typeahead_filter.rb index a4cf453dbbb..374f3a5ca11 100644 --- a/app/models/queries/principals/filters/typeahead_filter.rb +++ b/app/models/queries/principals/filters/typeahead_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/orders/name_order.rb b/app/models/queries/principals/orders/name_order.rb index 3ac30110737..a8706bb15fa 100644 --- a/app/models/queries/principals/orders/name_order.rb +++ b/app/models/queries/principals/orders/name_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/principals/principal_query.rb b/app/models/queries/principals/principal_query.rb index d97c21c9cfe..0d561949629 100644 --- a/app/models/queries/principals/principal_query.rb +++ b/app/models/queries/principals/principal_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects.rb b/app/models/queries/projects.rb index 8b0bf929687..bb25098c532 100644 --- a/app/models/queries/projects.rb +++ b/app/models/queries/projects.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,6 +30,7 @@ module Queries::Projects ::Queries::Register.register(ProjectQuery) do filter Filters::AncestorFilter filter Filters::AvailableProjectAttributesFilter + filter Filters::AvailableCustomFieldsProjectsFilter filter Filters::TypeFilter filter Filters::ActiveFilter filter Filters::TemplatedFilter diff --git a/app/models/queries/projects/factory.rb b/app/models/queries/projects/factory.rb index b4ead080663..854d8c04938 100644 --- a/app/models/queries/projects/factory.rb +++ b/app/models/queries/projects/factory.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/filters/active_filter.rb b/app/models/queries/projects/filters/active_filter.rb index 92c493413c5..d3bcacc1eac 100644 --- a/app/models/queries/projects/filters/active_filter.rb +++ b/app/models/queries/projects/filters/active_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::ActiveFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::ActiveFilter < Queries::Projects::Filters::Base include Queries::Filters::Shared::BooleanFilter def self.key diff --git a/app/models/queries/projects/filters/ancestor_filter.rb b/app/models/queries/projects/filters/ancestor_filter.rb index be2a2b8e177..41e75b8a52a 100644 --- a/app/models/queries/projects/filters/ancestor_filter.rb +++ b/app/models/queries/projects/filters/ancestor_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,69 +26,63 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Queries - module Projects - module Filters - class AncestorFilter < ::Queries::Projects::Filters::ProjectFilter - def apply_to(_query_scope) - case operator - when "=" - super - .where(exists_condition.exists) - when "!" - super - .where.not(exists_condition.exists) - else - raise "unsupported operator" - end - end - - def where - nil - end - - def type - :list - end - - def self.key - :ancestor - end - - private - - def type_strategy - # Instead of getting the IDs of all the projects a user is allowed - # to see we only check that the value is an integer. Non valid ids - # will then simply create an empty result but will not cause any - # harm. - @type_strategy ||= ::Queries::Filters::Strategies::IntegerList.new(self) - end - - def exists_condition - Project.from("#{Project.table_name} ancestors") - .where(ancestor_condition.and(ancestor_in_values_condition)) - .arel - end - - def ancestor_condition - projects_table[:lft] - .gt(projects_ancestor_table[:lft]) - .and(projects_table[:rgt].lt(projects_ancestor_table[:rgt])) - end - - def ancestor_in_values_condition - projects_ancestor_table[:id].in(values) - end - - def projects_table - Project.arel_table - end - - def projects_ancestor_table - projects_table.alias(:ancestors) - end - end +class Queries::Projects::Filters::AncestorFilter < Queries::Projects::Filters::Base + def apply_to(_query_scope) + case operator + when "=" + super + .where(exists_condition.exists) + when "!" + super + .where.not(exists_condition.exists) + else + raise "unsupported operator" end end + + def where + nil + end + + def type + :list + end + + def self.key + :ancestor + end + + private + + def type_strategy + # Instead of getting the IDs of all the projects a user is allowed + # to see we only check that the value is an integer. Non valid ids + # will then simply create an empty result but will not cause any + # harm. + @type_strategy ||= ::Queries::Filters::Strategies::IntegerList.new(self) + end + + def exists_condition + Project.from("#{Project.table_name} ancestors") + .where(ancestor_condition.and(ancestor_in_values_condition)) + .arel + end + + def ancestor_condition + projects_table[:lft] + .gt(projects_ancestor_table[:lft]) + .and(projects_table[:rgt].lt(projects_ancestor_table[:rgt])) + end + + def ancestor_in_values_condition + projects_ancestor_table[:id].in(values) + end + + def projects_table + Project.arel_table + end + + def projects_ancestor_table + projects_table.alias(:ancestors) + end end diff --git a/app/models/queries/projects/filters/available_custom_fields_projects_filter.rb b/app/models/queries/projects/filters/available_custom_fields_projects_filter.rb new file mode 100644 index 00000000000..0aa5a0d9531 --- /dev/null +++ b/app/models/queries/projects/filters/available_custom_fields_projects_filter.rb @@ -0,0 +1,70 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ +# + +class Queries::Projects::Filters::AvailableCustomFieldsProjectsFilter < Queries::Projects::Filters::Base + def self.key + :available_custom_fields_projects + end + + def type + :list + end + + def allowed_values + @allowed_values ||= CustomFieldsProject + .includes(:custom_field) + .distinct + .pluck(:name, :custom_field_id) + end + + def available? + User.current.admin? + end + + def apply_to(_query_scope) + case operator + when "=" + super.with_available_custom_fields(values) + when "!" + super.without_available_custom_fields(values) + else + raise "unsupported operator" + end + end + + def where + nil + end + + def human_name + I18n.t(:label_available_custom_fields_projects) + end +end diff --git a/app/models/queries/projects/filters/available_project_attributes_filter.rb b/app/models/queries/projects/filters/available_project_attributes_filter.rb index 2135ea67448..56bdf29449d 100644 --- a/app/models/queries/projects/filters/available_project_attributes_filter.rb +++ b/app/models/queries/projects/filters/available_project_attributes_filter.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,7 +29,7 @@ # ++ # -class Queries::Projects::Filters::AvailableProjectAttributesFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::AvailableProjectAttributesFilter < Queries::Projects::Filters::Base def self.key :available_project_attributes end @@ -52,9 +52,9 @@ class Queries::Projects::Filters::AvailableProjectAttributesFilter < Queries::Pr def apply_to(_query_scope) case operator when "=" - super.with_available_custom_fields(values) + super.with_available_project_custom_fields(values) when "!" - super.without_available_custom_fields(values) + super.without_available_project_custom_fields(values) else raise "unsupported operator" end diff --git a/app/models/queries/projects/filters/project_filter.rb b/app/models/queries/projects/filters/base.rb similarity index 91% rename from app/models/queries/projects/filters/project_filter.rb rename to app/models/queries/projects/filters/base.rb index b901999ef25..78b07973f41 100644 --- a/app/models/queries/projects/filters/project_filter.rb +++ b/app/models/queries/projects/filters/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::ProjectFilter < Queries::Filters::Base +class Queries::Projects::Filters::Base < Queries::Filters::Base self.model = Project def human_name diff --git a/app/models/queries/projects/filters/created_at_filter.rb b/app/models/queries/projects/filters/created_at_filter.rb index b956e63d1b5..6c4aed79483 100644 --- a/app/models/queries/projects/filters/created_at_filter.rb +++ b/app/models/queries/projects/filters/created_at_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::CreatedAtFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::CreatedAtFilter < Queries::Projects::Filters::Base def type :datetime_past end diff --git a/app/models/queries/projects/filters/custom_field_context.rb b/app/models/queries/projects/filters/custom_field_context.rb index 55199abde70..d3989b284e2 100644 --- a/app/models/queries/projects/filters/custom_field_context.rb +++ b/app/models/queries/projects/filters/custom_field_context.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -41,18 +41,29 @@ module Queries::Projects::Filters::CustomFieldContext end def where_subselect_joins(custom_field) - cv_db_table = CustomValue.table_name - project_db_table = Project.table_name - <<~SQL.squish LEFT OUTER JOIN #{cv_db_table} ON #{cv_db_table}.customized_type='Project' AND #{cv_db_table}.customized_id=#{project_db_table}.id AND #{cv_db_table}.custom_field_id=#{custom_field.id} INNER JOIN project_custom_field_project_mappings - ON project_custom_field_project_mappings.project_id = projects.id + ON project_custom_field_project_mappings.project_id = #{project_db_table}.id AND project_custom_field_project_mappings.custom_field_id = #{custom_field.id} SQL end + + def where_subselect_conditions + # Allow searching projects only with :view_project_attributes permission + allowed_project_ids = Project.allowed_to(User.current, :view_project_attributes) + .select(:id) + <<~SQL.squish + #{project_db_table}.id IN (#{allowed_project_ids.to_sql}) + SQL + end + + private + + def cv_db_table = CustomValue.table_name + def project_db_table = Project.table_name end end diff --git a/app/models/queries/projects/filters/custom_field_filter.rb b/app/models/queries/projects/filters/custom_field_filter.rb index e4f6c43d846..8d9f7498282 100644 --- a/app/models/queries/projects/filters/custom_field_filter.rb +++ b/app/models/queries/projects/filters/custom_field_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,8 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::CustomFieldFilter < - Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::CustomFieldFilter < Queries::Projects::Filters::Base include Queries::Filters::Shared::CustomFieldFilter self.custom_field_context = ::Queries::Projects::Filters::CustomFieldContext end diff --git a/app/models/queries/projects/filters/favored_filter.rb b/app/models/queries/projects/filters/favored_filter.rb index 6eded8cac0c..7f6c61f7953 100644 --- a/app/models/queries/projects/filters/favored_filter.rb +++ b/app/models/queries/projects/filters/favored_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::FavoredFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::FavoredFilter < Queries::Projects::Filters::Base include Queries::Filters::Shared::BooleanFilter def self.key diff --git a/app/models/queries/projects/filters/id_filter.rb b/app/models/queries/projects/filters/id_filter.rb index 8bc577afcba..cec8c8440c8 100644 --- a/app/models/queries/projects/filters/id_filter.rb +++ b/app/models/queries/projects/filters/id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,8 +26,12 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::IdFilter < Queries::Projects::Filters::ProjectFilter - def type - :integer +class Queries::Projects::Filters::IdFilter < Queries::Projects::Filters::Base + include Queries::Filters::Shared::ProjectFilter::Required + + def self.key = :id + + def human_name + I18n.t(:label_project) end end diff --git a/app/models/queries/projects/filters/latest_activity_at_filter.rb b/app/models/queries/projects/filters/latest_activity_at_filter.rb index ec7de11b580..619d296b225 100644 --- a/app/models/queries/projects/filters/latest_activity_at_filter.rb +++ b/app/models/queries/projects/filters/latest_activity_at_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::LatestActivityAtFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::LatestActivityAtFilter < Queries::Projects::Filters::Base def type :datetime_past end diff --git a/app/models/queries/projects/filters/member_of_filter.rb b/app/models/queries/projects/filters/member_of_filter.rb index 5345d054367..b68e39f1b26 100644 --- a/app/models/queries/projects/filters/member_of_filter.rb +++ b/app/models/queries/projects/filters/member_of_filter.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,7 +29,7 @@ # ++ # -class Queries::Projects::Filters::MemberOfFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::MemberOfFilter < Queries::Projects::Filters::Base include Queries::Filters::Shared::BooleanFilter def self.key diff --git a/app/models/queries/projects/filters/name_and_identifier_filter.rb b/app/models/queries/projects/filters/name_and_identifier_filter.rb index e985895a495..184ed49879e 100644 --- a/app/models/queries/projects/filters/name_and_identifier_filter.rb +++ b/app/models/queries/projects/filters/name_and_identifier_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::NameAndIdentifierFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::NameAndIdentifierFilter < Queries::Projects::Filters::Base def type :string end diff --git a/app/models/queries/projects/filters/name_filter.rb b/app/models/queries/projects/filters/name_filter.rb index 92b31b95923..59357cbf39f 100644 --- a/app/models/queries/projects/filters/name_filter.rb +++ b/app/models/queries/projects/filters/name_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::NameFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::NameFilter < Queries::Projects::Filters::Base def type :string end diff --git a/app/models/queries/projects/filters/parent_filter.rb b/app/models/queries/projects/filters/parent_filter.rb index 22a45fb937a..4330c9f5dd6 100644 --- a/app/models/queries/projects/filters/parent_filter.rb +++ b/app/models/queries/projects/filters/parent_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::ParentFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::ParentFilter < Queries::Projects::Filters::Base def type :list_optional end diff --git a/app/models/queries/projects/filters/principal_filter.rb b/app/models/queries/projects/filters/principal_filter.rb index 07fca2beda0..b91a0e31a61 100644 --- a/app/models/queries/projects/filters/principal_filter.rb +++ b/app/models/queries/projects/filters/principal_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::PrincipalFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::PrincipalFilter < Queries::Projects::Filters::Base def type :list_optional end diff --git a/app/models/queries/projects/filters/project_status_filter.rb b/app/models/queries/projects/filters/project_status_filter.rb index b46a2e273d3..f32109577ed 100644 --- a/app/models/queries/projects/filters/project_status_filter.rb +++ b/app/models/queries/projects/filters/project_status_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,34 +26,28 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Queries - module Projects - module Filters - class ProjectStatusFilter < ::Queries::Projects::Filters::ProjectFilter - include ProjectStatusHelper +class Queries::Projects::Filters::ProjectStatusFilter < Queries::Projects::Filters::Base + include ProjectStatusHelper - def allowed_values - @allowed_values ||= Project.status_codes.map do |code, id| - [project_status_name_for_code(code), id.to_s] - end - end - - def type - :list_optional - end - - def where - operator_strategy.sql_for_field(values, model.table_name, :status_code) - end - - def self.key - :project_status_code - end - - def human_name - I18n.t("js.grid.widgets.project_status.title") - end - end + def allowed_values + @allowed_values ||= Project.status_codes.map do |code, id| + [project_status_name_for_code(code), id.to_s] end end + + def type + :list_optional + end + + def where + operator_strategy.sql_for_field(values, model.table_name, :status_code) + end + + def self.key + :project_status_code + end + + def human_name + I18n.t("js.grid.widgets.project_status.title") + end end diff --git a/app/models/queries/projects/filters/public_filter.rb b/app/models/queries/projects/filters/public_filter.rb index 6ad7341cdf5..d22fe8bf921 100644 --- a/app/models/queries/projects/filters/public_filter.rb +++ b/app/models/queries/projects/filters/public_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::PublicFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::PublicFilter < Queries::Projects::Filters::Base include Queries::Filters::Shared::BooleanFilter def self.key diff --git a/app/models/queries/projects/filters/templated_filter.rb b/app/models/queries/projects/filters/templated_filter.rb index e4a959cdf0e..9892587a0db 100644 --- a/app/models/queries/projects/filters/templated_filter.rb +++ b/app/models/queries/projects/filters/templated_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class Queries::Projects::Filters::TemplatedFilter < Queries::Projects::Filters::ProjectFilter +class Queries::Projects::Filters::TemplatedFilter < Queries::Projects::Filters::Base include Queries::Filters::Shared::BooleanFilter def self.key diff --git a/app/models/queries/projects/filters/type_filter.rb b/app/models/queries/projects/filters/type_filter.rb index e642d108d66..43662b4ee5a 100644 --- a/app/models/queries/projects/filters/type_filter.rb +++ b/app/models/queries/projects/filters/type_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,40 +26,34 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Queries - module Projects - module Filters - class TypeFilter < ::Queries::Projects::Filters::ProjectFilter - def allowed_values - @allowed_values ||= Type.pluck(:name, :id) - end +class Queries::Projects::Filters::TypeFilter < Queries::Projects::Filters::Base + def allowed_values + @allowed_values ||= Type.pluck(:name, :id) + end - def joins - :types - end + def joins + :types + end - def where - operator_strategy.sql_for_field(values, Type.table_name, :id) - end + def where + operator_strategy.sql_for_field(values, Type.table_name, :id) + end - def type - :list - end + def type + :list + end - def self.key - :type_id - end + def self.key + :type_id + end - private + private - def type_strategy - # Instead of getting the IDs of all the projects a user is allowed - # to see we only check that the value is an integer. Non valid ids - # will then simply create an empty result but will not cause any - # harm. - @type_strategy ||= ::Queries::Filters::Strategies::IntegerList.new(self) - end - end - end + def type_strategy + # Instead of getting the IDs of all the projects a user is allowed + # to see we only check that the value is an integer. Non valid ids + # will then simply create an empty result but will not cause any + # harm. + @type_strategy ||= ::Queries::Filters::Strategies::IntegerList.new(self) end end diff --git a/app/models/queries/projects/filters/typeahead_filter.rb b/app/models/queries/projects/filters/typeahead_filter.rb index 9635055a190..7b490617c6c 100644 --- a/app/models/queries/projects/filters/typeahead_filter.rb +++ b/app/models/queries/projects/filters/typeahead_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/filters/user_action_filter.rb b/app/models/queries/projects/filters/user_action_filter.rb index 6cef678acfd..fa1c2929102 100644 --- a/app/models/queries/projects/filters/user_action_filter.rb +++ b/app/models/queries/projects/filters/user_action_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,50 +26,44 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module Queries - module Projects - module Filters - class UserActionFilter < ::Queries::Projects::Filters::ProjectFilter - def allowed_values - @allowed_values ||= Action.default.pluck(:id, :id) - end +class Queries::Projects::Filters::UserActionFilter < Queries::Projects::Filters::Base + def allowed_values + @allowed_values ||= Action.default.pluck(:id, :id) + end - def type - :list_all - end + def type + :list_all + end - def where - operator = if operator_class <= ::Queries::Operators::Equals || operator_class <= ::Queries::Operators::EqualsAll - "IN" - elsif operator_class <= ::Queries::Operators::NotEquals - "NOT IN" - else - raise ArgumentError - end + def where + operator = if operator_class <= ::Queries::Operators::Equals || operator_class <= ::Queries::Operators::EqualsAll + "IN" + elsif operator_class <= ::Queries::Operators::NotEquals + "NOT IN" + else + raise ArgumentError + end - capability_select_queries - .map { |query| "#{Project.table_name}.id #{operator} (#{query.to_sql})" } - .join(" AND ") - end + capability_select_queries + .map { |query| "#{Project.table_name}.id #{operator} (#{query.to_sql})" } + .join(" AND ") + end - private + private - def capability_select_queries - if operator_class <= ::Queries::Operators::EqualsAll - values.map do |val| - Capability - .where(action: val) - .where(principal: User.current) - .reselect(:context_id) - end - else - [Capability - .where(action: values) - .where(principal: User.current) - .reselect(:context_id)] - end - end + def capability_select_queries + if operator_class <= ::Queries::Operators::EqualsAll + values.map do |val| + Capability + .where(action: val) + .where(principal: User.current) + .reselect(:context_id) end + else + [Capability + .where(action: values) + .where(principal: User.current) + .reselect(:context_id)] end end end diff --git a/app/models/queries/projects/filters/visible_filter.rb b/app/models/queries/projects/filters/visible_filter.rb index 9a5500e0bd0..75313e20744 100644 --- a/app/models/queries/projects/filters/visible_filter.rb +++ b/app/models/queries/projects/filters/visible_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,41 +29,35 @@ # Returns projects visible for a user. # This filter is only useful for admins which want to scope down the list of all the projects to those # visible by a user. For a non admin user, the vanilla project query is already limited to the visible projects. -module Queries - module Projects - module Filters - class VisibleFilter < ::Queries::Projects::Filters::ProjectFilter - validate :validate_only_single_value +class Queries::Projects::Filters::VisibleFilter < Queries::Projects::Filters::Base + validate :validate_only_single_value - def allowed_values - # Disregard the need for a proper name (as it is no longer actually displayed) - # in favor of speed. - @allowed_values ||= User.pluck(:id, :id) - end + def allowed_values + # Disregard the need for a proper name (as it is no longer actually displayed) + # in favor of speed. + @allowed_values ||= User.pluck(:id, :id) + end - def apply_to(_query_scope) - super.where(id: Project.visible(User.find(values.first))) - end + def apply_to(_query_scope) + super.where(id: Project.visible(User.find(values.first))) + end - def where - # Handled by scope - nil - end + def where + # Handled by scope + nil + end - def type - :list - end + def type + :list + end - def available_operators - [::Queries::Operators::Equals] - end + def available_operators + [::Queries::Operators::Equals] + end - private + private - def validate_only_single_value - errors.add(:values, :invalid) if values.length != 1 - end - end - end + def validate_only_single_value + errors.add(:values, :invalid) if values.length != 1 end end diff --git a/app/models/queries/projects/orders/custom_field_order.rb b/app/models/queries/projects/orders/custom_field_order.rb index dca4ab3f3e6..02b7bac6a92 100644 --- a/app/models/queries/projects/orders/custom_field_order.rb +++ b/app/models/queries/projects/orders/custom_field_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/orders/default_order.rb b/app/models/queries/projects/orders/default_order.rb index 746d900c89e..de5154c5b00 100644 --- a/app/models/queries/projects/orders/default_order.rb +++ b/app/models/queries/projects/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,6 +30,6 @@ class Queries::Projects::Orders::DefaultOrder < Queries::Orders::Base self.model = Project def self.key - /\A(id|created_at|public|lft)\z/ + /\A(id|identifier|created_at|public|lft)\z/ end end diff --git a/app/models/queries/projects/orders/latest_activity_at_order.rb b/app/models/queries/projects/orders/latest_activity_at_order.rb index d2a9ca05a85..37432e168db 100644 --- a/app/models/queries/projects/orders/latest_activity_at_order.rb +++ b/app/models/queries/projects/orders/latest_activity_at_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/orders/name_order.rb b/app/models/queries/projects/orders/name_order.rb index 617623e5eec..dd2e583b686 100644 --- a/app/models/queries/projects/orders/name_order.rb +++ b/app/models/queries/projects/orders/name_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/orders/project_status_order.rb b/app/models/queries/projects/orders/project_status_order.rb index 44125a5f190..7922a19f380 100644 --- a/app/models/queries/projects/orders/project_status_order.rb +++ b/app/models/queries/projects/orders/project_status_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -37,7 +37,7 @@ class Queries::Projects::Orders::ProjectStatusOrder < Queries::Orders::Base def order(scope) with_raise_on_invalid do - scope.order(Arel.sql("status_code").send(direction)) + scope.order(status_code: direction) end end end diff --git a/app/models/queries/projects/orders/required_disk_space_order.rb b/app/models/queries/projects/orders/required_disk_space_order.rb index 648dbd4544f..cfdc32c684e 100644 --- a/app/models/queries/projects/orders/required_disk_space_order.rb +++ b/app/models/queries/projects/orders/required_disk_space_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/orders/typeahead_order.rb b/app/models/queries/projects/orders/typeahead_order.rb index 7c739ff1a2a..e05a7b54352 100644 --- a/app/models/queries/projects/orders/typeahead_order.rb +++ b/app/models/queries/projects/orders/typeahead_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/selects/created_at.rb b/app/models/queries/projects/selects/created_at.rb index db06809ffd7..fa6ed0e66bb 100644 --- a/app/models/queries/projects/selects/created_at.rb +++ b/app/models/queries/projects/selects/created_at.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/selects/custom_field.rb b/app/models/queries/projects/selects/custom_field.rb index c1b54dc70b5..b1b19f29ee2 100644 --- a/app/models/queries/projects/selects/custom_field.rb +++ b/app/models/queries/projects/selects/custom_field.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -33,10 +33,6 @@ class Queries::Projects::Selects::CustomField < Queries::Selects::Base /cf_(\d+)/ end - def self.available? - EnterpriseToken.allows_to?(:custom_fields_in_projects_list) - end - def self.all_available return [] unless available? diff --git a/app/models/queries/projects/selects/default.rb b/app/models/queries/projects/selects/default.rb index 5b1fa8ced5d..55945c4ace5 100644 --- a/app/models/queries/projects/selects/default.rb +++ b/app/models/queries/projects/selects/default.rb @@ -1,6 +1,6 @@ -# -- copyright +#-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,7 +27,7 @@ # ++ class Queries::Projects::Selects::Default < Queries::Selects::Base - KEYS = %i[status_explanation hierarchy name public description].freeze + KEYS = %i[id identifier status_explanation hierarchy name public description].freeze def self.key Regexp.new(KEYS.join("|")) diff --git a/app/models/queries/projects/selects/favored.rb b/app/models/queries/projects/selects/favored.rb index c71446e49a6..2240fdcd6f2 100644 --- a/app/models/queries/projects/selects/favored.rb +++ b/app/models/queries/projects/selects/favored.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/selects/latest_activity_at.rb b/app/models/queries/projects/selects/latest_activity_at.rb index e82fdd4c133..91fb972dbe5 100644 --- a/app/models/queries/projects/selects/latest_activity_at.rb +++ b/app/models/queries/projects/selects/latest_activity_at.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/selects/required_disk_space.rb b/app/models/queries/projects/selects/required_disk_space.rb index bc433247af0..6c99bcfc985 100644 --- a/app/models/queries/projects/selects/required_disk_space.rb +++ b/app/models/queries/projects/selects/required_disk_space.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/projects/selects/status.rb b/app/models/queries/projects/selects/status.rb index 328ded86f6d..bfb5704e2c7 100644 --- a/app/models/queries/projects/selects/status.rb +++ b/app/models/queries/projects/selects/status.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/queries.rb b/app/models/queries/queries.rb index 79544a64cdc..111aab74c18 100644 --- a/app/models/queries/queries.rb +++ b/app/models/queries/queries.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/queries/filters/id_filter.rb b/app/models/queries/queries/filters/id_filter.rb index 9dd0c55ac1b..a4ca8530fb5 100644 --- a/app/models/queries/queries/filters/id_filter.rb +++ b/app/models/queries/queries/filters/id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/queries/filters/project_filter.rb b/app/models/queries/queries/filters/project_filter.rb index 3d79f7bb418..80ef336f753 100644 --- a/app/models/queries/queries/filters/project_filter.rb +++ b/app/models/queries/queries/filters/project_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,5 +27,5 @@ #++ class Queries::Queries::Filters::ProjectFilter < Queries::Queries::Filters::QueryFilter - include Queries::Filters::Shared::ProjectFilter + include Queries::Filters::Shared::ProjectFilter::Optional end diff --git a/app/models/queries/queries/filters/project_identifier_filter.rb b/app/models/queries/queries/filters/project_identifier_filter.rb index 8403cc79c15..a6e6f4dc462 100644 --- a/app/models/queries/queries/filters/project_identifier_filter.rb +++ b/app/models/queries/queries/filters/project_identifier_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/queries/filters/query_filter.rb b/app/models/queries/queries/filters/query_filter.rb index 04e9e6166b8..f0a3febf372 100644 --- a/app/models/queries/queries/filters/query_filter.rb +++ b/app/models/queries/queries/filters/query_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/queries/filters/updated_at_filter.rb b/app/models/queries/queries/filters/updated_at_filter.rb index 7ef52994bf5..34df06d5cff 100644 --- a/app/models/queries/queries/filters/updated_at_filter.rb +++ b/app/models/queries/queries/filters/updated_at_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/queries/query_query.rb b/app/models/queries/queries/query_query.rb index f79d8e691b5..152520233e2 100644 --- a/app/models/queries/queries/query_query.rb +++ b/app/models/queries/queries/query_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/register.rb b/app/models/queries/register.rb index fa1d16e075b..0f9dc646616 100644 --- a/app/models/queries/register.rb +++ b/app/models/queries/register.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations.rb b/app/models/queries/relations.rb index 9086335fbbf..777f3f092c3 100644 --- a/app/models/queries/relations.rb +++ b/app/models/queries/relations.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/filters/from_filter.rb b/app/models/queries/relations/filters/from_filter.rb index e83818cefd0..7a856778b62 100644 --- a/app/models/queries/relations/filters/from_filter.rb +++ b/app/models/queries/relations/filters/from_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/filters/id_filter.rb b/app/models/queries/relations/filters/id_filter.rb index b36c58ccef9..8b8f5386439 100644 --- a/app/models/queries/relations/filters/id_filter.rb +++ b/app/models/queries/relations/filters/id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/filters/involved_filter.rb b/app/models/queries/relations/filters/involved_filter.rb index 95ddee87e5f..d999dd8cdea 100644 --- a/app/models/queries/relations/filters/involved_filter.rb +++ b/app/models/queries/relations/filters/involved_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/filters/relation_filter.rb b/app/models/queries/relations/filters/relation_filter.rb index fb8dd07fc59..7bf57f7ef9b 100644 --- a/app/models/queries/relations/filters/relation_filter.rb +++ b/app/models/queries/relations/filters/relation_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/filters/to_filter.rb b/app/models/queries/relations/filters/to_filter.rb index a857154b586..179b6007ae6 100644 --- a/app/models/queries/relations/filters/to_filter.rb +++ b/app/models/queries/relations/filters/to_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/filters/type_filter.rb b/app/models/queries/relations/filters/type_filter.rb index 37bc296fdb2..bad12cba099 100644 --- a/app/models/queries/relations/filters/type_filter.rb +++ b/app/models/queries/relations/filters/type_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/filters/visibility_checking.rb b/app/models/queries/relations/filters/visibility_checking.rb index 1fee2304c4a..4560b883398 100644 --- a/app/models/queries/relations/filters/visibility_checking.rb +++ b/app/models/queries/relations/filters/visibility_checking.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/orders/default_order.rb b/app/models/queries/relations/orders/default_order.rb index f2d4aca7863..5def98e8bae 100644 --- a/app/models/queries/relations/orders/default_order.rb +++ b/app/models/queries/relations/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/relations/relation_query.rb b/app/models/queries/relations/relation_query.rb index 0d3c149ab49..52756a386c9 100644 --- a/app/models/queries/relations/relation_query.rb +++ b/app/models/queries/relations/relation_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/roles.rb b/app/models/queries/roles.rb index 18238fc010f..038e18e2a1d 100644 --- a/app/models/queries/roles.rb +++ b/app/models/queries/roles.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/roles/filters/allows_becoming_assignee_filter.rb b/app/models/queries/roles/filters/allows_becoming_assignee_filter.rb index 75d158f4c4a..116790569ef 100644 --- a/app/models/queries/roles/filters/allows_becoming_assignee_filter.rb +++ b/app/models/queries/roles/filters/allows_becoming_assignee_filter.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/roles/filters/grantable_filter.rb b/app/models/queries/roles/filters/grantable_filter.rb index abbeac230ca..c39075a9656 100644 --- a/app/models/queries/roles/filters/grantable_filter.rb +++ b/app/models/queries/roles/filters/grantable_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/roles/filters/role_filter.rb b/app/models/queries/roles/filters/role_filter.rb index 070222eebb9..ad5886f8e6b 100644 --- a/app/models/queries/roles/filters/role_filter.rb +++ b/app/models/queries/roles/filters/role_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/roles/filters/unit_filter.rb b/app/models/queries/roles/filters/unit_filter.rb index 21b158ef6a9..e4d732acf25 100644 --- a/app/models/queries/roles/filters/unit_filter.rb +++ b/app/models/queries/roles/filters/unit_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/roles/role_query.rb b/app/models/queries/roles/role_query.rb index 500a94de4ac..73830e986e7 100644 --- a/app/models/queries/roles/role_query.rb +++ b/app/models/queries/roles/role_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/scopes/having_views.rb b/app/models/queries/scopes/having_views.rb index 2e239db3f88..d070f7e19e7 100644 --- a/app/models/queries/scopes/having_views.rb +++ b/app/models/queries/scopes/having_views.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/scopes/visible.rb b/app/models/queries/scopes/visible.rb index 42caa20c653..761fa6e00ea 100644 --- a/app/models/queries/scopes/visible.rb +++ b/app/models/queries/scopes/visible.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/selects/available_selects.rb b/app/models/queries/selects/available_selects.rb index 9082a126f1b..469b558efa7 100644 --- a/app/models/queries/selects/available_selects.rb +++ b/app/models/queries/selects/available_selects.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/selects/base.rb b/app/models/queries/selects/base.rb index 09737d5c0d4..2ad2fb364df 100644 --- a/app/models/queries/selects/base.rb +++ b/app/models/queries/selects/base.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/selects/not_existing_select.rb b/app/models/queries/selects/not_existing_select.rb index f5c6bd3c1a0..8b9b3fd808f 100644 --- a/app/models/queries/selects/not_existing_select.rb +++ b/app/models/queries/selects/not_existing_select.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/serialization/filters.rb b/app/models/queries/serialization/filters.rb index 5326f20ea84..af72dd1d730 100644 --- a/app/models/queries/serialization/filters.rb +++ b/app/models/queries/serialization/filters.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/serialization/hash.rb b/app/models/queries/serialization/hash.rb index 8a7c9a9f548..4c0f8679abb 100644 --- a/app/models/queries/serialization/hash.rb +++ b/app/models/queries/serialization/hash.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/serialization/orders.rb b/app/models/queries/serialization/orders.rb index 80be493caaf..df570bf83aa 100644 --- a/app/models/queries/serialization/orders.rb +++ b/app/models/queries/serialization/orders.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/serialization/selects.rb b/app/models/queries/serialization/selects.rb index 8d092a7295f..283cf0d3ab3 100644 --- a/app/models/queries/serialization/selects.rb +++ b/app/models/queries/serialization/selects.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/unpersisted_query.rb b/app/models/queries/unpersisted_query.rb index 570e0d20544..0a1914f9ebc 100644 --- a/app/models/queries/unpersisted_query.rb +++ b/app/models/queries/unpersisted_query.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users.rb b/app/models/queries/users.rb index 9180958a148..fc5d95c9696 100644 --- a/app/models/queries/users.rb +++ b/app/models/queries/users.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/filters/any_name_attribute_filter.rb b/app/models/queries/users/filters/any_name_attribute_filter.rb index 013fc782f09..0cead6e4e11 100644 --- a/app/models/queries/users/filters/any_name_attribute_filter.rb +++ b/app/models/queries/users/filters/any_name_attribute_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/filters/blocked_filter.rb b/app/models/queries/users/filters/blocked_filter.rb index bddccc409b8..a26c7cf4791 100644 --- a/app/models/queries/users/filters/blocked_filter.rb +++ b/app/models/queries/users/filters/blocked_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/filters/group_filter.rb b/app/models/queries/users/filters/group_filter.rb index b6c5182f955..c7119708205 100644 --- a/app/models/queries/users/filters/group_filter.rb +++ b/app/models/queries/users/filters/group_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/filters/login_filter.rb b/app/models/queries/users/filters/login_filter.rb index d86c0bf15a1..887e1776a0d 100644 --- a/app/models/queries/users/filters/login_filter.rb +++ b/app/models/queries/users/filters/login_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/filters/name_filter.rb b/app/models/queries/users/filters/name_filter.rb index 59082a2d3e2..66133c07d66 100644 --- a/app/models/queries/users/filters/name_filter.rb +++ b/app/models/queries/users/filters/name_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/filters/status_filter.rb b/app/models/queries/users/filters/status_filter.rb index 93597ffed6d..538a73173d6 100644 --- a/app/models/queries/users/filters/status_filter.rb +++ b/app/models/queries/users/filters/status_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/filters/user_filter.rb b/app/models/queries/users/filters/user_filter.rb index 7144fd011f6..a06a1dd3af0 100644 --- a/app/models/queries/users/filters/user_filter.rb +++ b/app/models/queries/users/filters/user_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/orders/default_order.rb b/app/models/queries/users/orders/default_order.rb index 1466a00a024..faac8f5c201 100644 --- a/app/models/queries/users/orders/default_order.rb +++ b/app/models/queries/users/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/orders/group_order.rb b/app/models/queries/users/orders/group_order.rb index b133e962c3e..a6ced7a03eb 100644 --- a/app/models/queries/users/orders/group_order.rb +++ b/app/models/queries/users/orders/group_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/orders/name_order.rb b/app/models/queries/users/orders/name_order.rb index 2d7c7d497d3..ae0659b3f48 100644 --- a/app/models/queries/users/orders/name_order.rb +++ b/app/models/queries/users/orders/name_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/users/user_query.rb b/app/models/queries/users/user_query.rb index 10ea8372346..37697e997ea 100644 --- a/app/models/queries/users/user_query.rb +++ b/app/models/queries/users/user_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/valid_subset.rb b/app/models/queries/valid_subset.rb index ae2335939f4..e2f764f5550 100644 --- a/app/models/queries/valid_subset.rb +++ b/app/models/queries/valid_subset.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/versions.rb b/app/models/queries/versions.rb index b077c23b8f9..b6af7df7529 100644 --- a/app/models/queries/versions.rb +++ b/app/models/queries/versions.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/versions/filters/sharing_filter.rb b/app/models/queries/versions/filters/sharing_filter.rb index bd0c55d472c..3bbffda0825 100644 --- a/app/models/queries/versions/filters/sharing_filter.rb +++ b/app/models/queries/versions/filters/sharing_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/versions/filters/version_filter.rb b/app/models/queries/versions/filters/version_filter.rb index 9fa34f49c19..106407e6ae5 100644 --- a/app/models/queries/versions/filters/version_filter.rb +++ b/app/models/queries/versions/filters/version_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/versions/orders/name_order.rb b/app/models/queries/versions/orders/name_order.rb index 4f6db68065e..0c6f0ddcfc6 100644 --- a/app/models/queries/versions/orders/name_order.rb +++ b/app/models/queries/versions/orders/name_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/versions/orders/semver_name_order.rb b/app/models/queries/versions/orders/semver_name_order.rb index 3e0f0e0a082..465429fb6bb 100644 --- a/app/models/queries/versions/orders/semver_name_order.rb +++ b/app/models/queries/versions/orders/semver_name_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/versions/version_query.rb b/app/models/queries/versions/version_query.rb index f71fe835bab..2bcf9afb516 100644 --- a/app/models/queries/versions/version_query.rb +++ b/app/models/queries/versions/version_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/views.rb b/app/models/queries/views.rb index dac5c69f4ed..b553fd0f49d 100644 --- a/app/models/queries/views.rb +++ b/app/models/queries/views.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/views/filters/project_filter.rb b/app/models/queries/views/filters/project_filter.rb index d0b4dddb80d..504fe1d27e9 100644 --- a/app/models/queries/views/filters/project_filter.rb +++ b/app/models/queries/views/filters/project_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,7 +28,7 @@ # Using the associated queries' project relation to filter class Queries::Views::Filters::ProjectFilter < Queries::Views::Filters::ViewFilter - include Queries::Filters::Shared::ProjectFilter + include Queries::Filters::Shared::ProjectFilter::Optional def left_outer_joins [:query] diff --git a/app/models/queries/views/filters/type_filter.rb b/app/models/queries/views/filters/type_filter.rb index 2e6b3298146..20f60ee2b9e 100644 --- a/app/models/queries/views/filters/type_filter.rb +++ b/app/models/queries/views/filters/type_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/views/filters/view_filter.rb b/app/models/queries/views/filters/view_filter.rb index 4a544f0f114..3d76759150e 100644 --- a/app/models/queries/views/filters/view_filter.rb +++ b/app/models/queries/views/filters/view_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/views/orders/default_order.rb b/app/models/queries/views/orders/default_order.rb index f18649892a7..8dfe8251b96 100644 --- a/app/models/queries/views/orders/default_order.rb +++ b/app/models/queries/views/orders/default_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/views/view_query.rb b/app/models/queries/views/view_query.rb index 97e0e9e5b4c..0c2a4f31d61 100644 --- a/app/models/queries/views/view_query.rb +++ b/app/models/queries/views/view_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/week_days/week_day_query.rb b/app/models/queries/week_days/week_day_query.rb index 299bf9084e8..4fb08a0875c 100644 --- a/app/models/queries/week_days/week_day_query.rb +++ b/app/models/queries/week_days/week_day_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages.rb b/app/models/queries/work_packages.rb index a953f692ff9..d5f6540f6d7 100644 --- a/app/models/queries/work_packages.rb +++ b/app/models/queries/work_packages.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/common/manual_sorting.rb b/app/models/queries/work_packages/common/manual_sorting.rb index b8e22eab282..1c207c2466b 100644 --- a/app/models/queries/work_packages/common/manual_sorting.rb +++ b/app/models/queries/work_packages/common/manual_sorting.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter.rb b/app/models/queries/work_packages/filter.rb index ac58c9d63da..28369d5742b 100644 --- a/app/models/queries/work_packages/filter.rb +++ b/app/models/queries/work_packages/filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/assigned_to_filter.rb b/app/models/queries/work_packages/filter/assigned_to_filter.rb index 9c15e3f2c63..505782912f1 100644 --- a/app/models/queries/work_packages/filter/assigned_to_filter.rb +++ b/app/models/queries/work_packages/filter/assigned_to_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/assignee_or_group_filter.rb b/app/models/queries/work_packages/filter/assignee_or_group_filter.rb index f7ddf15f416..40fcf754fe5 100644 --- a/app/models/queries/work_packages/filter/assignee_or_group_filter.rb +++ b/app/models/queries/work_packages/filter/assignee_or_group_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -28,13 +28,6 @@ class Queries::WorkPackages::Filter::AssigneeOrGroupFilter < Queries::WorkPackages::Filter::PrincipalBaseFilter - def allowed_values - @allowed_values ||= begin - values = principal_loader.user_values + principal_loader.group_values - me_allowed_value + values.sort - end - end - def type :list_optional end diff --git a/app/models/queries/work_packages/filter/attachment_base_filter.rb b/app/models/queries/work_packages/filter/attachment_base_filter.rb index 204bbf2b3e3..acce7a5bfc0 100644 --- a/app/models/queries/work_packages/filter/attachment_base_filter.rb +++ b/app/models/queries/work_packages/filter/attachment_base_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/attachment_content_filter.rb b/app/models/queries/work_packages/filter/attachment_content_filter.rb index 324d4f14fdd..0253260e803 100644 --- a/app/models/queries/work_packages/filter/attachment_content_filter.rb +++ b/app/models/queries/work_packages/filter/attachment_content_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/attachment_file_name_filter.rb b/app/models/queries/work_packages/filter/attachment_file_name_filter.rb index 5f7ccb7f8d5..0821b12b039 100644 --- a/app/models/queries/work_packages/filter/attachment_file_name_filter.rb +++ b/app/models/queries/work_packages/filter/attachment_file_name_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/author_filter.rb b/app/models/queries/work_packages/filter/author_filter.rb index 1d07bfeeacd..ca9423d99d6 100644 --- a/app/models/queries/work_packages/filter/author_filter.rb +++ b/app/models/queries/work_packages/filter/author_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/blocked_filter.rb b/app/models/queries/work_packages/filter/blocked_filter.rb index 38c49228d93..e644d230cc0 100644 --- a/app/models/queries/work_packages/filter/blocked_filter.rb +++ b/app/models/queries/work_packages/filter/blocked_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/blocks_filter.rb b/app/models/queries/work_packages/filter/blocks_filter.rb index 96dc29d6143..8439c4116ee 100644 --- a/app/models/queries/work_packages/filter/blocks_filter.rb +++ b/app/models/queries/work_packages/filter/blocks_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/category_filter.rb b/app/models/queries/work_packages/filter/category_filter.rb index fede1f83805..62f54700607 100644 --- a/app/models/queries/work_packages/filter/category_filter.rb +++ b/app/models/queries/work_packages/filter/category_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/comment_filter.rb b/app/models/queries/work_packages/filter/comment_filter.rb index f07b64a88e0..e6f43e6aabc 100644 --- a/app/models/queries/work_packages/filter/comment_filter.rb +++ b/app/models/queries/work_packages/filter/comment_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/created_at_filter.rb b/app/models/queries/work_packages/filter/created_at_filter.rb index cddcb1e2012..e4191e81b72 100644 --- a/app/models/queries/work_packages/filter/created_at_filter.rb +++ b/app/models/queries/work_packages/filter/created_at_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/custom_field_context.rb b/app/models/queries/work_packages/filter/custom_field_context.rb index c0f9f777942..f5673926c38 100644 --- a/app/models/queries/work_packages/filter/custom_field_context.rb +++ b/app/models/queries/work_packages/filter/custom_field_context.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -73,5 +73,9 @@ module Queries::WorkPackages::Filter::CustomFieldContext joins end + + def where_subselect_conditions + nil + end end end diff --git a/app/models/queries/work_packages/filter/custom_field_filter.rb b/app/models/queries/work_packages/filter/custom_field_filter.rb index 673e824e50f..e31378f940d 100644 --- a/app/models/queries/work_packages/filter/custom_field_filter.rb +++ b/app/models/queries/work_packages/filter/custom_field_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/dates_interval_filter.rb b/app/models/queries/work_packages/filter/dates_interval_filter.rb index 7ee85af0bd3..dd46750bd9e 100644 --- a/app/models/queries/work_packages/filter/dates_interval_filter.rb +++ b/app/models/queries/work_packages/filter/dates_interval_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/description_filter.rb b/app/models/queries/work_packages/filter/description_filter.rb index a89ab9f55a0..2a633fa4df2 100644 --- a/app/models/queries/work_packages/filter/description_filter.rb +++ b/app/models/queries/work_packages/filter/description_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/done_ratio_filter.rb b/app/models/queries/work_packages/filter/done_ratio_filter.rb index 8cfc4c1c4bc..286e594a29f 100644 --- a/app/models/queries/work_packages/filter/done_ratio_filter.rb +++ b/app/models/queries/work_packages/filter/done_ratio_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/due_date_filter.rb b/app/models/queries/work_packages/filter/due_date_filter.rb index 5547cd0fdf2..04161878ed5 100644 --- a/app/models/queries/work_packages/filter/due_date_filter.rb +++ b/app/models/queries/work_packages/filter/due_date_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/duplicated_filter.rb b/app/models/queries/work_packages/filter/duplicated_filter.rb index 49c3cc2049f..10d27a0c531 100644 --- a/app/models/queries/work_packages/filter/duplicated_filter.rb +++ b/app/models/queries/work_packages/filter/duplicated_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/duplicates_filter.rb b/app/models/queries/work_packages/filter/duplicates_filter.rb index 065163d70fa..c8949c409be 100644 --- a/app/models/queries/work_packages/filter/duplicates_filter.rb +++ b/app/models/queries/work_packages/filter/duplicates_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/duration_filter.rb b/app/models/queries/work_packages/filter/duration_filter.rb index 29321f37c48..ab859a641d2 100644 --- a/app/models/queries/work_packages/filter/duration_filter.rb +++ b/app/models/queries/work_packages/filter/duration_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/estimated_hours_filter.rb b/app/models/queries/work_packages/filter/estimated_hours_filter.rb index f2b67af8b83..840e2136b4c 100644 --- a/app/models/queries/work_packages/filter/estimated_hours_filter.rb +++ b/app/models/queries/work_packages/filter/estimated_hours_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/filter_configuration.rb b/app/models/queries/work_packages/filter/filter_configuration.rb index f3aaa43f198..0975b27c8c4 100644 --- a/app/models/queries/work_packages/filter/filter_configuration.rb +++ b/app/models/queries/work_packages/filter/filter_configuration.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/filter_for_wp_mixin.rb b/app/models/queries/work_packages/filter/filter_for_wp_mixin.rb index 6b02c0486f3..7449c03c804 100644 --- a/app/models/queries/work_packages/filter/filter_for_wp_mixin.rb +++ b/app/models/queries/work_packages/filter/filter_for_wp_mixin.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/filter_on_directed_relations_mixin.rb b/app/models/queries/work_packages/filter/filter_on_directed_relations_mixin.rb index d3c642a0f69..da3886c5f81 100644 --- a/app/models/queries/work_packages/filter/filter_on_directed_relations_mixin.rb +++ b/app/models/queries/work_packages/filter/filter_on_directed_relations_mixin.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/filter_on_undirected_relations_mixin.rb b/app/models/queries/work_packages/filter/filter_on_undirected_relations_mixin.rb index 17192b2ce17..8a244d02fe8 100644 --- a/app/models/queries/work_packages/filter/filter_on_undirected_relations_mixin.rb +++ b/app/models/queries/work_packages/filter/filter_on_undirected_relations_mixin.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/follows_filter.rb b/app/models/queries/work_packages/filter/follows_filter.rb index cc7cc27a3b3..28d5c4669a1 100644 --- a/app/models/queries/work_packages/filter/follows_filter.rb +++ b/app/models/queries/work_packages/filter/follows_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/group_filter.rb b/app/models/queries/work_packages/filter/group_filter.rb index eb8de88d5dc..5e919a05a86 100644 --- a/app/models/queries/work_packages/filter/group_filter.rb +++ b/app/models/queries/work_packages/filter/group_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/id_filter.rb b/app/models/queries/work_packages/filter/id_filter.rb index 9cb200e91d1..197bbbb69b6 100644 --- a/app/models/queries/work_packages/filter/id_filter.rb +++ b/app/models/queries/work_packages/filter/id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/includes_filter.rb b/app/models/queries/work_packages/filter/includes_filter.rb index 5a4831e3c0d..a3e91c8694a 100644 --- a/app/models/queries/work_packages/filter/includes_filter.rb +++ b/app/models/queries/work_packages/filter/includes_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/manual_sort_filter.rb b/app/models/queries/work_packages/filter/manual_sort_filter.rb index 66eddd57236..79e526d466b 100644 --- a/app/models/queries/work_packages/filter/manual_sort_filter.rb +++ b/app/models/queries/work_packages/filter/manual_sort_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/me_value_filter_mixin.rb b/app/models/queries/work_packages/filter/me_value_filter_mixin.rb index e7ffe0c314b..f300c8ca20e 100644 --- a/app/models/queries/work_packages/filter/me_value_filter_mixin.rb +++ b/app/models/queries/work_packages/filter/me_value_filter_mixin.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/milestone_filter.rb b/app/models/queries/work_packages/filter/milestone_filter.rb index 111cd6fe4cb..7f93e1718ca 100644 --- a/app/models/queries/work_packages/filter/milestone_filter.rb +++ b/app/models/queries/work_packages/filter/milestone_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/only_subproject_filter.rb b/app/models/queries/work_packages/filter/only_subproject_filter.rb index 96a9642975f..09cf7747e93 100644 --- a/app/models/queries/work_packages/filter/only_subproject_filter.rb +++ b/app/models/queries/work_packages/filter/only_subproject_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/or_filter_for_wp_mixin.rb b/app/models/queries/work_packages/filter/or_filter_for_wp_mixin.rb index 5b2d49cffed..e511df3cba3 100644 --- a/app/models/queries/work_packages/filter/or_filter_for_wp_mixin.rb +++ b/app/models/queries/work_packages/filter/or_filter_for_wp_mixin.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/parent_filter.rb b/app/models/queries/work_packages/filter/parent_filter.rb index e1bf1ed3ca6..a10b2cc65d5 100644 --- a/app/models/queries/work_packages/filter/parent_filter.rb +++ b/app/models/queries/work_packages/filter/parent_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/partof_filter.rb b/app/models/queries/work_packages/filter/partof_filter.rb index 96392ee0921..603819970c7 100644 --- a/app/models/queries/work_packages/filter/partof_filter.rb +++ b/app/models/queries/work_packages/filter/partof_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/precedes_filter.rb b/app/models/queries/work_packages/filter/precedes_filter.rb index 03815985e1f..56613d792be 100644 --- a/app/models/queries/work_packages/filter/precedes_filter.rb +++ b/app/models/queries/work_packages/filter/precedes_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/principal_base_filter.rb b/app/models/queries/work_packages/filter/principal_base_filter.rb index 4d8d3bdcb34..b8a7ad6e12a 100644 --- a/app/models/queries/work_packages/filter/principal_base_filter.rb +++ b/app/models/queries/work_packages/filter/principal_base_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/principal_loader.rb b/app/models/queries/work_packages/filter/principal_loader.rb index 310bb8e96eb..6b904fd1cc7 100644 --- a/app/models/queries/work_packages/filter/principal_loader.rb +++ b/app/models/queries/work_packages/filter/principal_loader.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/priority_filter.rb b/app/models/queries/work_packages/filter/priority_filter.rb index e2cc9836291..d1cdd7d39aa 100644 --- a/app/models/queries/work_packages/filter/priority_filter.rb +++ b/app/models/queries/work_packages/filter/priority_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/project_filter.rb b/app/models/queries/work_packages/filter/project_filter.rb index ea1cf3f453b..02c8c675bba 100644 --- a/app/models/queries/work_packages/filter/project_filter.rb +++ b/app/models/queries/work_packages/filter/project_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/relatable_filter.rb b/app/models/queries/work_packages/filter/relatable_filter.rb index 5d917da12ce..e2ec7c71b95 100644 --- a/app/models/queries/work_packages/filter/relatable_filter.rb +++ b/app/models/queries/work_packages/filter/relatable_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/relates_filter.rb b/app/models/queries/work_packages/filter/relates_filter.rb index d45c6b6c0bc..b69f2ac7a02 100644 --- a/app/models/queries/work_packages/filter/relates_filter.rb +++ b/app/models/queries/work_packages/filter/relates_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/required_filter.rb b/app/models/queries/work_packages/filter/required_filter.rb index 1580d1ba94c..5836636ab60 100644 --- a/app/models/queries/work_packages/filter/required_filter.rb +++ b/app/models/queries/work_packages/filter/required_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/requires_filter.rb b/app/models/queries/work_packages/filter/requires_filter.rb index c519bdd8af6..2ea1ff17fad 100644 --- a/app/models/queries/work_packages/filter/requires_filter.rb +++ b/app/models/queries/work_packages/filter/requires_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/responsible_filter.rb b/app/models/queries/work_packages/filter/responsible_filter.rb index 8961735cc0e..c86f3aa7353 100644 --- a/app/models/queries/work_packages/filter/responsible_filter.rb +++ b/app/models/queries/work_packages/filter/responsible_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/role_filter.rb b/app/models/queries/work_packages/filter/role_filter.rb index db34d336c07..16ddd8583c8 100644 --- a/app/models/queries/work_packages/filter/role_filter.rb +++ b/app/models/queries/work_packages/filter/role_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/search_filter.rb b/app/models/queries/work_packages/filter/search_filter.rb index 854a18a818d..d577ab7f1df 100644 --- a/app/models/queries/work_packages/filter/search_filter.rb +++ b/app/models/queries/work_packages/filter/search_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/shared_with_me_filter.rb b/app/models/queries/work_packages/filter/shared_with_me_filter.rb index d10f85cf833..826cf02771b 100644 --- a/app/models/queries/work_packages/filter/shared_with_me_filter.rb +++ b/app/models/queries/work_packages/filter/shared_with_me_filter.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/shared_with_user_filter.rb b/app/models/queries/work_packages/filter/shared_with_user_filter.rb index a5195d7afa2..bc8e17ed0a4 100644 --- a/app/models/queries/work_packages/filter/shared_with_user_filter.rb +++ b/app/models/queries/work_packages/filter/shared_with_user_filter.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/start_date_filter.rb b/app/models/queries/work_packages/filter/start_date_filter.rb index aff79331062..0b1d2f9a47e 100644 --- a/app/models/queries/work_packages/filter/start_date_filter.rb +++ b/app/models/queries/work_packages/filter/start_date_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/status_filter.rb b/app/models/queries/work_packages/filter/status_filter.rb index a92ea2c78f7..28c6cf76c4e 100644 --- a/app/models/queries/work_packages/filter/status_filter.rb +++ b/app/models/queries/work_packages/filter/status_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/subject_filter.rb b/app/models/queries/work_packages/filter/subject_filter.rb index 5b9361708d6..b508697a8d1 100644 --- a/app/models/queries/work_packages/filter/subject_filter.rb +++ b/app/models/queries/work_packages/filter/subject_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/subject_or_id_filter.rb b/app/models/queries/work_packages/filter/subject_or_id_filter.rb index f9472f6b5fb..d34464a2e8a 100644 --- a/app/models/queries/work_packages/filter/subject_or_id_filter.rb +++ b/app/models/queries/work_packages/filter/subject_or_id_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/subproject_filter.rb b/app/models/queries/work_packages/filter/subproject_filter.rb index 468d43f289a..3202e3cb60a 100644 --- a/app/models/queries/work_packages/filter/subproject_filter.rb +++ b/app/models/queries/work_packages/filter/subproject_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -98,7 +98,10 @@ class Queries::WorkPackages::Filter::SubprojectFilter < @visible_subprojects ||= if project.nil? [] else - project.descendants.visible + project + .descendants + .visible + .active end end diff --git a/app/models/queries/work_packages/filter/text_filter_on_join_mixin.rb b/app/models/queries/work_packages/filter/text_filter_on_join_mixin.rb index 499328e0291..1961a1eccd2 100644 --- a/app/models/queries/work_packages/filter/text_filter_on_join_mixin.rb +++ b/app/models/queries/work_packages/filter/text_filter_on_join_mixin.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/type_filter.rb b/app/models/queries/work_packages/filter/type_filter.rb index a692c92956d..1a06b33eaf3 100644 --- a/app/models/queries/work_packages/filter/type_filter.rb +++ b/app/models/queries/work_packages/filter/type_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/typeahead_filter.rb b/app/models/queries/work_packages/filter/typeahead_filter.rb index c7c4c4abd23..3ad935cf19d 100644 --- a/app/models/queries/work_packages/filter/typeahead_filter.rb +++ b/app/models/queries/work_packages/filter/typeahead_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/updated_at_filter.rb b/app/models/queries/work_packages/filter/updated_at_filter.rb index 30255791289..e3a1ff517f6 100644 --- a/app/models/queries/work_packages/filter/updated_at_filter.rb +++ b/app/models/queries/work_packages/filter/updated_at_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/version_filter.rb b/app/models/queries/work_packages/filter/version_filter.rb index 79effbd6f47..9148c3c23a2 100644 --- a/app/models/queries/work_packages/filter/version_filter.rb +++ b/app/models/queries/work_packages/filter/version_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/watcher_filter.rb b/app/models/queries/work_packages/filter/watcher_filter.rb index 1c12bee7a9f..7567230b091 100644 --- a/app/models/queries/work_packages/filter/watcher_filter.rb +++ b/app/models/queries/work_packages/filter/watcher_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter/work_package_filter.rb b/app/models/queries/work_packages/filter/work_package_filter.rb index 2cfd3449dd4..2652c9a9b0c 100644 --- a/app/models/queries/work_packages/filter/work_package_filter.rb +++ b/app/models/queries/work_packages/filter/work_package_filter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/filter_serializer.rb b/app/models/queries/work_packages/filter_serializer.rb index fa6012aac37..e93322106a8 100644 --- a/app/models/queries/work_packages/filter_serializer.rb +++ b/app/models/queries/work_packages/filter_serializer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/selects/custom_field_select.rb b/app/models/queries/work_packages/selects/custom_field_select.rb index 18446e4b2c1..c6e2a107d5d 100644 --- a/app/models/queries/work_packages/selects/custom_field_select.rb +++ b/app/models/queries/work_packages/selects/custom_field_select.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/selects/manual_sorting_select.rb b/app/models/queries/work_packages/selects/manual_sorting_select.rb index 8cc86329e3f..69c88365f17 100644 --- a/app/models/queries/work_packages/selects/manual_sorting_select.rb +++ b/app/models/queries/work_packages/selects/manual_sorting_select.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/selects/property_select.rb b/app/models/queries/work_packages/selects/property_select.rb index 4a4ccead99d..48635b1c296 100644 --- a/app/models/queries/work_packages/selects/property_select.rb +++ b/app/models/queries/work_packages/selects/property_select.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/selects/relation_of_type_select.rb b/app/models/queries/work_packages/selects/relation_of_type_select.rb index 5a7a536b8d7..eb6809cec69 100644 --- a/app/models/queries/work_packages/selects/relation_of_type_select.rb +++ b/app/models/queries/work_packages/selects/relation_of_type_select.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/selects/relation_select.rb b/app/models/queries/work_packages/selects/relation_select.rb index ddada8dfa64..c12f7663eb2 100644 --- a/app/models/queries/work_packages/selects/relation_select.rb +++ b/app/models/queries/work_packages/selects/relation_select.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/selects/relation_to_type_select.rb b/app/models/queries/work_packages/selects/relation_to_type_select.rb index 3b5c921ceec..cd6ddcd432f 100644 --- a/app/models/queries/work_packages/selects/relation_to_type_select.rb +++ b/app/models/queries/work_packages/selects/relation_to_type_select.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/selects/typeahead_select.rb b/app/models/queries/work_packages/selects/typeahead_select.rb index a9efbe8b5dc..1e6ba666314 100644 --- a/app/models/queries/work_packages/selects/typeahead_select.rb +++ b/app/models/queries/work_packages/selects/typeahead_select.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/queries/work_packages/selects/work_package_select.rb b/app/models/queries/work_packages/selects/work_package_select.rb index bc5e3b72f75..a3ffe42aa3b 100644 --- a/app/models/queries/work_packages/selects/work_package_select.rb +++ b/app/models/queries/work_packages/selects/work_package_select.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/query.rb b/app/models/query.rb index 80b321cd40a..d8051b6b1d0 100644 --- a/app/models/query.rb +++ b/app/models/query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/query/highlighting.rb b/app/models/query/highlighting.rb index 25915f26cbb..79c3c242a42 100644 --- a/app/models/query/highlighting.rb +++ b/app/models/query/highlighting.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/query/manual_sorting.rb b/app/models/query/manual_sorting.rb index 94ca3ccaaed..a4573534af8 100644 --- a/app/models/query/manual_sorting.rb +++ b/app/models/query/manual_sorting.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/query/results.rb b/app/models/query/results.rb index f00638ac408..dbf58dcbfa8 100644 --- a/app/models/query/results.rb +++ b/app/models/query/results.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class ::Query::Results +class Query::Results include ::Query::Results::GroupBy include ::Query::Results::Sums include Redmine::I18n diff --git a/app/models/query/results/group_by.rb b/app/models/query/results/group_by.rb index b708a802fac..b5609d28e87 100644 --- a/app/models/query/results/group_by.rb +++ b/app/models/query/results/group_by.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/query/results/sums.rb b/app/models/query/results/sums.rb index ff0bfaebde4..23509ef6656 100644 --- a/app/models/query/results/sums.rb +++ b/app/models/query/results/sums.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/query/sort_criteria.rb b/app/models/query/sort_criteria.rb index 5f3f2006b02..14d172396a8 100644 --- a/app/models/query/sort_criteria.rb +++ b/app/models/query/sort_criteria.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class ::Query::SortCriteria < SortHelper::SortCriteria +class Query::SortCriteria < SortHelper::SortCriteria attr_reader :available_columns ## diff --git a/app/models/query/statement_invalid.rb b/app/models/query/statement_invalid.rb index 9e8847e321f..3ae50ed2dbe 100644 --- a/app/models/query/statement_invalid.rb +++ b/app/models/query/statement_invalid.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,5 +26,5 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class ::Query::StatementInvalid < ActiveRecord::StatementInvalid +class Query::StatementInvalid < ActiveRecord::StatementInvalid end diff --git a/app/models/query/timelines.rb b/app/models/query/timelines.rb index 997a522c420..6b445283418 100644 --- a/app/models/query/timelines.rb +++ b/app/models/query/timelines.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/query/timestamps.rb b/app/models/query/timestamps.rb index d881d9b2352..de32c2b4025 100644 --- a/app/models/query/timestamps.rb +++ b/app/models/query/timestamps.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/relation.rb b/app/models/relation.rb index a39f733dad7..f57f195fb1f 100644 --- a/app/models/relation.rb +++ b/app/models/relation.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/relations/scopes/follows_non_manual_ancestors.rb b/app/models/relations/scopes/follows_non_manual_ancestors.rb index 939c1d98749..785517713e9 100644 --- a/app/models/relations/scopes/follows_non_manual_ancestors.rb +++ b/app/models/relations/scopes/follows_non_manual_ancestors.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/relations/scopes/types.rb b/app/models/relations/scopes/types.rb index 826f62d6b9e..147e8f825cc 100644 --- a/app/models/relations/scopes/types.rb +++ b/app/models/relations/scopes/types.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/relations/scopes/visible.rb b/app/models/relations/scopes/visible.rb index 12863719649..e2522cc1fdb 100644 --- a/app/models/relations/scopes/visible.rb +++ b/app/models/relations/scopes/visible.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/remote_identity.rb b/app/models/remote_identity.rb new file mode 100644 index 00000000000..94ac387f93a --- /dev/null +++ b/app/models/remote_identity.rb @@ -0,0 +1,37 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class RemoteIdentity < ApplicationRecord + belongs_to :user + belongs_to :oauth_client, class_name: "OAuthClient" + + validates :user, uniqueness: { scope: :oauth_client } + validates :origin_user_id, :user, :oauth_client, presence: true +end diff --git a/app/models/repository.rb b/app/models/repository.rb index 8445028ef00..8d7c4bb52c0 100644 --- a/app/models/repository.rb +++ b/app/models/repository.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/repository/git.rb b/app/models/repository/git.rb index 86477f305fe..71e295d63e6 100644 --- a/app/models/repository/git.rb +++ b/app/models/repository/git.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/repository/subversion.rb b/app/models/repository/subversion.rb index 0e6032c2e69..f8e5fb02799 100644 --- a/app/models/repository/subversion.rb +++ b/app/models/repository/subversion.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/role.rb b/app/models/role.rb index 3376219b895..bbaff72cd4a 100644 --- a/app/models/role.rb +++ b/app/models/role.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/role_permission.rb b/app/models/role_permission.rb index 99435926f28..b341d44c0ff 100644 --- a/app/models/role_permission.rb +++ b/app/models/role_permission.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/scopes/scoped.rb b/app/models/scopes/scoped.rb index de9dd0d5264..129fe19397d 100644 --- a/app/models/scopes/scoped.rb +++ b/app/models/scopes/scoped.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/serializers/indifferent_hash_serializer.rb b/app/models/serializers/indifferent_hash_serializer.rb index f1bc416f2c1..aa150dc7ec0 100644 --- a/app/models/serializers/indifferent_hash_serializer.rb +++ b/app/models/serializers/indifferent_hash_serializer.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/sessions/sql_bypass.rb b/app/models/sessions/sql_bypass.rb index 4ac66bbfca6..e0283e4f444 100644 --- a/app/models/sessions/sql_bypass.rb +++ b/app/models/sessions/sql_bypass.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/sessions/user_session.rb b/app/models/sessions/user_session.rb index d54c438f644..1a0d40e751d 100644 --- a/app/models/sessions/user_session.rb +++ b/app/models/sessions/user_session.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/setting.rb b/app/models/setting.rb index 0d885dd16a1..654e2452751 100644 --- a/app/models/setting.rb +++ b/app/models/setting.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/setting/aliases.rb b/app/models/setting/aliases.rb index cc008cf2833..98aa5bbbf4f 100644 --- a/app/models/setting/aliases.rb +++ b/app/models/setting/aliases.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -43,7 +43,13 @@ class Setting ## # Host name without protocol def host_without_protocol - Setting.host_name.split(":").first + Setting.host_name&.split(":")&.first + end + + ## + # Port from host_name if set + def optional_port_from_host_name + Setting.host_name&.split(":")&.[](1) end end end diff --git a/app/models/setting/autologin.rb b/app/models/setting/autologin.rb index cba4efc9340..fae2be5ed42 100644 --- a/app/models/setting/autologin.rb +++ b/app/models/setting/autologin.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/setting/mail_settings.rb b/app/models/setting/mail_settings.rb index 8447ab0d6e3..329dd248419 100644 --- a/app/models/setting/mail_settings.rb +++ b/app/models/setting/mail_settings.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/setting/self_registration.rb b/app/models/setting/self_registration.rb index ac45be5d3ea..d41b3191201 100644 --- a/app/models/setting/self_registration.rb +++ b/app/models/setting/self_registration.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/setting/virus_scanning.rb b/app/models/setting/virus_scanning.rb index 91161f54fbf..c1035b174c1 100644 --- a/app/models/setting/virus_scanning.rb +++ b/app/models/setting/virus_scanning.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/sharing_strategies/base_strategy.rb b/app/models/sharing_strategies/base_strategy.rb index e28dbf2e55a..bff01d94d89 100644 --- a/app/models/sharing_strategies/base_strategy.rb +++ b/app/models/sharing_strategies/base_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -30,9 +30,10 @@ module SharingStrategies class BaseStrategy attr_reader :entity, :user - def initialize(entity, user: User.current) + def initialize(entity, query_params:, user: User.current) @entity = entity @user = user + @query_params = query_params end def available_roles @@ -61,6 +62,14 @@ module SharingStrategies raise NotImplementedError, "Override in a subclass and return the contract class for deleting a share" end + def share_description(share) + raise NotImplementedError, "Override in a subclass and return a description for the shared user" + end + + def title + raise NotImplementedError, "Override in a subclass and return a title for the sharing dialog" + end + def custom_body_components? !additional_body_components.empty? end @@ -79,5 +88,37 @@ module SharingStrategies def empty_state_component nil end + + def modal_body_component(errors) + Shares::ModalBodyComponent.new(strategy: self, errors:) + end + + def manage_shares_component(modal_content:, errors:) + Shares::ManageSharesComponent.new(strategy: self, modal_content:, errors:) + end + + def query # rubocop:disable Metrics/AbcSize + return @query if defined?(@query) + + @query = ParamsToQueryService + .new(Member, user, query_class: Queries::Members::NonInheritedMemberQuery) + .call(@query_params) + + # Set default filter on the entity + @query.where("entity_id", "=", entity.id) + @query.where("entity_type", "=", entity.class.name) + if entity.respond_to?(:project) + @query.where("project_id", "=", entity.project.id) + end + + @query.order(name: :asc) unless @query_params[:sortBy] + + @query + end + + def shares(reload: false) + @shares = nil if reload + @shares ||= query.results + end end end diff --git a/app/models/sharing_strategies/project_query_strategy.rb b/app/models/sharing_strategies/project_query_strategy.rb index 574a41ec392..eb05b1970d7 100644 --- a/app/models/sharing_strategies/project_query_strategy.rb +++ b/app/models/sharing_strategies/project_query_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -76,5 +76,84 @@ module SharingStrategies def empty_state_component Shares::ProjectQueries::EmptyStateComponent end + + def shares(reload: false) + results = super + return results if filter_for_groups? + + if (!filtered_by_role? && results.present?) || owner_matches_role_filter? + (results + [virtual_owner_share]).sort_by { |share| share.principal.name } + else + results + end + end + + def share_description(share) # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity + return I18n.t("sharing.user_details.invited") if !manageable? && share.principal.invited? + return "" if !manageable? + + scope = %i[sharing project_queries user_details] + + if share.principal == entity.user + I18n.t(:owner, scope:) + elsif entity.public? + if share.principal.is_a?(User) && share.principal.allowed_globally?(:manage_public_project_queries) + I18n.t(:can_manage_public_lists, scope:) + elsif share.roles.any? { |role| role.builtin == Role::BUILTIN_PROJECT_QUERY_VIEW } + I18n.t(:can_view_because_public, scope:) + end + end + end + + def manage_shares_component(modal_content:, errors:) + if EnterpriseToken.allows_to?(:project_list_sharing) + super + else + Shares::ProjectQueries::UpsaleComponent.new(modal_content:) + end + end + + def title + I18n.t(:label_share_project_list) + end + + private + + def virtual_owner_share + @virtual_owner_share ||= Member.new( + entity:, + principal: entity.user, + roles: [owner_role] + ) + end + + def owner_role + @owner_role ||= if entity.editable?(entity.user) + ProjectQueryRole.find_by(builtin: Role::BUILTIN_PROJECT_QUERY_EDIT) + else + ProjectQueryRole.find_by(builtin: Role::BUILTIN_PROJECT_QUERY_VIEW) + end + end + + def filtered_by_role? + role_filter.present? + end + + def role_filter + @role_filter ||= query.filters.find { |filter| filter.is_a?(Queries::Members::Filters::RoleFilter) } + end + + def owner_matches_role_filter? + return false unless filtered_by_role? + + role_filter.values.include?(owner_role.id.to_s) # rubocop:disable Performance/InefficientHashSearch + end + + def filter_for_groups? + principal_filter = query.filters.find { |filter| filter.is_a?(Queries::Members::Filters::PrincipalTypeFilter) } + return false if principal_filter.nil? + + principal_filter.values.count == 1 && principal_filter.values.include?("Group") # rubocop:disable Performance/InefficientHashSearch + end end end diff --git a/app/models/sharing_strategies/work_package_strategy.rb b/app/models/sharing_strategies/work_package_strategy.rb index 3d24ef89a81..556767dc08a 100644 --- a/app/models/sharing_strategies/work_package_strategy.rb +++ b/app/models/sharing_strategies/work_package_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -53,6 +53,40 @@ module SharingStrategies user.allowed_in_project?(:view_shared_work_packages, @entity.project) end + def share_description(share) # rubocop:disable Metrics/PerceivedComplexity,Metrics/AbcSize + scope = %i[sharing user_details] + + return I18n.t(:invited, scope:) if !manageable? && share.principal.invited? + return "" if !manageable? + + if share.principal.is_a?(Group) + if project_member?(share) + I18n.t(:project_group, scope:) + else + I18n.t(:not_project_group, scope:) + end + + elsif group_member?(share) + if has_roles_via_group_membership?(share) + if project_member?(share) + I18n.t(:additional_privileges_project_or_group, scope:) + else + I18n.t(:additional_privileges_group, scope:) + end + elsif inherited_project_member?(share) + I18n.t(:additional_privileges_project_or_group, scope:) + elsif project_member?(share) + I18n.t(:additional_privileges_project, scope:) + else + I18n.t(:not_project_member, scope:) + end + elsif project_member?(share) + I18n.t(:additional_privileges_project, scope:) + else + I18n.t(:not_project_member, scope:) + end + end + def create_contract_class Shares::WorkPackages::CreateContract end @@ -64,5 +98,39 @@ module SharingStrategies def delete_contract_class Shares::WorkPackages::DeleteContract end + + def modal_body_component(errors) + if EnterpriseToken.allows_to?(:work_package_sharing) + super + else + Shares::WorkPackages::ModalUpsaleComponent.new + end + end + + def title + I18n.t(:label_share_work_package) + end + + private + + def project_member?(share) + Member.exists?(project: share.entity.project, principal: share.principal, entity: nil) + end + + def group_member?(share) + GroupUser.where(user_id: share.principal.id).any? + end + + def has_roles_via_group_membership?(share) + share.member_roles.where.not(inherited_from: nil).any? + end + + def inherited_project_member?(share) + Member.includes(:roles) + .references(:member_roles) + .where(project: share.project, principal: share.principal, entity: nil) + .merge(MemberRole.only_inherited) + .any? + end end end diff --git a/app/models/status.rb b/app/models/status.rb index 01be255ac35..1ca04da06be 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/status/inexistent_status.rb b/app/models/status/inexistent_status.rb index 0c536dc39fd..20d51119428 100644 --- a/app/models/status/inexistent_status.rb +++ b/app/models/status/inexistent_status.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/system_user.rb b/app/models/system_user.rb index decfe36e7fa..1a3195dacc4 100644 --- a/app/models/system_user.rb +++ b/app/models/system_user.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/timestamp.rb b/app/models/timestamp.rb index 8abd244f84c..a8bf9f4cb84 100644 --- a/app/models/timestamp.rb +++ b/app/models/timestamp.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/token/api.rb b/app/models/token/api.rb index dca73edcac5..8b62546e0db 100644 --- a/app/models/token/api.rb +++ b/app/models/token/api.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/token/auto_login.rb b/app/models/token/auto_login.rb index 92b975853ed..5ea45679bfe 100644 --- a/app/models/token/auto_login.rb +++ b/app/models/token/auto_login.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/token/backup.rb b/app/models/token/backup.rb index c74271720cb..30baaacd72f 100644 --- a/app/models/token/backup.rb +++ b/app/models/token/backup.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/token/enterprise_trial_key.rb b/app/models/token/enterprise_trial_key.rb index 224a657c08f..c5b608e8550 100644 --- a/app/models/token/enterprise_trial_key.rb +++ b/app/models/token/enterprise_trial_key.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/token/ical.rb b/app/models/token/ical.rb index b93c72b19ff..b58743f2fd8 100644 --- a/app/models/token/ical.rb +++ b/app/models/token/ical.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/token/invitation.rb b/app/models/token/invitation.rb index 99acb0434f8..8b66a7730dc 100644 --- a/app/models/token/invitation.rb +++ b/app/models/token/invitation.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/token/recovery.rb b/app/models/token/recovery.rb index 6ab4f08d417..8f66d385f5b 100644 --- a/app/models/token/recovery.rb +++ b/app/models/token/recovery.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/token/rss.rb b/app/models/token/rss.rb index d1589d6ead5..043a4cb94ff 100644 --- a/app/models/token/rss.rb +++ b/app/models/token/rss.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/type.rb b/app/models/type.rb index 5465bad85bc..2c7deb92807 100644 --- a/app/models/type.rb +++ b/app/models/type.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,7 @@ # See COPYRIGHT and LICENSE files for more details. #++ -class ::Type < ApplicationRecord +class Type < ApplicationRecord # Work Package attributes for this type # and constraints to specific attributes (by plugins). include ::Type::Attributes diff --git a/app/models/type/attribute_group.rb b/app/models/type/attribute_group.rb index 5c0df238399..a58b55bf04b 100644 --- a/app/models/type/attribute_group.rb +++ b/app/models/type/attribute_group.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/type/attribute_groups.rb b/app/models/type/attribute_groups.rb index 235baa21427..de5ba4e0233 100644 --- a/app/models/type/attribute_groups.rb +++ b/app/models/type/attribute_groups.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/type/attributes.rb b/app/models/type/attributes.rb index fc7952c146d..61a0cc8f3c8 100644 --- a/app/models/type/attributes.rb +++ b/app/models/type/attributes.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/type/form_group.rb b/app/models/type/form_group.rb index e44aaf4c292..967a76cdc91 100644 --- a/app/models/type/form_group.rb +++ b/app/models/type/form_group.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/type/inexistent_type.rb b/app/models/type/inexistent_type.rb index bb438d52b0d..5cf6b8c1974 100644 --- a/app/models/type/inexistent_type.rb +++ b/app/models/type/inexistent_type.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/type/query_group.rb b/app/models/type/query_group.rb index caa40011b74..b9e4d6b41a6 100644 --- a/app/models/type/query_group.rb +++ b/app/models/type/query_group.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/types/scopes/milestone.rb b/app/models/types/scopes/milestone.rb index 42ccd7c4370..984a2a362c3 100644 --- a/app/models/types/scopes/milestone.rb +++ b/app/models/types/scopes/milestone.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/user.rb b/app/models/user.rb index 191049c27de..23e85c02b3b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -90,6 +90,8 @@ class User < Principal inverse_of: :user, dependent: :destroy + has_many :remote_identities, dependent: :destroy + # Users blocked via brute force prevention # use lambda here, so time is evaluated on each query scope :blocked, -> { create_blocked_scope(self, true) } @@ -187,6 +189,15 @@ class User < Principal write_attribute(:mail, arg.to_s.strip) end + def self.available_custom_fields(_user) + user = User.current + RequestStore.fetch(:"#{name.underscore}_custom_fields_#{user.id}_#{user.admin?}") do + scope = CustomField.where(type: "#{name}CustomField").order(:position) + scope = scope.where(admin_only: false) if !user.admin? + scope + end + end + def self.search_in_project(query, options) options.fetch(:project).users.like(query) end diff --git a/app/models/user_custom_field.rb b/app/models/user_custom_field.rb index 7d3d58bd8e2..a3c75f5a233 100644 --- a/app/models/user_custom_field.rb +++ b/app/models/user_custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/user_password.rb b/app/models/user_password.rb index 20a1618844b..8e2bccb04a7 100644 --- a/app/models/user_password.rb +++ b/app/models/user_password.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/user_password/bcrypt.rb b/app/models/user_password/bcrypt.rb index 8c9a087e959..cdab238e5bb 100644 --- a/app/models/user_password/bcrypt.rb +++ b/app/models/user_password/bcrypt.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/user_password/sha1.rb b/app/models/user_password/sha1.rb index 21d89932d7f..71b125ab101 100644 --- a/app/models/user_password/sha1.rb +++ b/app/models/user_password/sha1.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/user_preference.rb b/app/models/user_preference.rb index b242b7771cd..a2f49ede552 100644 --- a/app/models/user_preference.rb +++ b/app/models/user_preference.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/user_preferences/schema.rb b/app/models/user_preferences/schema.rb index 222ffd0bf70..3902d3e325a 100644 --- a/app/models/user_preferences/schema.rb +++ b/app/models/user_preferences/schema.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -23,7 +23,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# See docs/COPYRIGHT.rdoc for more details. +# See COPYRIGHT and LICENSE files for more details. #++ class UserPreferences::Schema diff --git a/app/models/users/inexistent_user.rb b/app/models/users/inexistent_user.rb index fe83f4e7865..1d970832e46 100644 --- a/app/models/users/inexistent_user.rb +++ b/app/models/users/inexistent_user.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/permission_checks.rb b/app/models/users/permission_checks.rb index 3c60d3377de..1703f748b96 100644 --- a/app/models/users/permission_checks.rb +++ b/app/models/users/permission_checks.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/project_authorization_cache.rb b/app/models/users/project_authorization_cache.rb index b2997508c80..68b9a5c1659 100644 --- a/app/models/users/project_authorization_cache.rb +++ b/app/models/users/project_authorization_cache.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/project_role_cache.rb b/app/models/users/project_role_cache.rb index 290cc54b5ae..56c629d2654 100644 --- a/app/models/users/project_role_cache.rb +++ b/app/models/users/project_role_cache.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/scopes/find_by_login.rb b/app/models/users/scopes/find_by_login.rb index c516028d14d..a32e1d9c0c2 100644 --- a/app/models/users/scopes/find_by_login.rb +++ b/app/models/users/scopes/find_by_login.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/scopes/having_reminder_mail_to_send.rb b/app/models/users/scopes/having_reminder_mail_to_send.rb index 0b59bce243f..f9170672bf0 100644 --- a/app/models/users/scopes/having_reminder_mail_to_send.rb +++ b/app/models/users/scopes/having_reminder_mail_to_send.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/scopes/newest.rb b/app/models/users/scopes/newest.rb index 9708ce57776..237bcc2f887 100644 --- a/app/models/users/scopes/newest.rb +++ b/app/models/users/scopes/newest.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/scopes/notified_globally.rb b/app/models/users/scopes/notified_globally.rb index e3c2c4923ce..dba377362fc 100644 --- a/app/models/users/scopes/notified_globally.rb +++ b/app/models/users/scopes/notified_globally.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/scopes/watcher_recipients.rb b/app/models/users/scopes/watcher_recipients.rb index c35c13e58e8..4c8694d7179 100644 --- a/app/models/users/scopes/watcher_recipients.rb +++ b/app/models/users/scopes/watcher_recipients.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/users/scopes/with_time_zone.rb b/app/models/users/scopes/with_time_zone.rb index 2f78a015567..6c367fcdb1a 100644 --- a/app/models/users/scopes/with_time_zone.rb +++ b/app/models/users/scopes/with_time_zone.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/version.rb b/app/models/version.rb index 4193b80cd1b..2cbd5a04621 100644 --- a/app/models/version.rb +++ b/app/models/version.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/version_custom_field.rb b/app/models/version_custom_field.rb index b8b9d726f55..25f032c5246 100644 --- a/app/models/version_custom_field.rb +++ b/app/models/version_custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/versions/project_sharing.rb b/app/models/versions/project_sharing.rb index 44526ac2b3c..9f96dfb3610 100644 --- a/app/models/versions/project_sharing.rb +++ b/app/models/versions/project_sharing.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/versions/scopes/order_by_semver_name.rb b/app/models/versions/scopes/order_by_semver_name.rb index beafdbba4a2..35545c9e8db 100644 --- a/app/models/versions/scopes/order_by_semver_name.rb +++ b/app/models/versions/scopes/order_by_semver_name.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/versions/scopes/rolled_up.rb b/app/models/versions/scopes/rolled_up.rb index 1b83ff93ede..9c18ade3596 100644 --- a/app/models/versions/scopes/rolled_up.rb +++ b/app/models/versions/scopes/rolled_up.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/versions/scopes/shared_with.rb b/app/models/versions/scopes/shared_with.rb index e3804bfb155..6b1cc420ba6 100644 --- a/app/models/versions/scopes/shared_with.rb +++ b/app/models/versions/scopes/shared_with.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/view.rb b/app/models/view.rb index d8263acf3a4..602084254ba 100644 --- a/app/models/view.rb +++ b/app/models/view.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/watcher.rb b/app/models/watcher.rb index 104cd741d42..bd05d3cc0bc 100644 --- a/app/models/watcher.rb +++ b/app/models/watcher.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/wiki.rb b/app/models/wiki.rb index b2438ae9904..91f7a3e2765 100644 --- a/app/models/wiki.rb +++ b/app/models/wiki.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/wiki_page.rb b/app/models/wiki_page.rb index 37810f31de5..9da527d8a1d 100644 --- a/app/models/wiki_page.rb +++ b/app/models/wiki_page.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -54,7 +54,7 @@ class WikiPage < ApplicationRecord acts_as_journalized - register_journal_formatted_fields(:wiki_diff, 'text') + register_journal_formatted_fields "text", formatter_key: :wiki_diff attr_accessor :redirect_existing_links diff --git a/app/models/wiki_redirect.rb b/app/models/wiki_redirect.rb index 1efe6b75b53..5189ad26ed9 100644 --- a/app/models/wiki_redirect.rb +++ b/app/models/wiki_redirect.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/wikis/annotate.rb b/app/models/wikis/annotate.rb index 2bbf1a8da1f..0469efff789 100644 --- a/app/models/wikis/annotate.rb +++ b/app/models/wikis/annotate.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/wikis/diff.rb b/app/models/wikis/diff.rb index 0258d189645..4b7e7b8fa78 100644 --- a/app/models/wikis/diff.rb +++ b/app/models/wikis/diff.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package.rb b/app/models/work_package.rb index 3c273544c96..f7aef89f0ea 100644 --- a/app/models/work_package.rb +++ b/app/models/work_package.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -204,6 +204,14 @@ class WorkPackage < ApplicationRecord include WorkPackage::Journalized prepend Journable::Timestamps + def self.status_based_mode? + Setting.work_package_done_ratio == "status" + end + + def self.work_based_mode? + Setting.work_package_done_ratio == "field" + end + def self.use_status_for_done_ratio? Setting.work_package_done_ratio == "status" end @@ -320,6 +328,18 @@ class WorkPackage < ApplicationRecord write_attribute :remaining_hours, convert_duration_to_hours(hours) end + def done_ratio=(value) + write_attribute :done_ratio, convert_value_to_percentage(value) + end + + def set_derived_progress_hint(field_name, hint, **params) + derived_progress_hints[field_name] = ProgressHint.new("#{field_name}.#{hint}", params) + end + + def derived_progress_hint(field_name) + derived_progress_hints[field_name] + end + def duration_in_hours duration ? duration * 24 : nil end @@ -533,6 +553,10 @@ class WorkPackage < ApplicationRecord private + def derived_progress_hints + @derived_progress_hints ||= {} + end + def add_time_entry_for(user, attributes) return if time_entry_blank?(attributes) @@ -545,7 +569,7 @@ class WorkPackage < ApplicationRecord def convert_duration_to_hours(value) if value.is_a?(String) begin - value = value.blank? ? nil : DurationConverter.parse(value) + value = DurationConverter.parse(value) rescue ChronicDuration::DurationParseError # keep invalid value, error shall be caught by numericality validator end @@ -553,6 +577,13 @@ class WorkPackage < ApplicationRecord value end + def convert_value_to_percentage(value) + if value.is_a?(String) && PercentageConverter.valid?(value) + value = PercentageConverter.parse(value) + end + value + end + ## # Checks if the time entry defined by the given attributes is blank. # A time entry counts as blank despite a selected activity if that activity diff --git a/app/models/work_package/ancestors.rb b/app/models/work_package/ancestors.rb index 789817b18cd..cef1188ce1f 100644 --- a/app/models/work_package/ancestors.rb +++ b/app/models/work_package/ancestors.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/ask_before_destruction.rb b/app/models/work_package/ask_before_destruction.rb index 12378539003..a0df735b596 100644 --- a/app/models/work_package/ask_before_destruction.rb +++ b/app/models/work_package/ask_before_destruction.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/custom_actioned.rb b/app/models/work_package/custom_actioned.rb index fa631c1bb3f..146fff0e0ab 100644 --- a/app/models/work_package/custom_actioned.rb +++ b/app/models/work_package/custom_actioned.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/csv.rb b/app/models/work_package/exports/csv.rb index bbb01bee2ea..a16a5309f1e 100644 --- a/app/models/work_package/exports/csv.rb +++ b/app/models/work_package/exports/csv.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -39,11 +39,19 @@ module WorkPackage::Exports end def csv_headers + return super unless with_descriptions + super + [WorkPackage.human_attribute_name(:description)] end + def with_descriptions + ActiveModel::Type::Boolean.new.cast(options[:show_descriptions]) + end + # fetch all row values def csv_row(work_package) + return super unless with_descriptions + super.tap do |row| if row.any? row << if work_package.description diff --git a/app/models/work_package/exports/formatters/compound_hours.rb b/app/models/work_package/exports/formatters/compound_hours.rb index 83fc4940327..c7f74b03eef 100644 --- a/app/models/work_package/exports/formatters/compound_hours.rb +++ b/app/models/work_package/exports/formatters/compound_hours.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/formatters/costs.rb b/app/models/work_package/exports/formatters/costs.rb index 9ebe5b34852..9133f3cfe02 100644 --- a/app/models/work_package/exports/formatters/costs.rb +++ b/app/models/work_package/exports/formatters/costs.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/formatters/currency.rb b/app/models/work_package/exports/formatters/currency.rb index 01e03b09079..29795fe0286 100644 --- a/app/models/work_package/exports/formatters/currency.rb +++ b/app/models/work_package/exports/formatters/currency.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/formatters/days.rb b/app/models/work_package/exports/formatters/days.rb index 0a8c8928b9c..d67fca9f162 100644 --- a/app/models/work_package/exports/formatters/days.rb +++ b/app/models/work_package/exports/formatters/days.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/formatters/done_ratio.rb b/app/models/work_package/exports/formatters/done_ratio.rb index dd1a1d92963..a85a5b9c547 100644 --- a/app/models/work_package/exports/formatters/done_ratio.rb +++ b/app/models/work_package/exports/formatters/done_ratio.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/formatters/estimated_hours.rb b/app/models/work_package/exports/formatters/estimated_hours.rb index 48c61e7584f..2746de765d9 100644 --- a/app/models/work_package/exports/formatters/estimated_hours.rb +++ b/app/models/work_package/exports/formatters/estimated_hours.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/formatters/hours.rb b/app/models/work_package/exports/formatters/hours.rb index 29419f559bd..01f6e1d8bd5 100644 --- a/app/models/work_package/exports/formatters/hours.rb +++ b/app/models/work_package/exports/formatters/hours.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/formatters/remaining_hours.rb b/app/models/work_package/exports/formatters/remaining_hours.rb index c1e2e880f4b..c46434b7abd 100644 --- a/app/models/work_package/exports/formatters/remaining_hours.rb +++ b/app/models/work_package/exports/formatters/remaining_hours.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/formatters/spent_units.rb b/app/models/work_package/exports/formatters/spent_units.rb index befa6f32ce9..1da1a8c9f04 100644 --- a/app/models/work_package/exports/formatters/spent_units.rb +++ b/app/models/work_package/exports/formatters/spent_units.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/macros/attributes.rb b/app/models/work_package/exports/macros/attributes.rb index d8b30f79340..4216a45462a 100644 --- a/app/models/work_package/exports/macros/attributes.rb +++ b/app/models/work_package/exports/macros/attributes.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/exports/query_exporter.rb b/app/models/work_package/exports/query_exporter.rb index a72d20d68d2..f1620dd66e0 100644 --- a/app/models/work_package/exports/query_exporter.rb +++ b/app/models/work_package/exports/query_exporter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/hooks.rb b/app/models/work_package/hooks.rb index 24c40ac1220..751bb94baac 100644 --- a/app/models/work_package/hooks.rb +++ b/app/models/work_package/hooks.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/inexistent_work_package.rb b/app/models/work_package/inexistent_work_package.rb index e33fe46fcb0..236d87f59e3 100644 --- a/app/models/work_package/inexistent_work_package.rb +++ b/app/models/work_package/inexistent_work_package.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/journalized.rb b/app/models/work_package/journalized.rb index 310e70c561c..4289e1eb3d9 100644 --- a/app/models/work_package/journalized.rb +++ b/app/models/work_package/journalized.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -77,28 +77,29 @@ module WorkPackage::Journalized name: JournalizedProcs.event_name, url: JournalizedProcs.event_url - register_journal_formatted_fields(:id, "parent_id") - register_journal_formatted_fields(:chronic_duration, - "estimated_hours", "derived_estimated_hours", - "remaining_hours", "derived_remaining_hours") - register_journal_formatted_fields(:percentage, "done_ratio", "derived_done_ratio") - register_journal_formatted_fields(:diff, "description") - register_journal_formatted_fields(:schedule_manually, "schedule_manually") - register_journal_formatted_fields(:attachment, /attachments_?\d+/) - register_journal_formatted_fields(:custom_field, /custom_fields_\d+/) - register_journal_formatted_fields(:ignore_non_working_days, "ignore_non_working_days") - register_journal_formatted_fields(:cause, "cause") - register_journal_formatted_fields(:file_link, /file_links_?\d+/) + register_journal_formatted_fields "parent_id", formatter_key: :id + register_journal_formatted_fields "estimated_hours", "derived_estimated_hours", + "remaining_hours", "derived_remaining_hours", + formatter_key: :chronic_duration + register_journal_formatted_fields "done_ratio", "derived_done_ratio", formatter_key: :percentage + register_journal_formatted_fields "description", formatter_key: :diff + register_journal_formatted_fields "schedule_manually", formatter_key: :schedule_manually + register_journal_formatted_fields /attachments_?\d+/, formatter_key: :attachment + register_journal_formatted_fields /custom_fields_\d+/, formatter_key: :custom_field + register_journal_formatted_fields "ignore_non_working_days", formatter_key: :ignore_non_working_days + register_journal_formatted_fields "cause", formatter_key: :cause + register_journal_formatted_fields /file_links_?\d+/, formatter_key: :file_link # Joined - register_journal_formatted_fields :named_association, :parent_id, :project_id, + register_journal_formatted_fields :parent_id, :project_id, :budget_id, :status_id, :type_id, :assigned_to_id, :priority_id, :category_id, :version_id, - :author_id, :responsible_id - register_journal_formatted_fields :datetime, :start_date, :due_date - register_journal_formatted_fields :plaintext, :subject - register_journal_formatted_fields :day_count, :duration + :author_id, :responsible_id, + formatter_key: :named_association + register_journal_formatted_fields :start_date, :due_date, formatter_key: :datetime + register_journal_formatted_fields :subject, formatter_key: :plaintext + register_journal_formatted_fields :duration, formatter_key: :day_count end end diff --git a/app/models/work_package/pdf_export/attachments.rb b/app/models/work_package/pdf_export/attachments.rb index d13a032127d..7caf55ec025 100644 --- a/app/models/work_package/pdf_export/attachments.rb +++ b/app/models/work_package/pdf_export/attachments.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/common.rb b/app/models/work_package/pdf_export/common.rb index 77799797c3b..e9ccb01a6a1 100644 --- a/app/models/work_package/pdf_export/common.rb +++ b/app/models/work_package/pdf_export/common.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -282,11 +282,11 @@ module WorkPackage::PDFExport::Common end def wants_report? - options[:show_report] + options[:pdf_export_type] == "report" end def wants_gantt? - options[:gantt] + options[:pdf_export_type] == "gantt" end def with_cover? @@ -297,10 +297,6 @@ module WorkPackage::PDFExport::Common query.display_sums? end - def with_attachments? - options[:show_images] - end - def build_pdf_filename(base) suffix = "_#{title_datetime}.pdf" "#{truncate(sane_filename(base), length: 255 - suffix.length, escape: false)}#{suffix}".tr(" ", "-") diff --git a/app/models/work_package/pdf_export/cover.rb b/app/models/work_package/pdf_export/cover.rb index bebce1fdf0f..ebac1df6b50 100644 --- a/app/models/work_package/pdf_export/cover.rb +++ b/app/models/work_package/pdf_export/cover.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/gantt.rb b/app/models/work_package/pdf_export/gantt.rb index 98ab9b03070..778f286168f 100644 --- a/app/models/work_package/pdf_export/gantt.rb +++ b/app/models/work_package/pdf_export/gantt.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder.rb b/app/models/work_package/pdf_export/gantt/gantt_builder.rb index 2e570a592ff..334697cfbe7 100644 --- a/app/models/work_package/pdf_export/gantt/gantt_builder.rb +++ b/app/models/work_package/pdf_export/gantt/gantt_builder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -743,14 +743,15 @@ module WorkPackage::PDFExport::Gantt def work_package_info_line_date(work_package) if work_package.start_date == work_package.due_date - format_pdf_date(work_package.start_date) + format_pdf_date(work_package, :start_date) else - "#{format_pdf_date(work_package.start_date)} - #{format_pdf_date(work_package.due_date)}" + "#{format_pdf_date(work_package, :start_date)} - #{format_pdf_date(work_package, :due_date)}" end end - def format_pdf_date(date) - date.nil? ? "" : format_date(date) + def format_pdf_date(work_package, date_field) + date = work_package.send(date_field) + date.nil? ? I18n.t("label_no_#{date_field}") : format_date(date) end # Builds the shape for the given work package diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder_days.rb b/app/models/work_package/pdf_export/gantt/gantt_builder_days.rb index ae94d2f3bba..829e2f8bb41 100644 --- a/app/models/work_package/pdf_export/gantt/gantt_builder_days.rb +++ b/app/models/work_package/pdf_export/gantt/gantt_builder_days.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder_months.rb b/app/models/work_package/pdf_export/gantt/gantt_builder_months.rb index 7e4ae3c339d..2505a1d2de5 100644 --- a/app/models/work_package/pdf_export/gantt/gantt_builder_months.rb +++ b/app/models/work_package/pdf_export/gantt/gantt_builder_months.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder_quarters.rb b/app/models/work_package/pdf_export/gantt/gantt_builder_quarters.rb index 5942e85594c..c6767403b3f 100644 --- a/app/models/work_package/pdf_export/gantt/gantt_builder_quarters.rb +++ b/app/models/work_package/pdf_export/gantt/gantt_builder_quarters.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/gantt/gantt_builder_weeks.rb b/app/models/work_package/pdf_export/gantt/gantt_builder_weeks.rb index 54ee2e63382..f0cc8750a42 100644 --- a/app/models/work_package/pdf_export/gantt/gantt_builder_weeks.rb +++ b/app/models/work_package/pdf_export/gantt/gantt_builder_weeks.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/gantt/gantt_painter.rb b/app/models/work_package/pdf_export/gantt/gantt_painter.rb index 021cee0afb7..952b08b505b 100644 --- a/app/models/work_package/pdf_export/gantt/gantt_painter.rb +++ b/app/models/work_package/pdf_export/gantt/gantt_painter.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/markdown.rb b/app/models/work_package/pdf_export/markdown.rb index 03bdde5f746..a875f800bf8 100644 --- a/app/models/work_package/pdf_export/markdown.rb +++ b/app/models/work_package/pdf_export/markdown.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -105,12 +105,22 @@ module WorkPackage::PDFExport::Markdown private + def attachment_image_local_file(attachment) + attachment.file.local_file + rescue StandardError => e + Rails.logger.error "Failed to access attachment #{attachment.id} file: #{e}" + nil # return nil as if the id was wrong and the attachment obj has not been found + end + def attachment_image_filepath(work_package, src) # images are embedded into markup with the api-path as img.src attachment = attachment_by_api_content_src(work_package, src) - return nil if attachment.nil? || attachment.file.local_file.nil? || !pdf_embeddable?(attachment.content_type) + return nil if attachment.nil? || !pdf_embeddable?(attachment.content_type) - resize_image(attachment.file.local_file.path) + local_file = attachment_image_local_file(attachment) + return nil if local_file.nil? + + resize_image(local_file.path) end def attachment_by_api_content_src(work_package, src) diff --git a/app/models/work_package/pdf_export/markdown_field.rb b/app/models/work_package/pdf_export/markdown_field.rb index f5d45baa1dd..53ccd93dc8b 100644 --- a/app/models/work_package/pdf_export/markdown_field.rb +++ b/app/models/work_package/pdf_export/markdown_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/overview_table.rb b/app/models/work_package/pdf_export/overview_table.rb index 65b96886530..c4468466511 100644 --- a/app/models/work_package/pdf_export/overview_table.rb +++ b/app/models/work_package/pdf_export/overview_table.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/page.rb b/app/models/work_package/pdf_export/page.rb index 2d6a96f784f..ff5f1eea866 100644 --- a/app/models/work_package/pdf_export/page.rb +++ b/app/models/work_package/pdf_export/page.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/style.rb b/app/models/work_package/pdf_export/style.rb index f507fb344ad..349bc977d67 100644 --- a/app/models/work_package/pdf_export/style.rb +++ b/app/models/work_package/pdf_export/style.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/sums_table.rb b/app/models/work_package/pdf_export/sums_table.rb index 050eb3790f1..c34c08ad4eb 100644 --- a/app/models/work_package/pdf_export/sums_table.rb +++ b/app/models/work_package/pdf_export/sums_table.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/table_of_contents.rb b/app/models/work_package/pdf_export/table_of_contents.rb index 8295ef56011..8d763bb21d0 100644 --- a/app/models/work_package/pdf_export/table_of_contents.rb +++ b/app/models/work_package/pdf_export/table_of_contents.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/view.rb b/app/models/work_package/pdf_export/view.rb index cdf583dcacc..86f9c4418c6 100644 --- a/app/models/work_package/pdf_export/view.rb +++ b/app/models/work_package/pdf_export/view.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/pdf_export/work_package_detail.rb b/app/models/work_package/pdf_export/work_package_detail.rb index 632ea724c8f..24ad8fa359b 100644 --- a/app/models/work_package/pdf_export/work_package_detail.rb +++ b/app/models/work_package/pdf_export/work_package_detail.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -46,8 +46,12 @@ module WorkPackage::PDFExport::WorkPackageDetail def write_work_package_detail_content!(work_package) write_attributes_table! work_package - write_description! work_package - write_custom_fields! work_package + if options[:long_text_fields].nil? + write_description! work_package + write_custom_fields! work_package + else + write_long_text_fields! work_package + end end private @@ -58,7 +62,7 @@ module WorkPackage::PDFExport::WorkPackageDetail link_target_at_current_y(work_package.id) level_string_width = write_work_package_level!(level_path, text_style) title = get_column_value work_package, :subject - @pdf.indent(level_string_width) do + pdf.indent(level_string_width) do pdf.formatted_text([text_style.merge({ text: title })]) end end @@ -69,7 +73,7 @@ module WorkPackage::PDFExport::WorkPackageDetail level_string = "#{level_path.join('.')}. " level_string_width = measure_text_width(level_string, text_style) - @pdf.float { @pdf.formatted_text([text_style.merge({ text: level_string })]) } + pdf.float { pdf.formatted_text([text_style.merge({ text: level_string })]) } level_string_width end @@ -178,10 +182,32 @@ module WorkPackage::PDFExport::WorkPackageDetail ] end + def write_long_text_fields!(work_package) + selected_long_text_fields.each do |field_id_or_desc| + if field_id_or_desc == "description" + write_description!(work_package) + else + write_long_text_field!(work_package, field_id_or_desc.to_i) + end + end + end + + def selected_long_text_fields + @selected_long_text_fields ||= (options[:long_text_fields] || "").split + end + def write_description!(work_package) write_markdown_field!(work_package, work_package.description, WorkPackage.human_attribute_name(:description)) end + def write_long_text_field!(work_package, field_id) + custom_value = work_package.custom_field_values + .find { |cv| cv.custom_field.id == field_id && cv.custom_field.formattable? } + if custom_value&.value + write_markdown_field!(work_package, custom_value.value, custom_value.custom_field.name) + end + end + def write_custom_fields!(work_package) work_package.custom_field_values .select { |cv| cv.custom_field.formattable? } diff --git a/app/models/work_package/pdf_export/work_package_list_to_pdf.rb b/app/models/work_package/pdf_export/work_package_list_to_pdf.rb index f933b5f6ee7..cf346d0f91c 100644 --- a/app/models/work_package/pdf_export/work_package_list_to_pdf.rb +++ b/app/models/work_package/pdf_export/work_package_list_to_pdf.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -248,6 +248,6 @@ class WorkPackage::PDFExport::WorkPackageListToPdf < WorkPackage::Exports::Query end def with_images? - options[:show_images] + @with_images ||= ActiveModel::Type::Boolean.new.cast(options[:show_images]) end end diff --git a/app/models/work_package/pdf_export/work_package_to_pdf.rb b/app/models/work_package/pdf_export/work_package_to_pdf.rb index ea69bfbe572..9f85c9d9572 100644 --- a/app/models/work_package/pdf_export/work_package_to_pdf.rb +++ b/app/models/work_package/pdf_export/work_package_to_pdf.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/progress_hint.rb b/app/models/work_package/progress_hint.rb new file mode 100644 index 00000000000..9fa24566b3f --- /dev/null +++ b/app/models/work_package/progress_hint.rb @@ -0,0 +1,54 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +# Hint to be displayed in the progress popover under a progress value. +# +# `key` is like `field_name`.`hint` and is used to build up the translation +# key. `params` is the translation parameters as some translation are +# parameterized. +class WorkPackage + ProgressHint = Data.define(:key, :params) do + def initialize(key:, params: {}) + super + end + + def message + I18n.t("work_package.progress.derivation_hints.#{key}", **to_hours(params)) + end + + def reason + key.split(".", 2).last + end + + def to_hours(params) + params.transform_values { |value| DurationConverter.output(value.abs) } + end + end +end diff --git a/app/models/work_package/scheduling_rules.rb b/app/models/work_package/scheduling_rules.rb index 6b8991e7881..311ae978481 100644 --- a/app/models/work_package/scheduling_rules.rb +++ b/app/models/work_package/scheduling_rules.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/status_transitions.rb b/app/models/work_package/status_transitions.rb index b4603fdd20a..872562b49cd 100644 --- a/app/models/work_package/status_transitions.rb +++ b/app/models/work_package/status_transitions.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/time_entries_cleaner.rb b/app/models/work_package/time_entries_cleaner.rb index 03a2dbec3b5..654818a3ea8 100644 --- a/app/models/work_package/time_entries_cleaner.rb +++ b/app/models/work_package/time_entries_cleaner.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package/validations.rb b/app/models/work_package/validations.rb index 94f1c37475e..28bc8b4c5cd 100644 --- a/app/models/work_package/validations.rb +++ b/app/models/work_package/validations.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -33,8 +33,8 @@ module WorkPackage::Validations validates :subject, :priority, :project, :type, :author, :status, presence: true validates :subject, length: { maximum: 255 } - validates :done_ratio, inclusion: { in: 0..100 }, allow_nil: true - validates :estimated_hours, numericality: { allow_nil: true } + validates :done_ratio, inclusion: { in: 0..100 }, numericality: true, allow_nil: true + validates :estimated_hours, numericality: { allow_nil: true, greater_than_or_equal_to: 0 } validates :remaining_hours, numericality: { allow_nil: true, greater_than_or_equal_to: 0 } validates :derived_remaining_hours, numericality: { allow_nil: true, greater_than_or_equal_to: 0 } diff --git a/app/models/work_package_custom_field.rb b/app/models/work_package_custom_field.rb index d2f84ea2b45..1b1a68fe5bc 100644 --- a/app/models/work_package_custom_field.rb +++ b/app/models/work_package_custom_field.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_package_role.rb b/app/models/work_package_role.rb index e5e0cd2f5e6..e2fa4e9e91d 100644 --- a/app/models/work_package_role.rb +++ b/app/models/work_package_role.rb @@ -3,7 +3,7 @@ # #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/costs.rb b/app/models/work_packages/costs.rb index ede0e36c1a8..617aa805410 100644 --- a/app/models/work_packages/costs.rb +++ b/app/models/work_packages/costs.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/derived_dates.rb b/app/models/work_packages/derived_dates.rb index f8a74b43f40..182620865ef 100644 --- a/app/models/work_packages/derived_dates.rb +++ b/app/models/work_packages/derived_dates.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/relations.rb b/app/models/work_packages/relations.rb index 16bc742a02a..12dc4d3da50 100644 --- a/app/models/work_packages/relations.rb +++ b/app/models/work_packages/relations.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/scopes/allowed_to.rb b/app/models/work_packages/scopes/allowed_to.rb index 45a26ca41af..51da208c82e 100644 --- a/app/models/work_packages/scopes/allowed_to.rb +++ b/app/models/work_packages/scopes/allowed_to.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/scopes/covering_dates_and_days_of_week.rb b/app/models/work_packages/scopes/covering_dates_and_days_of_week.rb index fa352b50f66..87fb3bdda65 100644 --- a/app/models/work_packages/scopes/covering_dates_and_days_of_week.rb +++ b/app/models/work_packages/scopes/covering_dates_and_days_of_week.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/scopes/directly_related.rb b/app/models/work_packages/scopes/directly_related.rb index 5082cd06dcd..b29b99cbdfa 100644 --- a/app/models/work_packages/scopes/directly_related.rb +++ b/app/models/work_packages/scopes/directly_related.rb @@ -1,6 +1,6 @@ # --copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/scopes/for_scheduling.rb b/app/models/work_packages/scopes/for_scheduling.rb index b8e2d776547..686d6895eb8 100644 --- a/app/models/work_packages/scopes/for_scheduling.rb +++ b/app/models/work_packages/scopes/for_scheduling.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/scopes/include_derived_dates.rb b/app/models/work_packages/scopes/include_derived_dates.rb index 6d5c206a316..9a2c0ad7fc8 100644 --- a/app/models/work_packages/scopes/include_derived_dates.rb +++ b/app/models/work_packages/scopes/include_derived_dates.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/scopes/include_spent_time.rb b/app/models/work_packages/scopes/include_spent_time.rb index e2b46694127..ac0cfe3ced1 100644 --- a/app/models/work_packages/scopes/include_spent_time.rb +++ b/app/models/work_packages/scopes/include_spent_time.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -31,12 +31,11 @@ module WorkPackages::Scopes::IncludeSpentTime class_methods do def include_spent_time(user, work_package = nil) - query = join_time_entries(user) - scope = left_join_self_and_descendants(user, work_package) - .joins(query.join_sources) + .with(visible_time_entries_cte.name => allowed_to_view_time_entries(user)) + .joins(join_visible_time_entries.join_sources) .group(:id) - .select("SUM(time_entries.hours) AS hours") + .select("SUM(#{visible_time_entries_cte.name}.hours) AS hours") if work_package scope.where(id: work_package.id) @@ -47,18 +46,14 @@ module WorkPackages::Scopes::IncludeSpentTime protected - def join_time_entries(user) - join_condition = time_entries_table[:work_package_id] - .eq(wp_descendants[:id]) - .and(allowed_to_view_time_entries(user)) - + def join_visible_time_entries wp_table - .outer_join(time_entries_table) - .on(join_condition) + .outer_join(visible_time_entries_cte) + .on(visible_time_entries_cte[:work_package_id].eq(wp_descendants[:id])) end def allowed_to_view_time_entries(user) - time_entries_table[:id].in(TimeEntry.not_ongoing.visible(user).select(:id).arel) + TimeEntry.not_ongoing.visible(user).select(:id, :work_package_id, :hours).arel end def wp_table @@ -71,8 +66,8 @@ module WorkPackages::Scopes::IncludeSpentTime @wp_descendants ||= wp_table.alias("descendants") end - def time_entries_table - @time_entries_table ||= TimeEntry.arel_table + def visible_time_entries_cte + @visible_time_entries_cte ||= Arel::Table.new("visible_time_entries") end end end diff --git a/app/models/work_packages/scopes/involving_user.rb b/app/models/work_packages/scopes/involving_user.rb index fc9d4bb3ca0..da00ea9a04b 100644 --- a/app/models/work_packages/scopes/involving_user.rb +++ b/app/models/work_packages/scopes/involving_user.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/scopes/left_join_self_and_descendants.rb b/app/models/work_packages/scopes/left_join_self_and_descendants.rb index e1210fc4497..5dd0b83e8cc 100644 --- a/app/models/work_packages/scopes/left_join_self_and_descendants.rb +++ b/app/models/work_packages/scopes/left_join_self_and_descendants.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/scopes/relatable.rb b/app/models/work_packages/scopes/relatable.rb index 5190c72be2a..d78d1cdc1c7 100644 --- a/app/models/work_packages/scopes/relatable.rb +++ b/app/models/work_packages/scopes/relatable.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/work_packages/spent_time.rb b/app/models/work_packages/spent_time.rb index 276105882ff..f2088973e7c 100644 --- a/app/models/work_packages/spent_time.rb +++ b/app/models/work_packages/spent_time.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/models/workflow.rb b/app/models/workflow.rb index 2759ab965a0..ddeaa831117 100644 --- a/app/models/workflow.rb +++ b/app/models/workflow.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/policies/base_policy.rb b/app/policies/base_policy.rb index def1eda6cb2..e8446476f88 100644 --- a/app/policies/base_policy.rb +++ b/app/policies/base_policy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/policies/query_policy.rb b/app/policies/query_policy.rb index e59375ac44c..03f24e5202f 100644 --- a/app/policies/query_policy.rb +++ b/app/policies/query_policy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/policies/redirect_policy.rb b/app/policies/redirect_policy.rb index 9b672373fac..95fcb5f725d 100644 --- a/app/policies/redirect_policy.rb +++ b/app/policies/redirect_policy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/policies/scm/authorization_policy.rb b/app/policies/scm/authorization_policy.rb index cf385e34042..5cf8140405e 100644 --- a/app/policies/scm/authorization_policy.rb +++ b/app/policies/scm/authorization_policy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/policies/scm/git_authorization_policy.rb b/app/policies/scm/git_authorization_policy.rb index 1586a355f8b..c38ca9fc1eb 100644 --- a/app/policies/scm/git_authorization_policy.rb +++ b/app/policies/scm/git_authorization_policy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/policies/scm/subversion_authorization_policy.rb b/app/policies/scm/subversion_authorization_policy.rb index f42abf756aa..65e4e35a537 100644 --- a/app/policies/scm/subversion_authorization_policy.rb +++ b/app/policies/scm/subversion_authorization_policy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/policies/work_package_policy.rb b/app/policies/work_package_policy.rb index 206df16ccff..c30b4316f1c 100644 --- a/app/policies/work_package_policy.rb +++ b/app/policies/work_package_policy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/admin_user_seeder.rb b/app/seeders/admin_user_seeder.rb index 6a49e799784..861e5e3fa7e 100644 --- a/app/seeders/admin_user_seeder.rb +++ b/app/seeders/admin_user_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -50,14 +50,14 @@ class AdminUserSeeder < Seeder "No need to seed an admin as there already is one." end - def new_admin + def new_admin # rubocop:disable Metrics/AbcSize User.new.tap do |user| user.admin = true user.login = "admin" user.password = Setting.seed_admin_user_password - first, last = Setting.seed_admin_user_name.split(" ", 2) - user.firstname = first - user.lastname = last + firstname, lastname = user_name_parts(Setting.seed_admin_user_name) + user.firstname = firstname + user.lastname = lastname user.mail = Setting.seed_admin_user_mail user.language = I18n.locale.to_s user.status = User.statuses[:active] @@ -66,6 +66,16 @@ class AdminUserSeeder < Seeder end end + def user_name_parts(name) + return %w[OpenProject Admin] if name.blank? + + if name.include?(" ") + name.split(" ", 2) + else + [name, "Admin"] + end + end + def force_password_change? return false if Rails.env.development? diff --git a/app/seeders/basic_data/base_role_seeder.rb b/app/seeders/basic_data/base_role_seeder.rb index b7d6120a8d2..e1ffed74629 100644 --- a/app/seeders/basic_data/base_role_seeder.rb +++ b/app/seeders/basic_data/base_role_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/builtin_users_seeder.rb b/app/seeders/basic_data/builtin_users_seeder.rb index e50933c3e7d..64f7a76fabd 100644 --- a/app/seeders/basic_data/builtin_users_seeder.rb +++ b/app/seeders/basic_data/builtin_users_seeder.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/color_scheme_seeder.rb b/app/seeders/basic_data/color_scheme_seeder.rb index 3394a9726b5..ee548d71690 100644 --- a/app/seeders/basic_data/color_scheme_seeder.rb +++ b/app/seeders/basic_data/color_scheme_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/color_seeder.rb b/app/seeders/basic_data/color_seeder.rb index d308dfff323..225c372b704 100644 --- a/app/seeders/basic_data/color_seeder.rb +++ b/app/seeders/basic_data/color_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/global_role_seeder.rb b/app/seeders/basic_data/global_role_seeder.rb index 7c4fca5efff..483a78c95fc 100644 --- a/app/seeders/basic_data/global_role_seeder.rb +++ b/app/seeders/basic_data/global_role_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/model_seeder.rb b/app/seeders/basic_data/model_seeder.rb index 9ceb91485d3..97951880419 100644 --- a/app/seeders/basic_data/model_seeder.rb +++ b/app/seeders/basic_data/model_seeder.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/priority_seeder.rb b/app/seeders/basic_data/priority_seeder.rb index ca67ddea007..0ec9a7e41d3 100644 --- a/app/seeders/basic_data/priority_seeder.rb +++ b/app/seeders/basic_data/priority_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/project_custom_field_section_seeder.rb b/app/seeders/basic_data/project_custom_field_section_seeder.rb new file mode 100644 index 00000000000..f633a0d8b81 --- /dev/null +++ b/app/seeders/basic_data/project_custom_field_section_seeder.rb @@ -0,0 +1,41 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ +module BasicData + class ProjectCustomFieldSectionSeeder < ModelSeeder + self.model_class = ProjectCustomFieldSection + self.seed_data_model_key = "project_custom_field_sections" + self.attribute_names_for_lookups = %i[position] + + def model_attributes(section_data) + { + name: section_data["name"], + position: section_data["position"] + } + end + end +end diff --git a/app/seeders/basic_data/project_query_role_seeder.rb b/app/seeders/basic_data/project_query_role_seeder.rb index 5d6ae518258..909bec4916f 100644 --- a/app/seeders/basic_data/project_query_role_seeder.rb +++ b/app/seeders/basic_data/project_query_role_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/project_role_seeder.rb b/app/seeders/basic_data/project_role_seeder.rb index 7883c90d29c..643d66fa85d 100644 --- a/app/seeders/basic_data/project_role_seeder.rb +++ b/app/seeders/basic_data/project_role_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/setting_seeder.rb b/app/seeders/basic_data/setting_seeder.rb index 8540a8be8b8..0f4c3feec85 100644 --- a/app/seeders/basic_data/setting_seeder.rb +++ b/app/seeders/basic_data/setting_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/status_seeder.rb b/app/seeders/basic_data/status_seeder.rb index 6f26f64c155..29418e3f5e5 100644 --- a/app/seeders/basic_data/status_seeder.rb +++ b/app/seeders/basic_data/status_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/time_entry_activity_seeder.rb b/app/seeders/basic_data/time_entry_activity_seeder.rb index 002946a6349..1e5272d8fa1 100644 --- a/app/seeders/basic_data/time_entry_activity_seeder.rb +++ b/app/seeders/basic_data/time_entry_activity_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/type_configuration_seeder.rb b/app/seeders/basic_data/type_configuration_seeder.rb index 4a3f5e04dff..650a441f2f9 100644 --- a/app/seeders/basic_data/type_configuration_seeder.rb +++ b/app/seeders/basic_data/type_configuration_seeder.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/type_seeder.rb b/app/seeders/basic_data/type_seeder.rb index fd20df8a2b1..4fb5b0e51e5 100644 --- a/app/seeders/basic_data/type_seeder.rb +++ b/app/seeders/basic_data/type_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/work_package_role_seeder.rb b/app/seeders/basic_data/work_package_role_seeder.rb index f1c09cf8b8a..6b3f9ebc607 100644 --- a/app/seeders/basic_data/work_package_role_seeder.rb +++ b/app/seeders/basic_data/work_package_role_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data/workflow_seeder.rb b/app/seeders/basic_data/workflow_seeder.rb index 30e76123552..ea0fd18a9a4 100644 --- a/app/seeders/basic_data/workflow_seeder.rb +++ b/app/seeders/basic_data/workflow_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/basic_data_seeder.rb b/app/seeders/basic_data_seeder.rb index 88f90150356..cab11375391 100644 --- a/app/seeders/basic_data_seeder.rb +++ b/app/seeders/basic_data_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/common.yml b/app/seeders/common.yml index c75e9c9c766..16ca0a3560c 100644 --- a/app/seeders/common.yml +++ b/app/seeders/common.yml @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -297,6 +297,7 @@ project_roles: - :view_calendar - :comment_news - :view_wiki_pages + - :view_project_attributes - reference: :default_role_anonymous t_name: Anonymous position: 1 @@ -304,6 +305,7 @@ project_roles: permissions: - :view_work_packages - :view_wiki_pages + - :view_project_attributes - reference: :default_role_member t_name: Member position: 3 @@ -358,6 +360,7 @@ project_roles: - :view_shared_work_packages - :copy_work_packages - :add_work_package_attachments + - :view_project_attributes - reference: :default_role_reader t_name: Reader position: 4 @@ -381,6 +384,7 @@ project_roles: - :view_commit_author_statistics - :view_team_planner - :view_shared_work_packages + - :view_project_attributes - reference: :default_role_project_admin t_name: Project admin position: 5 diff --git a/app/seeders/composite_seeder.rb b/app/seeders/composite_seeder.rb index cd51995eecb..4bdfbde74cb 100644 --- a/app/seeders/composite_seeder.rb +++ b/app/seeders/composite_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/create_attachments.rb b/app/seeders/demo_data/create_attachments.rb index 8b1a2a267a1..db643f90ae5 100644 --- a/app/seeders/demo_data/create_attachments.rb +++ b/app/seeders/demo_data/create_attachments.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/global_query_seeder.rb b/app/seeders/demo_data/global_query_seeder.rb index fc1dcf2abaf..de51f2d3bae 100644 --- a/app/seeders/demo_data/global_query_seeder.rb +++ b/app/seeders/demo_data/global_query_seeder.rb @@ -1,7 +1,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/group_seeder.rb b/app/seeders/demo_data/group_seeder.rb index 476e7a50ef2..cb7bd1de2cd 100644 --- a/app/seeders/demo_data/group_seeder.rb +++ b/app/seeders/demo_data/group_seeder.rb @@ -1,7 +1,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/project_seeder.rb b/app/seeders/demo_data/project_seeder.rb index 5e005120fe8..cb7f1fb6619 100644 --- a/app/seeders/demo_data/project_seeder.rb +++ b/app/seeders/demo_data/project_seeder.rb @@ -1,7 +1,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/projects_seeder.rb b/app/seeders/demo_data/projects_seeder.rb index 13ce66e993a..1bcba578149 100644 --- a/app/seeders/demo_data/projects_seeder.rb +++ b/app/seeders/demo_data/projects_seeder.rb @@ -1,7 +1,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/query_builder.rb b/app/seeders/demo_data/query_builder.rb index e9bdc256869..22349fea3dd 100644 --- a/app/seeders/demo_data/query_builder.rb +++ b/app/seeders/demo_data/query_builder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/references.rb b/app/seeders/demo_data/references.rb index 235047fb5e9..60752ae2260 100644 --- a/app/seeders/demo_data/references.rb +++ b/app/seeders/demo_data/references.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/version_builder.rb b/app/seeders/demo_data/version_builder.rb index d7a4def7044..28f434498d5 100644 --- a/app/seeders/demo_data/version_builder.rb +++ b/app/seeders/demo_data/version_builder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/wiki_seeder.rb b/app/seeders/demo_data/wiki_seeder.rb index 47d59317ba3..56337b7cd5b 100644 --- a/app/seeders/demo_data/wiki_seeder.rb +++ b/app/seeders/demo_data/wiki_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/work_package_board_seeder.rb b/app/seeders/demo_data/work_package_board_seeder.rb index 1011df52ee6..94c3de9f4a6 100644 --- a/app/seeders/demo_data/work_package_board_seeder.rb +++ b/app/seeders/demo_data/work_package_board_seeder.rb @@ -1,7 +1,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data/work_package_seeder.rb b/app/seeders/demo_data/work_package_seeder.rb index 4306149882b..efee28ae1cd 100644 --- a/app/seeders/demo_data/work_package_seeder.rb +++ b/app/seeders/demo_data/work_package_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/demo_data_seeder.rb b/app/seeders/demo_data_seeder.rb index 006db0ddfeb..b2051e49b0e 100644 --- a/app/seeders/demo_data_seeder.rb +++ b/app/seeders/demo_data_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/development_data/custom_fields_seeder.rb b/app/seeders/development_data/custom_fields_seeder.rb index 355a4ccf40e..5dda28641bd 100644 --- a/app/seeders/development_data/custom_fields_seeder.rb +++ b/app/seeders/development_data/custom_fields_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/development_data/projects_seeder.rb b/app/seeders/development_data/projects_seeder.rb index 51677b913b7..62d1930cccf 100644 --- a/app/seeders/development_data/projects_seeder.rb +++ b/app/seeders/development_data/projects_seeder.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/development_data/shared_work_packages_seeder.rb b/app/seeders/development_data/shared_work_packages_seeder.rb index b7e215af68d..de544cf177f 100644 --- a/app/seeders/development_data/shared_work_packages_seeder.rb +++ b/app/seeders/development_data/shared_work_packages_seeder.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/development_data/users_seeder.rb b/app/seeders/development_data/users_seeder.rb index 374dfeae9a6..e7d5948e94f 100644 --- a/app/seeders/development_data/users_seeder.rb +++ b/app/seeders/development_data/users_seeder.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/development_data_seeder.rb b/app/seeders/development_data_seeder.rb index a7a9b3fad34..a60ab31bd92 100644 --- a/app/seeders/development_data_seeder.rb +++ b/app/seeders/development_data_seeder.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/env_data/ldap_seeder.rb b/app/seeders/env_data/ldap_seeder.rb index ef5003523f8..26d7b9b3bd5 100644 --- a/app/seeders/env_data/ldap_seeder.rb +++ b/app/seeders/env_data/ldap_seeder.rb @@ -1,7 +1,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/env_data_seeder.rb b/app/seeders/env_data_seeder.rb index b12ee6ebd96..bbda615cb62 100644 --- a/app/seeders/env_data_seeder.rb +++ b/app/seeders/env_data_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/modules/meeting/app/forms/meeting/title.rb b/app/seeders/oauth_applications_seeder.rb similarity index 58% rename from modules/meeting/app/forms/meeting/title.rb rename to app/seeders/oauth_applications_seeder.rb index 801c3d84a8f..b8f88606db1 100644 --- a/modules/meeting/app/forms/meeting/title.rb +++ b/app/seeders/oauth_applications_seeder.rb @@ -1,3 +1,5 @@ +# frozen_string_literal: true + #-- copyright # OpenProject is an open source project management software. # Copyright (C) 2012-2024 the OpenProject GmbH @@ -25,36 +27,37 @@ # # See COPYRIGHT and LICENSE files for more details. #++ +class OAuthApplicationsSeeder < Seeder + OPENPROJECT_MOBILE_APP_UID = "DgJZ7Rat23xHZbcq_nxPg5RUuxljonLCN7V7N7GoBAA" -class Meeting::Title < ApplicationForm - include OpenProject::StaticRouting::UrlHelpers - - form do |query_form| - query_form.group(layout: :horizontal) do |group| - group.text_field( - name: :title, - placeholder: Meeting.human_attribute_name(:title), - label: Meeting.human_attribute_name(:title), - visually_hide_label: true, - required: true, - autofocus: true - ) - - group.submit(name: :submit, label: I18n.t("button_save"), scheme: :primary) - - group.button( - name: :cancel, - scheme: :secondary, - label: I18n.t(:button_cancel), - tag: :a, - data: { "turbo-stream": true }, - href: OpenProject::StaticRouting::StaticUrlHelpers.new.cancel_edit_meeting_path(@meeting) - ) + def seed_data! + call = create_app + unless call.success? + print_error "Seeding mobile oauth application failed:" + call.errors.full_messages.each do |msg| + print_error " #{msg}" + end end end - def initialize(meeting:) - super() - @meeting = meeting + def applicable? + Doorkeeper::Application.find_by(id: OPENPROJECT_MOBILE_APP_UID).nil? + end + + def not_applicable_message + "No need to seed oauth applications as they are already present." + end + + def create_app + OAuth::Applications::CreateService + .new(user: User.system) + .call( + enabled: true, + name: "OpenProject Mobile App", + redirect_uri: "openprojectapp://oauth-callback", + builtin: true, + confidential: false, + uid: OPENPROJECT_MOBILE_APP_UID + ) end end diff --git a/app/seeders/root_seeder.rb b/app/seeders/root_seeder.rb index 840fe59b85e..f1a150e4723 100644 --- a/app/seeders/root_seeder.rb +++ b/app/seeders/root_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -70,6 +70,7 @@ class RootSeeder < Seeder # Basic data needs be seeded before anything else. seed_basic_data seed_admin_user + seed_oauth_data seed_demo_data seed_development_data if seed_development_data? seed_plugins_data @@ -132,6 +133,11 @@ class RootSeeder < Seeder AdminUserSeeder.new(seed_data).seed! end + def seed_oauth_data + print_status "*** Seeding OAuth applications" + OAuthApplicationsSeeder.new(seed_data).seed! + end + def seed_demo_data print_status "*** Seeding demo data" DemoDataSeeder.new(seed_data).seed! diff --git a/app/seeders/seeder.rb b/app/seeders/seeder.rb index 060ea4853f1..a9438416a45 100644 --- a/app/seeders/seeder.rb +++ b/app/seeders/seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/source/filter_translatables.rb b/app/seeders/source/filter_translatables.rb index a27a2434552..fb84af79c81 100644 --- a/app/seeders/source/filter_translatables.rb +++ b/app/seeders/source/filter_translatables.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/source/seed_data.rb b/app/seeders/source/seed_data.rb index aefb3aad561..f3813a98e8c 100644 --- a/app/seeders/source/seed_data.rb +++ b/app/seeders/source/seed_data.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/source/seed_data_loader.rb b/app/seeders/source/seed_data_loader.rb index b946c2504bb..49ae41554d7 100644 --- a/app/seeders/source/seed_data_loader.rb +++ b/app/seeders/source/seed_data_loader.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/source/seed_file.rb b/app/seeders/source/seed_file.rb index 310975b6c46..667c025699c 100644 --- a/app/seeders/source/seed_file.rb +++ b/app/seeders/source/seed_file.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/source/translate.rb b/app/seeders/source/translate.rb index 9228257f036..7f29cf923a6 100644 --- a/app/seeders/source/translate.rb +++ b/app/seeders/source/translate.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/seeders/standard.yml b/app/seeders/standard.yml index 69f2d18884a..a177de92970 100644 --- a/app/seeders/standard.yml +++ b/app/seeders/standard.yml @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -45,231 +45,11 @@ priorities: color_name: grape-5 position: 4 -statuses: -- reference: :default_status_new - t_name: New - color_name: cyan-7 - default_done_ratio: 0 - is_default: true - position: 1 -- reference: :default_status_in_specification - t_name: In specification - color_name: blue-2 - default_done_ratio: 10 - position: 2 -- reference: :default_status_specified - t_name: Specified - color_name: blue-2 - default_done_ratio: 20 - position: 3 -- reference: :default_status_confirmed - t_name: Confirmed - color_name: violet-2 - default_done_ratio: 20 - position: 4 -- reference: :default_status_to_be_scheduled - t_name: To be scheduled - color_name: yellow-2 - default_done_ratio: 20 - position: 5 -- reference: :default_status_scheduled - t_name: Scheduled - color_name: lime-2 - default_done_ratio: 20 - position: 6 -- reference: :default_status_in_progress - t_name: In progress - color_name: grape-5 - default_done_ratio: 40 - position: 7 -- reference: :default_status_developed - t_name: Developed - color_name: green-3 - default_done_ratio: 70 - position: 8 -- reference: :default_status_in_testing - t_name: In testing - color_name: cyan-5 - default_done_ratio: 80 - position: 9 -- reference: :default_status_tested - t_name: Tested - color_name: teal-6 - default_done_ratio: 90 - position: 10 -- reference: :default_status_test_failed - t_name: Test failed - color_name: red-5 - default_done_ratio: 70 - position: 11 -- reference: :default_status_closed - t_name: Closed - color_name: gray-3 - default_done_ratio: 100 - is_closed: true - position: 12 -- reference: :default_status_on_hold - t_name: On hold - color_name: orange-3 - default_done_ratio: 0 - position: 13 -- reference: :default_status_rejected - t_name: Rejected - color_name: red-3 - default_done_ratio: 0 - is_closed: true - position: 14 +project_custom_field_sections: + - reference: :default_project_attributes + name: Project attributes + position: 1 -time_entry_activities: -- t_name: Management - is_default: true - position: 1 -- t_name: Specification - position: 2 -- t_name: Development - position: 3 -- t_name: Testing - position: 4 -- t_name: Support - position: 5 -- t_name: Other - position: 6 - -types: -- reference: :default_type_task - t_name: Task - is_default: true - color_name: :default_color_blue - is_in_roadmap: true - position: 1 -- reference: :default_type_milestone - t_name: Milestone - is_default: true - color_name: :default_color_green_light - is_milestone: true - position: 2 -- reference: :default_type_phase - t_name: Phase - is_default: true - color_name: 'orange-5' - position: 3 -- reference: :default_type_feature - t_name: Feature - color_name: 'indigo-5' - is_in_roadmap: true - position: 4 -- reference: :default_type_epic - t_name: Epic - color_name: 'violet-5' - is_in_roadmap: true - position: 5 -- reference: :default_type_user_story - t_name: User story - color_name: :default_color_blue_light - is_in_roadmap: true - position: 6 -- reference: :default_type_bug - t_name: Bug - color_name: 'red-7' - is_in_roadmap: true - position: 7 - -workflows: -- type: :default_type_task - statuses: - - :default_status_new - - :default_status_in_progress - - :default_status_on_hold - - :default_status_rejected - - :default_status_closed -- type: :default_type_milestone - statuses: - - :default_status_new - - :default_status_to_be_scheduled - - :default_status_scheduled - - :default_status_in_progress - - :default_status_on_hold - - :default_status_rejected - - :default_status_closed -- type: :default_type_phase - statuses: - - :default_status_new - - :default_status_to_be_scheduled - - :default_status_scheduled - - :default_status_in_progress - - :default_status_on_hold - - :default_status_rejected - - :default_status_closed -- type: :default_type_feature - statuses: - - :default_status_new - - :default_status_in_specification - - :default_status_specified - - :default_status_in_progress - - :default_status_developed - - :default_status_in_testing - - :default_status_tested - - :default_status_test_failed - - :default_status_on_hold - - :default_status_rejected - - :default_status_closed -- type: :default_type_epic - statuses: - - :default_status_new - - :default_status_in_specification - - :default_status_specified - - :default_status_in_progress - - :default_status_developed - - :default_status_in_testing - - :default_status_tested - - :default_status_test_failed - - :default_status_on_hold - - :default_status_rejected - - :default_status_closed -- type: :default_type_user_story - statuses: - - :default_status_new - - :default_status_in_specification - - :default_status_specified - - :default_status_in_progress - - :default_status_developed - - :default_status_in_testing - - :default_status_tested - - :default_status_test_failed - - :default_status_on_hold - - :default_status_rejected - - :default_status_closed -- type: :default_type_bug - statuses: - - :default_status_new - - :default_status_confirmed - - :default_status_in_progress - - :default_status_developed - - :default_status_in_testing - - :default_status_tested - - :default_status_test_failed - - :default_status_on_hold - - :default_status_rejected - - :default_status_closed - -welcome: - t_title: "Welcome to OpenProject!" - t_text: | - OpenProject is the leading open source project management software. It supports classic, agile as well as hybrid project management and gives you full control over your data. - - Core features and use cases: - - * [Project Portfolio Management](https://www.openproject.org/collaboration-software-features/project-portfolio-management/) - * [Project Planning and Scheduling](https://www.openproject.org/collaboration-software-features/project-planning-scheduling/) - * [Task Management and Issue Tracking](https://www.openproject.org/collaboration-software-features/task-management/) - * [Agile Boards (Scrum and Kanban)](https://www.openproject.org/collaboration-software-features/agile-project-management/) - * [Requirements Management and Release Planning](https://www.openproject.org/collaboration-software-features/product-development/) - * [Time and Cost Tracking, Budgets](https://www.openproject.org/collaboration-software-features/time-tracking/) - * [Team Collaboration and Documentation](https://www.openproject.org/collaboration-software-features/team-collaboration/) - - Welcome to the future of project management. - - For Admins: You can change this welcome text [here]({{opSetting:base_url}}/admin/settings/general). projects: demo-project: t_name: Demo project @@ -997,3 +777,229 @@ projects: * Time boxed (3 h). * After Sprint Review, will be moderated by Scrum Master. * The team discusses the sprint: what went well, what needs to be improved to be more productive for the next sprint or even have more fun. + +statuses: + - reference: :default_status_new + t_name: New + color_name: cyan-7 + default_done_ratio: 0 + is_default: true + position: 1 + - reference: :default_status_in_specification + t_name: In specification + color_name: blue-2 + default_done_ratio: 10 + position: 2 + - reference: :default_status_specified + t_name: Specified + color_name: blue-2 + default_done_ratio: 20 + position: 3 + - reference: :default_status_confirmed + t_name: Confirmed + color_name: violet-2 + default_done_ratio: 20 + position: 4 + - reference: :default_status_to_be_scheduled + t_name: To be scheduled + color_name: yellow-2 + default_done_ratio: 20 + position: 5 + - reference: :default_status_scheduled + t_name: Scheduled + color_name: lime-2 + default_done_ratio: 20 + position: 6 + - reference: :default_status_in_progress + t_name: In progress + color_name: grape-5 + default_done_ratio: 40 + position: 7 + - reference: :default_status_developed + t_name: Developed + color_name: green-3 + default_done_ratio: 70 + position: 8 + - reference: :default_status_in_testing + t_name: In testing + color_name: cyan-5 + default_done_ratio: 80 + position: 9 + - reference: :default_status_tested + t_name: Tested + color_name: teal-6 + default_done_ratio: 90 + position: 10 + - reference: :default_status_test_failed + t_name: Test failed + color_name: red-5 + default_done_ratio: 70 + position: 11 + - reference: :default_status_closed + t_name: Closed + color_name: gray-3 + default_done_ratio: 100 + is_closed: true + position: 12 + - reference: :default_status_on_hold + t_name: On hold + color_name: orange-3 + default_done_ratio: 0 + position: 13 + - reference: :default_status_rejected + t_name: Rejected + color_name: red-3 + default_done_ratio: 0 + is_closed: true + position: 14 + +time_entry_activities: + - t_name: Management + is_default: true + position: 1 + - t_name: Specification + position: 2 + - t_name: Development + position: 3 + - t_name: Testing + position: 4 + - t_name: Support + position: 5 + - t_name: Other + position: 6 + +types: + - reference: :default_type_task + t_name: Task + is_default: true + color_name: :default_color_blue + is_in_roadmap: true + position: 1 + - reference: :default_type_milestone + t_name: Milestone + is_default: true + color_name: :default_color_green_light + is_milestone: true + position: 2 + - reference: :default_type_phase + t_name: Phase + is_default: true + color_name: 'orange-5' + position: 3 + - reference: :default_type_feature + t_name: Feature + color_name: 'indigo-5' + is_in_roadmap: true + position: 4 + - reference: :default_type_epic + t_name: Epic + color_name: 'violet-5' + is_in_roadmap: true + position: 5 + - reference: :default_type_user_story + t_name: User story + color_name: :default_color_blue_light + is_in_roadmap: true + position: 6 + - reference: :default_type_bug + t_name: Bug + color_name: 'red-7' + is_in_roadmap: true + position: 7 + +workflows: + - type: :default_type_task + statuses: + - :default_status_new + - :default_status_in_progress + - :default_status_on_hold + - :default_status_rejected + - :default_status_closed + - type: :default_type_milestone + statuses: + - :default_status_new + - :default_status_to_be_scheduled + - :default_status_scheduled + - :default_status_in_progress + - :default_status_on_hold + - :default_status_rejected + - :default_status_closed + - type: :default_type_phase + statuses: + - :default_status_new + - :default_status_to_be_scheduled + - :default_status_scheduled + - :default_status_in_progress + - :default_status_on_hold + - :default_status_rejected + - :default_status_closed + - type: :default_type_feature + statuses: + - :default_status_new + - :default_status_in_specification + - :default_status_specified + - :default_status_in_progress + - :default_status_developed + - :default_status_in_testing + - :default_status_tested + - :default_status_test_failed + - :default_status_on_hold + - :default_status_rejected + - :default_status_closed + - type: :default_type_epic + statuses: + - :default_status_new + - :default_status_in_specification + - :default_status_specified + - :default_status_in_progress + - :default_status_developed + - :default_status_in_testing + - :default_status_tested + - :default_status_test_failed + - :default_status_on_hold + - :default_status_rejected + - :default_status_closed + - type: :default_type_user_story + statuses: + - :default_status_new + - :default_status_in_specification + - :default_status_specified + - :default_status_in_progress + - :default_status_developed + - :default_status_in_testing + - :default_status_tested + - :default_status_test_failed + - :default_status_on_hold + - :default_status_rejected + - :default_status_closed + - type: :default_type_bug + statuses: + - :default_status_new + - :default_status_confirmed + - :default_status_in_progress + - :default_status_developed + - :default_status_in_testing + - :default_status_tested + - :default_status_test_failed + - :default_status_on_hold + - :default_status_rejected + - :default_status_closed + +welcome: + t_title: "Welcome to OpenProject!" + t_text: | + OpenProject is the leading open source project management software. It supports classic, agile as well as hybrid project management and gives you full control over your data. + + Core features and use cases: + + * [Project Portfolio Management](https://www.openproject.org/collaboration-software-features/project-portfolio-management/) + * [Project Planning and Scheduling](https://www.openproject.org/collaboration-software-features/project-planning-scheduling/) + * [Task Management and Issue Tracking](https://www.openproject.org/collaboration-software-features/task-management/) + * [Agile Boards (Scrum and Kanban)](https://www.openproject.org/collaboration-software-features/agile-project-management/) + * [Requirements Management and Release Planning](https://www.openproject.org/collaboration-software-features/product-development/) + * [Time and Cost Tracking, Budgets](https://www.openproject.org/collaboration-software-features/time-tracking/) + * [Team Collaboration and Documentation](https://www.openproject.org/collaboration-software-features/team-collaboration/) + + Welcome to the future of project management. + + For Admins: You can change this welcome text [here]({{opSetting:base_url}}/admin/settings/general). diff --git a/app/seeders/standard/basic_data_seeder.rb b/app/seeders/standard/basic_data_seeder.rb index a8202cd3709..5c6c06c8ee2 100644 --- a/app/seeders/standard/basic_data_seeder.rb +++ b/app/seeders/standard/basic_data_seeder.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -39,7 +39,8 @@ module Standard ::BasicData::ColorSchemeSeeder, ::BasicData::WorkflowSeeder, ::BasicData::PrioritySeeder, - ::BasicData::SettingSeeder + ::BasicData::SettingSeeder, + ::BasicData::ProjectCustomFieldSectionSeeder ] end end diff --git a/app/services/add_work_package_note_service.rb b/app/services/add_work_package_note_service.rb index 0e9f933e5b0..d0bf6ff79b6 100644 --- a/app/services/add_work_package_note_service.rb +++ b/app/services/add_work_package_note_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/api/parse_resource_params_service.rb b/app/services/api/parse_resource_params_service.rb index 02c388a24c5..97ccf4f7c01 100644 --- a/app/services/api/parse_resource_params_service.rb +++ b/app/services/api/parse_resource_params_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/api/parser_struct.rb b/app/services/api/parser_struct.rb index 89d49f3b10a..5e853f6e752 100644 --- a/app/services/api/parser_struct.rb +++ b/app/services/api/parser_struct.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/api/v3/params_to_query_service.rb b/app/services/api/v3/params_to_query_service.rb index b30da1fbb6b..afa0a63561b 100644 --- a/app/services/api/v3/params_to_query_service.rb +++ b/app/services/api/v3/params_to_query_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/api/v3/parse_query_params_service.rb b/app/services/api/v3/parse_query_params_service.rb index 487abb47a1b..ee09482cb92 100644 --- a/app/services/api/v3/parse_query_params_service.rb +++ b/app/services/api/v3/parse_query_params_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/api/v3/parse_resource_params_service.rb b/app/services/api/v3/parse_resource_params_service.rb index 7ea8e5454bf..c7f963c2ff1 100644 --- a/app/services/api/v3/parse_resource_params_service.rb +++ b/app/services/api/v3/parse_resource_params_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/api/v3/update_query_from_v3_params_service.rb b/app/services/api/v3/update_query_from_v3_params_service.rb index 3e33c262bfd..d6a45071eb5 100644 --- a/app/services/api/v3/update_query_from_v3_params_service.rb +++ b/app/services/api/v3/update_query_from_v3_params_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/api/v3/work_package_collection_from_query_params_service.rb b/app/services/api/v3/work_package_collection_from_query_params_service.rb index ffba34045dc..4bba60f3cd6 100644 --- a/app/services/api/v3/work_package_collection_from_query_params_service.rb +++ b/app/services/api/v3/work_package_collection_from_query_params_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/api/v3/work_package_collection_from_query_service.rb b/app/services/api/v3/work_package_collection_from_query_service.rb index 886b9298765..268db1162f6 100644 --- a/app/services/api/v3/work_package_collection_from_query_service.rb +++ b/app/services/api/v3/work_package_collection_from_query_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/base_service.rb b/app/services/attachments/base_service.rb index c79925a54bb..3ebf934fd84 100644 --- a/app/services/attachments/base_service.rb +++ b/app/services/attachments/base_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -23,7 +23,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# See docs/COPYRIGHT.rdoc for more details. +# See COPYRIGHT and LICENSE files for more details. #++ module Attachments diff --git a/app/services/attachments/build_service.rb b/app/services/attachments/build_service.rb index 9466ff5b3d4..f55fe7e13df 100644 --- a/app/services/attachments/build_service.rb +++ b/app/services/attachments/build_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/clamav_service.rb b/app/services/attachments/clamav_service.rb index cbd51517abe..dbd4d668b79 100644 --- a/app/services/attachments/clamav_service.rb +++ b/app/services/attachments/clamav_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/create_service.rb b/app/services/attachments/create_service.rb index 761d832827c..54f81827d6f 100644 --- a/app/services/attachments/create_service.rb +++ b/app/services/attachments/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/delete_service.rb b/app/services/attachments/delete_service.rb index 993296ae780..bd1f0924cbb 100644 --- a/app/services/attachments/delete_service.rb +++ b/app/services/attachments/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/prepare_upload_service.rb b/app/services/attachments/prepare_upload_service.rb index 392804ed6a9..844757ed39c 100644 --- a/app/services/attachments/prepare_upload_service.rb +++ b/app/services/attachments/prepare_upload_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/replace_attachments.rb b/app/services/attachments/replace_attachments.rb index cbf570abb9f..029185aa377 100644 --- a/app/services/attachments/replace_attachments.rb +++ b/app/services/attachments/replace_attachments.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/set_attributes_service.rb b/app/services/attachments/set_attributes_service.rb index 38fb7d53638..d8c7de3899a 100644 --- a/app/services/attachments/set_attributes_service.rb +++ b/app/services/attachments/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/set_prepared_attributes_service.rb b/app/services/attachments/set_prepared_attributes_service.rb index 4da64362694..7bd37143922 100644 --- a/app/services/attachments/set_prepared_attributes_service.rb +++ b/app/services/attachments/set_prepared_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/set_replacements.rb b/app/services/attachments/set_replacements.rb index 18a72259517..70b43d65a0f 100644 --- a/app/services/attachments/set_replacements.rb +++ b/app/services/attachments/set_replacements.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attachments/touch_container.rb b/app/services/attachments/touch_container.rb index 68b53ae9796..010d903359f 100644 --- a/app/services/attachments/touch_container.rb +++ b/app/services/attachments/touch_container.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attribute_help_texts/create_service.rb b/app/services/attribute_help_texts/create_service.rb index 2114f48d7ad..240ad5ae260 100644 --- a/app/services/attribute_help_texts/create_service.rb +++ b/app/services/attribute_help_texts/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attribute_help_texts/set_attributes_service.rb b/app/services/attribute_help_texts/set_attributes_service.rb index 52b13432eb9..4d563799efa 100644 --- a/app/services/attribute_help_texts/set_attributes_service.rb +++ b/app/services/attribute_help_texts/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/attribute_help_texts/update_service.rb b/app/services/attribute_help_texts/update_service.rb index 44de200833d..f6a0658c438 100644 --- a/app/services/attribute_help_texts/update_service.rb +++ b/app/services/attribute_help_texts/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authentication/omniauth_service.rb b/app/services/authentication/omniauth_service.rb index 51bcdf2dbf6..47f18d60069 100644 --- a/app/services/authentication/omniauth_service.rb +++ b/app/services/authentication/omniauth_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization.rb b/app/services/authorization.rb index 1a9c8cfd2f6..737f7c14e74 100644 --- a/app/services/authorization.rb +++ b/app/services/authorization.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/abstract_query.rb b/app/services/authorization/abstract_query.rb index 79ff9151ce5..e9ac68bbf7b 100644 --- a/app/services/authorization/abstract_query.rb +++ b/app/services/authorization/abstract_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/abstract_user_query.rb b/app/services/authorization/abstract_user_query.rb index bb3da6ec25c..6c1dfe34da3 100644 --- a/app/services/authorization/abstract_user_query.rb +++ b/app/services/authorization/abstract_user_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/enterprise_service.rb b/app/services/authorization/enterprise_service.rb index d6d373f693b..f07c857f0da 100644 --- a/app/services/authorization/enterprise_service.rb +++ b/app/services/authorization/enterprise_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,28 +29,28 @@ class Authorization::EnterpriseService attr_accessor :token - GUARDED_ACTIONS = %i( + GUARDED_ACTIONS = %i[ baseline_comparison board_view conditional_highlighting custom_actions - custom_fields_in_projects_list date_alerts define_custom_style edit_attribute_groups + gantt_pdf_export grid_widget_wp_graph ldap_groups + one_drive_sharepoint_file_storage openid_providers placeholder_users + project_list_sharing readonly_work_packages team_planner_view two_factor_authentication + virus_scanning work_package_query_relation_columns work_package_sharing - one_drive_sharepoint_file_storage - virus_scanning - gantt_pdf_export - ).freeze + ].freeze def initialize(token) self.token = token diff --git a/app/services/authorization/illegal_permission_context_error.rb b/app/services/authorization/illegal_permission_context_error.rb index 4bd81afdcde..3a92793461a 100644 --- a/app/services/authorization/illegal_permission_context_error.rb +++ b/app/services/authorization/illegal_permission_context_error.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/project_query.rb b/app/services/authorization/project_query.rb index ec764d6d6d8..e3a6095fff7 100644 --- a/app/services/authorization/project_query.rb +++ b/app/services/authorization/project_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/query_transformation.rb b/app/services/authorization/query_transformation.rb index 6b1c9268826..0282155ab6e 100644 --- a/app/services/authorization/query_transformation.rb +++ b/app/services/authorization/query_transformation.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/query_transformation_visitor.rb b/app/services/authorization/query_transformation_visitor.rb index ba174b1130a..461f8f52aaf 100644 --- a/app/services/authorization/query_transformation_visitor.rb +++ b/app/services/authorization/query_transformation_visitor.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/query_transformations.rb b/app/services/authorization/query_transformations.rb index 6ccda744461..4d64b5d08fc 100644 --- a/app/services/authorization/query_transformations.rb +++ b/app/services/authorization/query_transformations.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/query_transformations_order.rb b/app/services/authorization/query_transformations_order.rb index e2858bdc587..8184ff33668 100644 --- a/app/services/authorization/query_transformations_order.rb +++ b/app/services/authorization/query_transformations_order.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/unknown_permission_error.rb b/app/services/authorization/unknown_permission_error.rb index 7e428dfa856..62ae252940d 100644 --- a/app/services/authorization/unknown_permission_error.rb +++ b/app/services/authorization/unknown_permission_error.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/user_allowed_query.rb b/app/services/authorization/user_allowed_query.rb index f492a1772a9..5bb8110694b 100644 --- a/app/services/authorization/user_allowed_query.rb +++ b/app/services/authorization/user_allowed_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/user_entity_roles_query.rb b/app/services/authorization/user_entity_roles_query.rb index cc8508b32c9..b42aa3cc574 100644 --- a/app/services/authorization/user_entity_roles_query.rb +++ b/app/services/authorization/user_entity_roles_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/user_global_roles_query.rb b/app/services/authorization/user_global_roles_query.rb index 1726d3b99aa..4fc93822512 100644 --- a/app/services/authorization/user_global_roles_query.rb +++ b/app/services/authorization/user_global_roles_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/user_project_roles_query.rb b/app/services/authorization/user_project_roles_query.rb index dd1d59e8a85..e62497dd26f 100644 --- a/app/services/authorization/user_project_roles_query.rb +++ b/app/services/authorization/user_project_roles_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/authorization/user_roles_query.rb b/app/services/authorization/user_roles_query.rb index 7a0b96651c9..d7659e2336e 100644 --- a/app/services/authorization/user_roles_query.rb +++ b/app/services/authorization/user_roles_query.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/backups/create_service.rb b/app/services/backups/create_service.rb index 99fd19218c2..39e11ca27bb 100644 --- a/app/services/backups/create_service.rb +++ b/app/services/backups/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/backups/set_attributes_service.rb b/app/services/backups/set_attributes_service.rb index d2d03da9e58..cd543dbf8e3 100644 --- a/app/services/backups/set_attributes_service.rb +++ b/app/services/backups/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_project_service.rb b/app/services/base_project_service.rb index 57eb3603ba3..a80f51678d2 100644 --- a/app/services/base_project_service.rb +++ b/app/services/base_project_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_services/base_callable.rb b/app/services/base_services/base_callable.rb index fab7dbdad1a..bf2f04efa83 100644 --- a/app/services/base_services/base_callable.rb +++ b/app/services/base_services/base_callable.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_services/base_contracted.rb b/app/services/base_services/base_contracted.rb index 2799c059d05..88a7873dd28 100644 --- a/app/services/base_services/base_contracted.rb +++ b/app/services/base_services/base_contracted.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_services/copy.rb b/app/services/base_services/copy.rb index d0cad199a51..353f32f75dc 100644 --- a/app/services/base_services/copy.rb +++ b/app/services/base_services/copy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_services/create.rb b/app/services/base_services/create.rb index c01dc2b045c..eaf18c7157a 100644 --- a/app/services/base_services/create.rb +++ b/app/services/base_services/create.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_services/delete.rb b/app/services/base_services/delete.rb index 6fb72472af9..c0a58d9a89f 100644 --- a/app/services/base_services/delete.rb +++ b/app/services/base_services/delete.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_services/set_attributes.rb b/app/services/base_services/set_attributes.rb index abf0b68b99e..53bd8907368 100644 --- a/app/services/base_services/set_attributes.rb +++ b/app/services/base_services/set_attributes.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_services/update.rb b/app/services/base_services/update.rb index 0163c773668..4d6ba410622 100644 --- a/app/services/base_services/update.rb +++ b/app/services/base_services/update.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_services/write.rb b/app/services/base_services/write.rb index bdc578eebcc..cb39f7dfc31 100644 --- a/app/services/base_services/write.rb +++ b/app/services/base_services/write.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/base_type_service.rb b/app/services/base_type_service.rb index ac248bd4a44..d536cb3a79b 100644 --- a/app/services/base_type_service.rb +++ b/app/services/base_type_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/changesets/log_time_service.rb b/app/services/changesets/log_time_service.rb index be2549c93fb..3663de2c183 100644 --- a/app/services/changesets/log_time_service.rb +++ b/app/services/changesets/log_time_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/concerns/contracted.rb b/app/services/concerns/contracted.rb index 15693c8179d..d514830e21c 100644 --- a/app/services/concerns/contracted.rb +++ b/app/services/concerns/contracted.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/concerns/with_reversible_state.rb b/app/services/concerns/with_reversible_state.rb index 1142a156966..ef3a3ac44ff 100644 --- a/app/services/concerns/with_reversible_state.rb +++ b/app/services/concerns/with_reversible_state.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/copy/dependency.rb b/app/services/copy/dependency.rb index 57b11bd6f04..e6aca6213c6 100644 --- a/app/services/copy/dependency.rb +++ b/app/services/copy/dependency.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/create_type_service.rb b/app/services/create_type_service.rb index 1a7a9141c7a..91e22caae22 100644 --- a/app/services/create_type_service.rb +++ b/app/services/create_type_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/custom_actions/base_service.rb b/app/services/custom_actions/base_service.rb index 51a7eaa76f0..d2f1a2728dc 100644 --- a/app/services/custom_actions/base_service.rb +++ b/app/services/custom_actions/base_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/custom_actions/create_service.rb b/app/services/custom_actions/create_service.rb index 08120c9ad09..3b52a642787 100644 --- a/app/services/custom_actions/create_service.rb +++ b/app/services/custom_actions/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/custom_actions/update_service.rb b/app/services/custom_actions/update_service.rb index 7830ad11ffb..7e6835f95c8 100644 --- a/app/services/custom_actions/update_service.rb +++ b/app/services/custom_actions/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/custom_actions/update_work_package_service.rb b/app/services/custom_actions/update_work_package_service.rb index c7d6d9ee0a5..6eb9ebd3f0a 100644 --- a/app/services/custom_actions/update_work_package_service.rb +++ b/app/services/custom_actions/update_work_package_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/custom_fields/create_service.rb b/app/services/custom_fields/create_service.rb index f27308e20ca..4d08c8aaba4 100644 --- a/app/services/custom_fields/create_service.rb +++ b/app/services/custom_fields/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -54,7 +54,7 @@ module CustomFields def after_perform(call) cf = call.result - if cf.is_a?(ProjectCustomField) && EnterpriseToken.allows_to?(:custom_fields_in_projects_list) + if cf.is_a?(ProjectCustomField) add_cf_to_visible_columns(cf) end diff --git a/app/services/custom_fields/custom_field_projects/bulk_create_service.rb b/app/services/custom_fields/custom_field_projects/bulk_create_service.rb new file mode 100644 index 00000000000..3b452006ce6 --- /dev/null +++ b/app/services/custom_fields/custom_field_projects/bulk_create_service.rb @@ -0,0 +1,125 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module CustomFields + module CustomFieldProjects + class BulkCreateService < ::BaseServices::BaseCallable + def initialize(user:, projects:, custom_field:, include_sub_projects: false) + super() + @user = user + @projects = projects + @custom_field = custom_field + @include_sub_projects = include_sub_projects + end + + def perform + service_call = validate_permissions + service_call = validate_contract(service_call, incoming_mapping_ids) if service_call.success? + service_call = perform_bulk_create(service_call) if service_call.success? + + service_call + end + + private + + def validate_permissions(permission: :select_custom_fields) + return ServiceResult.failure(errors: I18n.t(:label_not_found)) if incoming_projects.empty? + + if @user.allowed_in_project?(permission, incoming_projects) + ServiceResult.success + else + ServiceResult.failure(errors: I18n.t("activerecord.errors.messages.error_unauthorized")) + end + end + + def validate_contract(service_call, project_ids) + set_attributes_results = project_ids.map do |id| + set_attributes(project_id: id, custom_field_id: @custom_field.id) + end + + if (failures = set_attributes_results.select(&:failure?)).any? + service_call.success = false + service_call.errors = failures.map(&:errors) + else + service_call.result = set_attributes_results.map(&:result) + end + + service_call + end + + def perform_bulk_create(service_call) + custom_field_project_mapping_class.insert_all( + service_call.result.map { |model| model.attributes.slice("project_id", "custom_field_id") }, + unique_by: %i[project_id custom_field_id] + ) + + service_call + end + + def incoming_mapping_ids + project_ids = incoming_projects.pluck(:id) + project_ids - existing_project_mappings(project_ids) + end + + def incoming_projects + @projects.each_with_object(Set.new) do |project, projects_set| + next unless project.active? + + projects_set << project + projects_set.merge(project.active_subprojects.to_a) if @include_sub_projects + end.to_a + end + + def existing_project_mappings(project_ids) + custom_field_project_mapping_class.where( + custom_field_id: @custom_field.id, + project_id: project_ids + ).pluck(:project_id) + end + + def set_attributes(params) + attributes_service_class + .new(user: @user, + model: instance(params), + contract_class: default_contract_class, + contract_options: {}) + .call(params) + end + + def instance(params) + custom_field_project_mapping_class.new(params) + end + + def attributes_service_class = CustomFields::CustomFieldProjects::SetAttributesService + def default_contract_class = CustomFields::CustomFieldProjects::UpdateContract + def custom_field_project_mapping_class = CustomFieldsProject + end + end +end diff --git a/app/services/custom_fields/custom_field_projects/set_attributes_service.rb b/app/services/custom_fields/custom_field_projects/set_attributes_service.rb new file mode 100644 index 00000000000..7b3100166c9 --- /dev/null +++ b/app/services/custom_fields/custom_field_projects/set_attributes_service.rb @@ -0,0 +1,34 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module CustomFields + module CustomFieldProjects + class SetAttributesService < ::BaseServices::SetAttributes + end + end +end diff --git a/app/services/custom_fields/set_attributes_service.rb b/app/services/custom_fields/set_attributes_service.rb index 67431bcb49f..53f07297c36 100644 --- a/app/services/custom_fields/set_attributes_service.rb +++ b/app/services/custom_fields/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/custom_fields/update_service.rb b/app/services/custom_fields/update_service.rb index 1e04457df2b..0dda6290306 100644 --- a/app/services/custom_fields/update_service.rb +++ b/app/services/custom_fields/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/design/update_design_service.rb b/app/services/design/update_design_service.rb index 0c55bc5b598..96d29589e02 100644 --- a/app/services/design/update_design_service.rb +++ b/app/services/design/update_design_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/duration_converter.rb b/app/services/duration_converter.rb index c1adb12a579..e2efe5a771e 100644 --- a/app/services/duration_converter.rb +++ b/app/services/duration_converter.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -76,23 +76,24 @@ class DurationConverter class << self def parse(duration_string) - # Assume the next logical unit to allow users to write - # durations such as "2h 1" assuming "1" is "1 minute" - last_unit_in_string = duration_string.scan(/[a-zA-Z]+/) - .last - default_unit = if last_unit_in_string - last_unit_in_string - .then { |last_unit| UNIT_ABBREVIATION_MAP[last_unit.downcase] } - .then { |last_unit| NEXT_UNIT_MAP[last_unit] } - else - "hours" - end + return nil if duration_string.blank? - ChronicDuration.raise_exceptions = true - ChronicDuration.parse(duration_string, - keep_zero: true, - default_unit:, - **duration_length_options) / 3600.to_f + do_parse(duration_string) + end + + def valid?(duration) + case duration + when String + duration.blank? || parseable?(duration) + when Numeric + duration >= 0 + when nil + true + else + false + end + rescue ChronicDuration::DurationParseError + false end def output(duration_in_hours) @@ -108,6 +109,39 @@ class DurationConverter private + def parseable?(duration_string) + if number = Integer(duration_string, 10, exception: false) || Float(duration_string, exception: false) + number >= 0 + else + begin + do_parse(duration_string) + true + rescue ChronicDuration::DurationParseError + false + end + end + end + + def do_parse(duration_string) + # Assume the next logical unit to allow users to write + # durations such as "2h 1" assuming "1" is "1 minute" + last_unit_in_string = duration_string.scan(/[a-zA-Z]+/) + .last + default_unit = if last_unit_in_string + last_unit_in_string + .then { |last_unit| UNIT_ABBREVIATION_MAP[last_unit.downcase] } + .then { |last_unit| NEXT_UNIT_MAP[last_unit] } + else + "hours" + end + + ChronicDuration.parse(duration_string, + keep_zero: true, + default_unit:, + raise_exceptions: true, + **duration_length_options) / 3600.to_f + end + def format Setting.duration_format == "days_and_hours" ? :days_and_hours : :hours_only end diff --git a/app/services/grids/copy/widgets_dependent_service.rb b/app/services/grids/copy/widgets_dependent_service.rb index 4ad2a74c979..cad66938e84 100644 --- a/app/services/grids/copy/widgets_dependent_service.rb +++ b/app/services/grids/copy/widgets_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/grids/copy_service.rb b/app/services/grids/copy_service.rb index 7bee216da69..daa24e04af5 100644 --- a/app/services/grids/copy_service.rb +++ b/app/services/grids/copy_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/add_users_service.rb b/app/services/groups/add_users_service.rb index 7614a321c17..c6e705dbe1d 100644 --- a/app/services/groups/add_users_service.rb +++ b/app/services/groups/add_users_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/cleanup_inherited_roles_service.rb b/app/services/groups/cleanup_inherited_roles_service.rb index b10cb44ad7c..97a4f3f75ab 100644 --- a/app/services/groups/cleanup_inherited_roles_service.rb +++ b/app/services/groups/cleanup_inherited_roles_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/concerns/membership_manipulation.rb b/app/services/groups/concerns/membership_manipulation.rb index 263567d442b..c5fdbbbde27 100644 --- a/app/services/groups/concerns/membership_manipulation.rb +++ b/app/services/groups/concerns/membership_manipulation.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/create_inherited_roles_service.rb b/app/services/groups/create_inherited_roles_service.rb index 0f51b81bef3..06c7f463f5b 100644 --- a/app/services/groups/create_inherited_roles_service.rb +++ b/app/services/groups/create_inherited_roles_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb index 44aedcc1b28..bc2f42a9440 100644 --- a/app/services/groups/create_service.rb +++ b/app/services/groups/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/delete_service.rb b/app/services/groups/delete_service.rb index 9dde353fdb7..99001014fd9 100644 --- a/app/services/groups/delete_service.rb +++ b/app/services/groups/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/set_attributes_service.rb b/app/services/groups/set_attributes_service.rb index 2f6be7771de..b6440352c8b 100644 --- a/app/services/groups/set_attributes_service.rb +++ b/app/services/groups/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/update_roles_service.rb b/app/services/groups/update_roles_service.rb index b14eab5abbf..d2361ddfe28 100644 --- a/app/services/groups/update_roles_service.rb +++ b/app/services/groups/update_roles_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/groups/update_service.rb b/app/services/groups/update_service.rb index 5cc7bd526de..f4790ce4c1d 100644 --- a/app/services/groups/update_service.rb +++ b/app/services/groups/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/journals/create_service.rb b/app/services/journals/create_service.rb index c617afae04a..505904c3b67 100644 --- a/app/services/journals/create_service.rb +++ b/app/services/journals/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/journals/set_attributes_service.rb b/app/services/journals/set_attributes_service.rb index f8e61a31fd5..c63711205a3 100644 --- a/app/services/journals/set_attributes_service.rb +++ b/app/services/journals/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/journals/update_service.rb b/app/services/journals/update_service.rb index 1a02c8127ec..229838dd8df 100644 --- a/app/services/journals/update_service.rb +++ b/app/services/journals/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/cleanup_service.rb b/app/services/members/cleanup_service.rb index b50d2dc8c3c..f6f1f30ff30 100644 --- a/app/services/members/cleanup_service.rb +++ b/app/services/members/cleanup_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/concerns/cleaned_up.rb b/app/services/members/concerns/cleaned_up.rb index f50a043a53e..8aa64d0eb75 100644 --- a/app/services/members/concerns/cleaned_up.rb +++ b/app/services/members/concerns/cleaned_up.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/concerns/notification_sender.rb b/app/services/members/concerns/notification_sender.rb index fb20b337564..0db90c7c878 100644 --- a/app/services/members/concerns/notification_sender.rb +++ b/app/services/members/concerns/notification_sender.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/concerns/role_assignment.rb b/app/services/members/concerns/role_assignment.rb index 8e3befb32e3..8d44bd67311 100644 --- a/app/services/members/concerns/role_assignment.rb +++ b/app/services/members/concerns/role_assignment.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb index 79404e5173c..da693c80d8c 100644 --- a/app/services/members/create_service.rb +++ b/app/services/members/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/delete_by_principal_service.rb b/app/services/members/delete_by_principal_service.rb index f52fd5c8999..95f0c0e1b61 100644 --- a/app/services/members/delete_by_principal_service.rb +++ b/app/services/members/delete_by_principal_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/delete_service.rb b/app/services/members/delete_service.rb index d60cb5983d8..0bf8ff9ad19 100644 --- a/app/services/members/delete_service.rb +++ b/app/services/members/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/edit_membership_service.rb b/app/services/members/edit_membership_service.rb index 3bb56ae80db..151ecff8086 100644 --- a/app/services/members/edit_membership_service.rb +++ b/app/services/members/edit_membership_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/set_attributes_service.rb b/app/services/members/set_attributes_service.rb index 6badbc274de..deeb027f102 100644 --- a/app/services/members/set_attributes_service.rb +++ b/app/services/members/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/members/update_service.rb b/app/services/members/update_service.rb index ca93748b418..8b6b048e44c 100644 --- a/app/services/members/update_service.rb +++ b/app/services/members/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/messages/create_service.rb b/app/services/messages/create_service.rb index 94fcf0e8384..8b38e639860 100644 --- a/app/services/messages/create_service.rb +++ b/app/services/messages/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/messages/set_attributes_service.rb b/app/services/messages/set_attributes_service.rb index 7dacc9199b5..ab3c03f8a20 100644 --- a/app/services/messages/set_attributes_service.rb +++ b/app/services/messages/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/messages/update_service.rb b/app/services/messages/update_service.rb index a4c67c19ddd..e2b3710feef 100644 --- a/app/services/messages/update_service.rb +++ b/app/services/messages/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/news/create_service.rb b/app/services/news/create_service.rb index 97af280e9af..b91aa17b8e5 100644 --- a/app/services/news/create_service.rb +++ b/app/services/news/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/news/delete_service.rb b/app/services/news/delete_service.rb index 04d7b5381c8..d118fc0a6cf 100644 --- a/app/services/news/delete_service.rb +++ b/app/services/news/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/news/set_attributes_service.rb b/app/services/news/set_attributes_service.rb index b6274c28460..b7c08165682 100644 --- a/app/services/news/set_attributes_service.rb +++ b/app/services/news/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/news/update_service.rb b/app/services/news/update_service.rb index d0e1ef90f95..bacf667a38b 100644 --- a/app/services/news/update_service.rb +++ b/app/services/news/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/create_from_model_service.rb b/app/services/notifications/create_from_model_service.rb index 9f42b1a31f1..e1f0eb09201 100644 --- a/app/services/notifications/create_from_model_service.rb +++ b/app/services/notifications/create_from_model_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -106,7 +106,6 @@ class Notifications::CreateFromModelService def create_notification(recipient_id, reason) notification_attributes = { recipient_id:, - project:, resource:, journal:, actor: user_with_fallback, diff --git a/app/services/notifications/create_from_model_service/comment_strategy.rb b/app/services/notifications/create_from_model_service/comment_strategy.rb index dd139575ebd..ff48df4bb26 100644 --- a/app/services/notifications/create_from_model_service/comment_strategy.rb +++ b/app/services/notifications/create_from_model_service/comment_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/create_from_model_service/message_strategy.rb b/app/services/notifications/create_from_model_service/message_strategy.rb index 0e7084c0943..8ca67d94d61 100644 --- a/app/services/notifications/create_from_model_service/message_strategy.rb +++ b/app/services/notifications/create_from_model_service/message_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/create_from_model_service/news_strategy.rb b/app/services/notifications/create_from_model_service/news_strategy.rb index 2a2ae7d4ee4..b069d337e88 100644 --- a/app/services/notifications/create_from_model_service/news_strategy.rb +++ b/app/services/notifications/create_from_model_service/news_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/create_from_model_service/wiki_page_strategy.rb b/app/services/notifications/create_from_model_service/wiki_page_strategy.rb index 3dc3a8e3609..d67ee4b7490 100644 --- a/app/services/notifications/create_from_model_service/wiki_page_strategy.rb +++ b/app/services/notifications/create_from_model_service/wiki_page_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/create_from_model_service/work_package_strategy.rb b/app/services/notifications/create_from_model_service/work_package_strategy.rb index c4150e8cf12..d8db68c83f4 100644 --- a/app/services/notifications/create_from_model_service/work_package_strategy.rb +++ b/app/services/notifications/create_from_model_service/work_package_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/create_service.rb b/app/services/notifications/create_service.rb index c66523d6a30..1a88ccf3a86 100644 --- a/app/services/notifications/create_service.rb +++ b/app/services/notifications/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/mail_service.rb b/app/services/notifications/mail_service.rb index bf9d5cf89b2..dd321e801bf 100644 --- a/app/services/notifications/mail_service.rb +++ b/app/services/notifications/mail_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/mail_service/comment_strategy.rb b/app/services/notifications/mail_service/comment_strategy.rb index 0fd33bada56..a56319309c2 100644 --- a/app/services/notifications/mail_service/comment_strategy.rb +++ b/app/services/notifications/mail_service/comment_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/mail_service/message_strategy.rb b/app/services/notifications/mail_service/message_strategy.rb index 04c7ff1793c..64661f3e02f 100644 --- a/app/services/notifications/mail_service/message_strategy.rb +++ b/app/services/notifications/mail_service/message_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/mail_service/news_strategy.rb b/app/services/notifications/mail_service/news_strategy.rb index 07094fbe120..161ff03f51c 100644 --- a/app/services/notifications/mail_service/news_strategy.rb +++ b/app/services/notifications/mail_service/news_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/mail_service/wiki_page_strategy.rb b/app/services/notifications/mail_service/wiki_page_strategy.rb index e9f50c08953..821d1c7b9b5 100644 --- a/app/services/notifications/mail_service/wiki_page_strategy.rb +++ b/app/services/notifications/mail_service/wiki_page_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/mail_service/work_package_strategy.rb b/app/services/notifications/mail_service/work_package_strategy.rb index 677770f59b2..c471969578d 100644 --- a/app/services/notifications/mail_service/work_package_strategy.rb +++ b/app/services/notifications/mail_service/work_package_strategy.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/notifications/set_attributes_service.rb b/app/services/notifications/set_attributes_service.rb index e16e0c6ac13..de5efacf830 100644 --- a/app/services/notifications/set_attributes_service.rb +++ b/app/services/notifications/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -27,20 +27,5 @@ #++ module Notifications - class SetAttributesService < ::BaseServices::SetAttributes - private - - def set_default_attributes(params) - super - - set_default_project unless model.project - end - - ## - # Try to determine the project context from the journal (if any) - # or the resource if it has a project set - def set_default_project - model.project = model.journal&.project || model.resource.try(:project) - end - end + class SetAttributesService < ::BaseServices::SetAttributes; end end diff --git a/app/services/notifications/update_service.rb b/app/services/notifications/update_service.rb index c326e9232f4..2fe9aafab1b 100644 --- a/app/services/notifications/update_service.rb +++ b/app/services/notifications/update_service.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/oauth/applications/create_service.rb b/app/services/oauth/applications/create_service.rb new file mode 100644 index 00000000000..102be06afdc --- /dev/null +++ b/app/services/oauth/applications/create_service.rb @@ -0,0 +1,37 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OAuth + module Applications + class CreateService < BaseServices::Create + def instance(*) + Doorkeeper::Application.new + end + end + end +end diff --git a/app/services/oauth/applications/delete_service.rb b/app/services/oauth/applications/delete_service.rb new file mode 100644 index 00000000000..430f77977f7 --- /dev/null +++ b/app/services/oauth/applications/delete_service.rb @@ -0,0 +1,34 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OAuth + module Applications + class DeleteService < ::BaseServices::Delete + end + end +end diff --git a/app/services/oauth/applications/set_attributes_service.rb b/app/services/oauth/applications/set_attributes_service.rb new file mode 100644 index 00000000000..72a81dc965f --- /dev/null +++ b/app/services/oauth/applications/set_attributes_service.rb @@ -0,0 +1,53 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OAuth + module Applications + class SetAttributesService < ::BaseServices::SetAttributes + private + + def set_default_attributes(*) + model.extend(OpenProject::ChangedBySystem) + model.change_by_system do + set_secret_and_id + set_default_owner unless model.owner_id + end + end + + def set_secret_and_id + model.renew_secret if model.secret.blank? + model.uid = Doorkeeper::OAuth::Helpers::UniqueToken.generate if model.uid.blank? + end + + def set_default_owner + model.owner = user + model.owner_type = "User" + end + end + end +end diff --git a/app/services/oauth/applications/update_service.rb b/app/services/oauth/applications/update_service.rb new file mode 100644 index 00000000000..67d1852be2d --- /dev/null +++ b/app/services/oauth/applications/update_service.rb @@ -0,0 +1,34 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) 2012-2024 the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module OAuth + module Applications + class UpdateService < ::BaseServices::Update + end + end +end diff --git a/app/services/oauth_clients/connection_manager.rb b/app/services/oauth_clients/connection_manager.rb index 4c9ab3921af..e1faa40dd4e 100644 --- a/app/services/oauth_clients/connection_manager.rb +++ b/app/services/oauth_clients/connection_manager.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -33,7 +33,6 @@ require "uri/http" module OAuthClients class ConnectionManager - # Nextcloud API endpoint to check if Bearer token is valid TOKEN_IS_FRESH_DURATION = 10.seconds.freeze def initialize(user:, configuration:) @@ -60,7 +59,6 @@ module OAuthClients end # rubocop:disable Metrics/AbcSize - # The bearer/access token has expired or is due for renew for other reasons. # Talk to OAuth2 Authorization Server to exchange the renew_token for a new bearer token. def refresh_token @@ -104,28 +102,18 @@ module OAuthClients update_oauth_client_token(oauth_client_token, service_result.result) else rack_access_token = service_result.result - oauth_client_token = - OAuthClientToken.create( - user: @user, - oauth_client: @oauth_client, - origin_user_id: @config.extract_origin_user_id(rack_access_token), # ID of user at OAuth2 Authorization Server - access_token: rack_access_token.access_token, - token_type: rack_access_token.token_type, # :bearer - refresh_token: rack_access_token.refresh_token, - expires_in: rack_access_token.raw_attributes[:expires_in], - scope: rack_access_token.scope - ) - return ServiceResult.failure(errors: oauth_client_token.errors) unless oauth_client_token.valid? + OAuthClientToken.transaction do + oauth_client_token = create_client_token(rack_access_token) - OpenProject::Notifications.send( - OpenProject::Events::OAUTH_CLIENT_TOKEN_CREATED, - integration_type: @oauth_client.integration_type - ) + oauth_client_token.save! + RemoteIdentities::CreateService.call(user: @user, oauth_config: @config, oauth_token: rack_access_token) + .on_failure { raise ActiveRecord::Rollback } + end + + ServiceResult.new(success: oauth_client_token.errors.empty?, result: oauth_client_token, + errors: oauth_client_token.errors) end - - ServiceResult.success(result: oauth_client_token) end - # rubocop:enable Metrics/AbcSize # @returns ServiceResult with result to be :error or any type of object with data @@ -148,6 +136,20 @@ module OAuthClients private + # @param rack_access_token [Rack::OAuth2::Token] - rack token to be used as a base + # @return [OAuthClientToken] + def create_client_token(rack_access_token) + OAuthClientToken.new( + user: @user, + oauth_client: @oauth_client, + access_token: rack_access_token.access_token, + token_type: rack_access_token.token_type, # :bearer + refresh_token: rack_access_token.refresh_token, + expires_in: rack_access_token.raw_attributes[:expires_in], + scope: rack_access_token.scope + ) + end + # Check if a OAuthClientToken already exists and return nil otherwise. # Don't handle the case of an expired token. def get_existing_token @@ -155,12 +157,19 @@ module OAuthClients OAuthClientToken.find_by(user_id: @user, oauth_client_id: @oauth_client.id) end + # rubocop:disable Metrics/AbcSize def request_new_token(options = {}) rack_access_token = rack_oauth_client(options).access_token!(:body) ServiceResult.success(result: rack_access_token) rescue Rack::OAuth2::Client::Error => e - service_result_with_error(:bad_request, e.response, i18n_rack_oauth2_error_message(e)) + if e.status == 429 + service_result_with_error(:too_many_requests, + e.response, + "#{I18n.t('oauth_client.errors.oauth_reported')}: too many requests") + else + service_result_with_error(:bad_request, e.response, i18n_rack_oauth2_error_message(e)) + end rescue Faraday::TimeoutError, Faraday::ConnectionFailed, Faraday::ParsingError, Faraday::SSLError => e service_result_with_error( :internal_server_error, @@ -175,6 +184,8 @@ module OAuthClients ) end + # rubocop:enable Metrics/AbcSize + def i18n_rack_oauth2_error_message(rack_oauth2_client_exception) i18n_key = "oauth_client.errors.rack_oauth2.#{rack_oauth2_client_exception.message}" if I18n.exists? i18n_key diff --git a/app/services/oauth_clients/create_service.rb b/app/services/oauth_clients/create_service.rb index ff0bb5b5e83..200c3d46694 100644 --- a/app/services/oauth_clients/create_service.rb +++ b/app/services/oauth_clients/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/oauth_clients/delete_service.rb b/app/services/oauth_clients/delete_service.rb index 2aff37c6198..4b258c66ff0 100644 --- a/app/services/oauth_clients/delete_service.rb +++ b/app/services/oauth_clients/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/oauth_clients/redirect_uri_from_state_service.rb b/app/services/oauth_clients/redirect_uri_from_state_service.rb index 29803390d4f..04e37a0f620 100644 --- a/app/services/oauth_clients/redirect_uri_from_state_service.rb +++ b/app/services/oauth_clients/redirect_uri_from_state_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/oauth_clients/set_attributes_service.rb b/app/services/oauth_clients/set_attributes_service.rb index 16c9a439bc9..cf1ccf79cde 100644 --- a/app/services/oauth_clients/set_attributes_service.rb +++ b/app/services/oauth_clients/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/params_to_query_service.rb b/app/services/params_to_query_service.rb index f117459b7a6..98fcd811df7 100644 --- a/app/services/params_to_query_service.rb +++ b/app/services/params_to_query_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/parse_schema_filter_params_service.rb b/app/services/parse_schema_filter_params_service.rb index 4e446c608d6..175560ba8a8 100644 --- a/app/services/parse_schema_filter_params_service.rb +++ b/app/services/parse_schema_filter_params_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/percentage_converter.rb b/app/services/percentage_converter.rb new file mode 100644 index 00000000000..75774b001f8 --- /dev/null +++ b/app/services/percentage_converter.rb @@ -0,0 +1,57 @@ +# frozen_string_literal: true + +# -- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +# ++ + +class PercentageConverter + class ParseError < StandardError; end + + class << self + VALID_PERCENTAGE = /\A\s*(\+|-)?\d+(\.\d*)?\s*%?\s*\z/ + + # Parse a string representing a percentage and return the value as a float. + def parse(percentage_string) + return nil if percentage_string.blank? + raise ParseError, "invalid percentage: #{percentage_string}" unless valid?(percentage_string) + + percentage_string.to_f + end + + # Returns true for a value which could assigned to a % complete value (done_ratio). + def valid?(percentage) + case percentage + when String + percentage.blank? || percentage.match?(VALID_PERCENTAGE) + when Numeric, nil + true + else + false + end + end + end +end diff --git a/app/services/placeholder_users/create_service.rb b/app/services/placeholder_users/create_service.rb index adc0d3c0dfe..e4e227145c8 100644 --- a/app/services/placeholder_users/create_service.rb +++ b/app/services/placeholder_users/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/placeholder_users/delete_service.rb b/app/services/placeholder_users/delete_service.rb index 19909713853..02245499b5c 100644 --- a/app/services/placeholder_users/delete_service.rb +++ b/app/services/placeholder_users/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/placeholder_users/set_attributes_service.rb b/app/services/placeholder_users/set_attributes_service.rb index bc80f8b5119..c5294ee0424 100644 --- a/app/services/placeholder_users/set_attributes_service.rb +++ b/app/services/placeholder_users/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/placeholder_users/update_service.rb b/app/services/placeholder_users/update_service.rb index 2b233101eae..3072c53a839 100644 --- a/app/services/placeholder_users/update_service.rb +++ b/app/services/placeholder_users/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/principals/replace_references_service.rb b/app/services/principals/replace_references_service.rb index 945460b1789..d74dcd0b1dc 100644 --- a/app/services/principals/replace_references_service.rb +++ b/app/services/principals/replace_references_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_field_project_mappings/bulk_create_service.rb b/app/services/project_custom_field_project_mappings/bulk_create_service.rb index 1ea84387f1c..432112326ac 100644 --- a/app/services/project_custom_field_project_mappings/bulk_create_service.rb +++ b/app/services/project_custom_field_project_mappings/bulk_create_service.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -29,99 +29,19 @@ #++ module ProjectCustomFieldProjectMappings - class BulkCreateService < ::BaseServices::BaseCallable + class BulkCreateService < ::CustomFields::CustomFieldProjects::BulkCreateService def initialize(user:, projects:, project_custom_field:, include_sub_projects: false) - super() - @user = user - @projects = projects - @project_custom_field = project_custom_field - @include_sub_projects = include_sub_projects - end - - def perform - service_call = validate_permissions - service_call = validate_contract(service_call, incoming_mapping_ids) if service_call.success? - service_call = perform_bulk_create(service_call) if service_call.success? - - service_call + super(user:, projects:, custom_field: project_custom_field, include_sub_projects:) end private - def validate_permissions - return ServiceResult.failure(errors: I18n.t(:label_not_found)) if incoming_projects.empty? - - if @user.allowed_in_project?(:select_project_custom_fields, incoming_projects) - ServiceResult.success - else - ServiceResult.failure(errors: I18n.t("activerecord.errors.messages.error_unauthorized")) - end + def validate_permissions(permission: :select_project_custom_fields) + super end - def validate_contract(service_call, project_ids) - set_attributes_results = project_ids.map do |id| - set_attributes(project_id: id, custom_field_id: @project_custom_field.id) - end - - if (failures = set_attributes_results.select(&:failure?)).any? - service_call.success = false - service_call.errors = failures.map(&:errors) - else - service_call.result = set_attributes_results.map(&:result) - end - - service_call - end - - def perform_bulk_create(service_call) - ProjectCustomFieldProjectMapping.insert_all( - service_call.result.map { |model| model.attributes.slice("project_id", "custom_field_id") }, - unique_by: %i[project_id custom_field_id] - ) - - service_call - end - - def incoming_mapping_ids - project_ids = incoming_projects.pluck(:id) - project_ids - existing_project_mappings(project_ids) - end - - def incoming_projects - @projects.each_with_object(Set.new) do |project, projects_set| - next unless project.active? - - projects_set << project - projects_set.merge(project.active_subprojects.to_a) if @include_sub_projects - end.to_a - end - - def existing_project_mappings(project_ids) - ProjectCustomFieldProjectMapping.where( - custom_field_id: @project_custom_field.id, - project_id: project_ids - ).pluck(:project_id) - end - - def set_attributes(params) - attributes_service_class - .new(user: @user, - model: instance(params), - contract_class: default_contract_class, - contract_options: {}) - .call(params) - end - - def instance(params) - ProjectCustomFieldProjectMapping.new(params) - end - - def attributes_service_class - ProjectCustomFieldProjectMappings::SetAttributesService - end - - def default_contract_class - ProjectCustomFieldProjectMappings::UpdateContract - end + def attributes_service_class = ProjectCustomFieldProjectMappings::SetAttributesService + def default_contract_class = ProjectCustomFieldProjectMappings::UpdateContract + def custom_field_project_mapping_class = ProjectCustomFieldProjectMapping end end diff --git a/app/services/project_custom_field_project_mappings/bulk_update_service.rb b/app/services/project_custom_field_project_mappings/bulk_update_service.rb index 3957134f5a6..ee11eba5f0a 100644 --- a/app/services/project_custom_field_project_mappings/bulk_update_service.rb +++ b/app/services/project_custom_field_project_mappings/bulk_update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_field_project_mappings/delete_service.rb b/app/services/project_custom_field_project_mappings/delete_service.rb index 5c3a03feef8..14a3ae7de57 100644 --- a/app/services/project_custom_field_project_mappings/delete_service.rb +++ b/app/services/project_custom_field_project_mappings/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_field_project_mappings/set_attributes_service.rb b/app/services/project_custom_field_project_mappings/set_attributes_service.rb index 4a6c3007920..371b73a81de 100644 --- a/app/services/project_custom_field_project_mappings/set_attributes_service.rb +++ b/app/services/project_custom_field_project_mappings/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_field_project_mappings/toggle_service.rb b/app/services/project_custom_field_project_mappings/toggle_service.rb index c9acb5ae4d7..eee463d7c7a 100644 --- a/app/services/project_custom_field_project_mappings/toggle_service.rb +++ b/app/services/project_custom_field_project_mappings/toggle_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_field_sections/create_service.rb b/app/services/project_custom_field_sections/create_service.rb index 01cf2b20db7..40a498bee6d 100644 --- a/app/services/project_custom_field_sections/create_service.rb +++ b/app/services/project_custom_field_sections/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_field_sections/delete_service.rb b/app/services/project_custom_field_sections/delete_service.rb index 823c96e8c41..779fe2c6c99 100644 --- a/app/services/project_custom_field_sections/delete_service.rb +++ b/app/services/project_custom_field_sections/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_field_sections/set_attributes_service.rb b/app/services/project_custom_field_sections/set_attributes_service.rb index db7da29c9cd..0d40adb03ad 100644 --- a/app/services/project_custom_field_sections/set_attributes_service.rb +++ b/app/services/project_custom_field_sections/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_field_sections/update_service.rb b/app/services/project_custom_field_sections/update_service.rb index 7611c6d4cd7..b02690b0198 100644 --- a/app/services/project_custom_field_sections/update_service.rb +++ b/app/services/project_custom_field_sections/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/project_custom_fields/drop_service.rb b/app/services/project_custom_fields/drop_service.rb index dfd91263c6b..0a416228d9b 100644 --- a/app/services/project_custom_fields/drop_service.rb +++ b/app/services/project_custom_fields/drop_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/archive_service.rb b/app/services/projects/archive_service.rb index db0e8aaf153..cc72697653c 100644 --- a/app/services/projects/archive_service.rb +++ b/app/services/projects/archive_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/concerns/new_project_service.rb b/app/services/projects/concerns/new_project_service.rb index e9fb5a71a78..040a63b5d52 100644 --- a/app/services/projects/concerns/new_project_service.rb +++ b/app/services/projects/concerns/new_project_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/concerns/update_demo_data.rb b/app/services/projects/concerns/update_demo_data.rb index e923cf9fae9..88f12179422 100644 --- a/app/services/projects/concerns/update_demo_data.rb +++ b/app/services/projects/concerns/update_demo_data.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/attachment_copier.rb b/app/services/projects/copy/attachment_copier.rb index 14baccfeb4d..403badaaf22 100644 --- a/app/services/projects/copy/attachment_copier.rb +++ b/app/services/projects/copy/attachment_copier.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/boards_dependent_service.rb b/app/services/projects/copy/boards_dependent_service.rb index 91fc678e439..5635c236cc7 100644 --- a/app/services/projects/copy/boards_dependent_service.rb +++ b/app/services/projects/copy/boards_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/categories_dependent_service.rb b/app/services/projects/copy/categories_dependent_service.rb index 35043718b43..fa0762ed653 100644 --- a/app/services/projects/copy/categories_dependent_service.rb +++ b/app/services/projects/copy/categories_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/dependency.rb b/app/services/projects/copy/dependency.rb index 78362cca41e..f5bf55f9df4 100644 --- a/app/services/projects/copy/dependency.rb +++ b/app/services/projects/copy/dependency.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/forums_dependent_service.rb b/app/services/projects/copy/forums_dependent_service.rb index dbfcf52ae47..09fd1c924ea 100644 --- a/app/services/projects/copy/forums_dependent_service.rb +++ b/app/services/projects/copy/forums_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/members_dependent_service.rb b/app/services/projects/copy/members_dependent_service.rb index 3b7da7aa76f..f388a0e3d2a 100644 --- a/app/services/projects/copy/members_dependent_service.rb +++ b/app/services/projects/copy/members_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/no_copier.rb b/app/services/projects/copy/no_copier.rb index be64abd95aa..a6fd10b16d6 100644 --- a/app/services/projects/copy/no_copier.rb +++ b/app/services/projects/copy/no_copier.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/overview_dependent_service.rb b/app/services/projects/copy/overview_dependent_service.rb index 5cdb9c56db8..343bf110e6d 100644 --- a/app/services/projects/copy/overview_dependent_service.rb +++ b/app/services/projects/copy/overview_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/queries_dependent_service.rb b/app/services/projects/copy/queries_dependent_service.rb index 098bc3a10a3..610907a879e 100644 --- a/app/services/projects/copy/queries_dependent_service.rb +++ b/app/services/projects/copy/queries_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/share_copier.rb b/app/services/projects/copy/share_copier.rb index 7188a5c5a91..efee97c58a1 100644 --- a/app/services/projects/copy/share_copier.rb +++ b/app/services/projects/copy/share_copier.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/versions_dependent_service.rb b/app/services/projects/copy/versions_dependent_service.rb index 7f5a9009e63..5d26109616f 100644 --- a/app/services/projects/copy/versions_dependent_service.rb +++ b/app/services/projects/copy/versions_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/wiki_dependent_service.rb b/app/services/projects/copy/wiki_dependent_service.rb index 98e0973e0ec..f2892fc2c72 100644 --- a/app/services/projects/copy/wiki_dependent_service.rb +++ b/app/services/projects/copy/wiki_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/wiki_page_attachments_dependent_service.rb b/app/services/projects/copy/wiki_page_attachments_dependent_service.rb index aed17145241..e253071539f 100644 --- a/app/services/projects/copy/wiki_page_attachments_dependent_service.rb +++ b/app/services/projects/copy/wiki_page_attachments_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/work_package_attachments_dependent_service.rb b/app/services/projects/copy/work_package_attachments_dependent_service.rb index f9754e73fad..16fbd0c5ac4 100644 --- a/app/services/projects/copy/work_package_attachments_dependent_service.rb +++ b/app/services/projects/copy/work_package_attachments_dependent_service.rb @@ -1,6 +1,6 @@ -#--copyright +#-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/work_package_shares_dependent_service.rb b/app/services/projects/copy/work_package_shares_dependent_service.rb index 58751155725..9b78abad19a 100644 --- a/app/services/projects/copy/work_package_shares_dependent_service.rb +++ b/app/services/projects/copy/work_package_shares_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy/work_packages_dependent_service.rb b/app/services/projects/copy/work_packages_dependent_service.rb index 873e7e838c2..735b074dff2 100644 --- a/app/services/projects/copy/work_packages_dependent_service.rb +++ b/app/services/projects/copy/work_packages_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/copy_service.rb b/app/services/projects/copy_service.rb index 72c3990f3a9..869b70e5e18 100644 --- a/app/services/projects/copy_service.rb +++ b/app/services/projects/copy_service.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/create_service.rb b/app/services/projects/create_service.rb index 6252b786199..aa16760434f 100644 --- a/app/services/projects/create_service.rb +++ b/app/services/projects/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/delete_service.rb b/app/services/projects/delete_service.rb index 110998d456b..46bb94e2ff7 100644 --- a/app/services/projects/delete_service.rb +++ b/app/services/projects/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/enabled_modules_service.rb b/app/services/projects/enabled_modules_service.rb index 0fe0a6acd39..eb4ac5cb807 100644 --- a/app/services/projects/enabled_modules_service.rb +++ b/app/services/projects/enabled_modules_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/enqueue_copy_service.rb b/app/services/projects/enqueue_copy_service.rb index 5102685fa46..7c3b51b5800 100644 --- a/app/services/projects/enqueue_copy_service.rb +++ b/app/services/projects/enqueue_copy_service.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/gantt_query_generator_service.rb b/app/services/projects/gantt_query_generator_service.rb index c9a75705578..fae74d7eb81 100644 --- a/app/services/projects/gantt_query_generator_service.rb +++ b/app/services/projects/gantt_query_generator_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/schedule_deletion_service.rb b/app/services/projects/schedule_deletion_service.rb index 8a5182b6b8d..e1f32f71488 100644 --- a/app/services/projects/schedule_deletion_service.rb +++ b/app/services/projects/schedule_deletion_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/set_attributes_service.rb b/app/services/projects/set_attributes_service.rb index 54f1570bd85..583bb556cb3 100644 --- a/app/services/projects/set_attributes_service.rb +++ b/app/services/projects/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/unarchive_service.rb b/app/services/projects/unarchive_service.rb index 203b4994453..e52d148f0c3 100644 --- a/app/services/projects/unarchive_service.rb +++ b/app/services/projects/unarchive_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb index b90659d5bf9..5f8ff78777e 100644 --- a/app/services/projects/update_service.rb +++ b/app/services/projects/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/base_service.rb b/app/services/queries/base_service.rb index fbf94f1c4da..2e32631c477 100644 --- a/app/services/queries/base_service.rb +++ b/app/services/queries/base_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/copy/filters_mapper.rb b/app/services/queries/copy/filters_mapper.rb index bd912b9559a..e8134b40263 100644 --- a/app/services/queries/copy/filters_mapper.rb +++ b/app/services/queries/copy/filters_mapper.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/copy/ordered_work_packages_dependent_service.rb b/app/services/queries/copy/ordered_work_packages_dependent_service.rb index 82494f10f76..579d7ee2d99 100644 --- a/app/services/queries/copy/ordered_work_packages_dependent_service.rb +++ b/app/services/queries/copy/ordered_work_packages_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/copy/views_dependent_service.rb b/app/services/queries/copy/views_dependent_service.rb index 746234935ae..5d3b23cd25a 100644 --- a/app/services/queries/copy/views_dependent_service.rb +++ b/app/services/queries/copy/views_dependent_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/copy_service.rb b/app/services/queries/copy_service.rb index 77d829b391e..7006aca75f9 100644 --- a/app/services/queries/copy_service.rb +++ b/app/services/queries/copy_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/create_service.rb b/app/services/queries/create_service.rb index 82b710e8dee..6f5711728f1 100644 --- a/app/services/queries/create_service.rb +++ b/app/services/queries/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/projects/project_queries/create_service.rb b/app/services/queries/projects/project_queries/create_service.rb index 7d8482ec969..7fff71fd030 100644 --- a/app/services/queries/projects/project_queries/create_service.rb +++ b/app/services/queries/projects/project_queries/create_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/projects/project_queries/delete_service.rb b/app/services/queries/projects/project_queries/delete_service.rb index 20a66695399..0300d92233d 100644 --- a/app/services/queries/projects/project_queries/delete_service.rb +++ b/app/services/queries/projects/project_queries/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/projects/project_queries/publish_service.rb b/app/services/queries/projects/project_queries/publish_service.rb index e2c26fcda82..244d1acf1e0 100644 --- a/app/services/queries/projects/project_queries/publish_service.rb +++ b/app/services/queries/projects/project_queries/publish_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/projects/project_queries/set_attributes_service.rb b/app/services/queries/projects/project_queries/set_attributes_service.rb index 9f8ce3acdae..d47e5f6012a 100644 --- a/app/services/queries/projects/project_queries/set_attributes_service.rb +++ b/app/services/queries/projects/project_queries/set_attributes_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/projects/project_queries/update_service.rb b/app/services/queries/projects/project_queries/update_service.rb index 15dd89fcef2..16b6f00df60 100644 --- a/app/services/queries/projects/project_queries/update_service.rb +++ b/app/services/queries/projects/project_queries/update_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/set_attributes_service.rb b/app/services/queries/set_attributes_service.rb index 3fa92e75fb9..02f636851a8 100644 --- a/app/services/queries/set_attributes_service.rb +++ b/app/services/queries/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/queries/update_service.rb b/app/services/queries/update_service.rb index 87e3c0c5329..8c5dcbadaa4 100644 --- a/app/services/queries/update_service.rb +++ b/app/services/queries/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/relations/base_service.rb b/app/services/relations/base_service.rb index a2da7f73b89..7a657b5d4ab 100644 --- a/app/services/relations/base_service.rb +++ b/app/services/relations/base_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/relations/create_service.rb b/app/services/relations/create_service.rb index fab64b9e517..37b27353320 100644 --- a/app/services/relations/create_service.rb +++ b/app/services/relations/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/relations/delete_service.rb b/app/services/relations/delete_service.rb index 435474cbd74..51074fda7e7 100644 --- a/app/services/relations/delete_service.rb +++ b/app/services/relations/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/relations/update_service.rb b/app/services/relations/update_service.rb index 24607c5778c..23ecc219701 100644 --- a/app/services/relations/update_service.rb +++ b/app/services/relations/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/contracts/oauth/application_contract.rb b/app/services/remote_identities/create_service.rb similarity index 56% rename from app/contracts/oauth/application_contract.rb rename to app/services/remote_identities/create_service.rb index 8560edfabc8..21d3dae439d 100644 --- a/app/contracts/oauth/application_contract.rb +++ b/app/services/remote_identities/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -26,40 +26,39 @@ # See COPYRIGHT and LICENSE files for more details. #++ -module OAuth - class ApplicationContract < ::ModelContract - def self.model - ::Doorkeeper::Application +module RemoteIdentities + class CreateService + attr_reader :user, :model + + def self.call(user:, oauth_config:, oauth_token:) + new(user:, oauth_config:, oauth_token:).call end - validate :validate_client_credential_user - validate :validate_integration + def initialize(user:, oauth_config:, oauth_token:) + @user = user + @oauth_config = oauth_config + @oauth_token = oauth_token - attribute :name - attribute :redirect_uri - attribute :confidential - attribute :owner_id - attribute :owner_type - attribute :scopes - attribute :client_credentials_user_id - attribute :integration_id - attribute :integration_type - - private - - def validate_integration - if (model.integration_id.nil? && model.integration_type.present?) || - (model.integration_id.present? && model.integration_type.nil?) - errors.add :integration, :invalid - end + @model = RemoteIdentity.find_or_initialize_by(user:, oauth_client: oauth_config.oauth_client) + @result = ServiceResult.success(result: @model, errors: @model.errors) end - def validate_client_credential_user - return if model.client_credentials_user_id.blank? - - unless User.exists?(id: model.client_credentials_user_id) - errors.add :client_credentials_user_id, :invalid + def call + @model.origin_user_id = @oauth_config.extract_origin_user_id(@oauth_token) + if @model.save + emit_event(@oauth_config.oauth_client.integration) + else + @result.success = false end + + @result + end + + def emit_event(integration) + OpenProject::Notifications.send( + OpenProject::Events::REMOTE_IDENTITY_CREATED, + integration: + ) end end end diff --git a/app/services/remote_identities/delete_service.rb b/app/services/remote_identities/delete_service.rb new file mode 100644 index 00000000000..4a00c3c701e --- /dev/null +++ b/app/services/remote_identities/delete_service.rb @@ -0,0 +1,34 @@ +# frozen_string_literal: true + +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +module RemoteIdentities + class DeleteService < BaseServices::Delete + end +end diff --git a/app/services/reports/assignee_report.rb b/app/services/reports/assignee_report.rb index 27a8b8422b6..0aebc4f2ba6 100644 --- a/app/services/reports/assignee_report.rb +++ b/app/services/reports/assignee_report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/author_report.rb b/app/services/reports/author_report.rb index 123d9afee0d..0f6d7c60f75 100644 --- a/app/services/reports/author_report.rb +++ b/app/services/reports/author_report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/category_report.rb b/app/services/reports/category_report.rb index 12b5a392c01..a7a639214ab 100644 --- a/app/services/reports/category_report.rb +++ b/app/services/reports/category_report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/priority_report.rb b/app/services/reports/priority_report.rb index 2b7dace84d6..607adf4b1e5 100644 --- a/app/services/reports/priority_report.rb +++ b/app/services/reports/priority_report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/report.rb b/app/services/reports/report.rb index 1dd1225fe11..4fbf0482ca6 100644 --- a/app/services/reports/report.rb +++ b/app/services/reports/report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/reports_service.rb b/app/services/reports/reports_service.rb index 810f736687c..f138f18b426 100644 --- a/app/services/reports/reports_service.rb +++ b/app/services/reports/reports_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/responsible_report.rb b/app/services/reports/responsible_report.rb index c9994d72ddc..0f56a510f4e 100644 --- a/app/services/reports/responsible_report.rb +++ b/app/services/reports/responsible_report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/subproject_report.rb b/app/services/reports/subproject_report.rb index a74189dd814..dfeecb6130a 100644 --- a/app/services/reports/subproject_report.rb +++ b/app/services/reports/subproject_report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/type_report.rb b/app/services/reports/type_report.rb index 3f565f788e2..a052b6f4b7b 100644 --- a/app/services/reports/type_report.rb +++ b/app/services/reports/type_report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/reports/version_report.rb b/app/services/reports/version_report.rb index 11bb990c3e7..1401ab09404 100644 --- a/app/services/reports/version_report.rb +++ b/app/services/reports/version_report.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/roles/create_service.rb b/app/services/roles/create_service.rb index 479d2b458ac..95774a71a39 100644 --- a/app/services/roles/create_service.rb +++ b/app/services/roles/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/roles/delete_service.rb b/app/services/roles/delete_service.rb index 9042081aef8..d41de30ee5c 100644 --- a/app/services/roles/delete_service.rb +++ b/app/services/roles/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/roles/set_attributes_service.rb b/app/services/roles/set_attributes_service.rb index e6db6692076..98e91d10757 100644 --- a/app/services/roles/set_attributes_service.rb +++ b/app/services/roles/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/roles/update_service.rb b/app/services/roles/update_service.rb index 66245719468..46358b9f2d3 100644 --- a/app/services/roles/update_service.rb +++ b/app/services/roles/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/scm/base_repository_service.rb b/app/services/scm/base_repository_service.rb index 7d06889a2cd..1ff1f7b4dcb 100644 --- a/app/services/scm/base_repository_service.rb +++ b/app/services/scm/base_repository_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/scm/checkout_instructions_service.rb b/app/services/scm/checkout_instructions_service.rb index 90510fbded9..da4217859d9 100644 --- a/app/services/scm/checkout_instructions_service.rb +++ b/app/services/scm/checkout_instructions_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/scm/create_managed_repository_service.rb b/app/services/scm/create_managed_repository_service.rb index ecbd1fc5b91..8af94de9076 100644 --- a/app/services/scm/create_managed_repository_service.rb +++ b/app/services/scm/create_managed_repository_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/scm/delete_managed_repository_service.rb b/app/services/scm/delete_managed_repository_service.rb index 13809f04d12..d3427fef0a7 100644 --- a/app/services/scm/delete_managed_repository_service.rb +++ b/app/services/scm/delete_managed_repository_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/scm/repository_factory_service.rb b/app/services/scm/repository_factory_service.rb index de682a8fd45..91162b7f6e4 100644 --- a/app/services/scm/repository_factory_service.rb +++ b/app/services/scm/repository_factory_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/service_result.rb b/app/services/service_result.rb index 660103e5d39..36b35cc7943 100644 --- a/app/services/service_result.rb +++ b/app/services/service_result.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/sessions/drop_all_sessions_service.rb b/app/services/sessions/drop_all_sessions_service.rb index f2de58b3fed..ff2b0b8a39e 100644 --- a/app/services/sessions/drop_all_sessions_service.rb +++ b/app/services/sessions/drop_all_sessions_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/sessions/drop_other_sessions_service.rb b/app/services/sessions/drop_other_sessions_service.rb index a09cdc86d0f..cd68292a5b8 100644 --- a/app/services/sessions/drop_other_sessions_service.rb +++ b/app/services/sessions/drop_other_sessions_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/set_localization_service.rb b/app/services/set_localization_service.rb index 21a933568e4..90e228d80d9 100644 --- a/app/services/set_localization_service.rb +++ b/app/services/set_localization_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/settings/language_update_service.rb b/app/services/settings/language_update_service.rb index f9c44b7d5a7..3d5f47ce3ed 100644 --- a/app/services/settings/language_update_service.rb +++ b/app/services/settings/language_update_service.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/settings/update_service.rb b/app/services/settings/update_service.rb index 255f7af69be..a8eda6a5e1d 100644 --- a/app/services/settings/update_service.rb +++ b/app/services/settings/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/settings/working_days_and_hours_update_service.rb b/app/services/settings/working_days_and_hours_update_service.rb index d3fe86a527b..676d12551c2 100644 --- a/app/services/settings/working_days_and_hours_update_service.rb +++ b/app/services/settings/working_days_and_hours_update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -16,7 +16,7 @@ # # This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTALITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License diff --git a/app/services/shared/block_service.rb b/app/services/shared/block_service.rb index f85dc181539..7bfc2bd835e 100644 --- a/app/services/shared/block_service.rb +++ b/app/services/shared/block_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/shared/service_context.rb b/app/services/shared/service_context.rb index 50ae78a9864..3e9fe6fd884 100644 --- a/app/services/shared/service_context.rb +++ b/app/services/shared/service_context.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/shared/service_state.rb b/app/services/shared/service_state.rb index b40cbab89f4..b5231b91e5d 100644 --- a/app/services/shared/service_state.rb +++ b/app/services/shared/service_state.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/shares/concerns/role_assignment.rb b/app/services/shares/concerns/role_assignment.rb index 0df795fdd0c..30a140fb3ae 100644 --- a/app/services/shares/concerns/role_assignment.rb +++ b/app/services/shares/concerns/role_assignment.rb @@ -2,7 +2,7 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2023 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/shares/create_or_update_service.rb b/app/services/shares/create_or_update_service.rb index ad9b60f0eba..5e0a5674dde 100644 --- a/app/services/shares/create_or_update_service.rb +++ b/app/services/shares/create_or_update_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/shares/create_service.rb b/app/services/shares/create_service.rb index 6b045190f33..2b778ae8364 100644 --- a/app/services/shares/create_service.rb +++ b/app/services/shares/create_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -55,7 +55,8 @@ class Shares::CreateService < BaseServices::Create end def send_notification(share) - # TODO: We should select what sort of notification is sent out based on the shared entity + return unless share.entity.is_a?(WorkPackage) + OpenProject::Notifications.send(OpenProject::Events::WORK_PACKAGE_SHARED, work_package_member: share, send_notifications: true) diff --git a/app/services/shares/delete_role_service.rb b/app/services/shares/delete_role_service.rb index c0820994eaf..8d3b2c916e6 100644 --- a/app/services/shares/delete_role_service.rb +++ b/app/services/shares/delete_role_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/shares/delete_service.rb b/app/services/shares/delete_service.rb index 88baee6fd38..0901659a7f9 100644 --- a/app/services/shares/delete_service.rb +++ b/app/services/shares/delete_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/shares/set_attributes_service.rb b/app/services/shares/set_attributes_service.rb index c241961bddf..8e69f931b9b 100644 --- a/app/services/shares/set_attributes_service.rb +++ b/app/services/shares/set_attributes_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/shares/update_service.rb b/app/services/shares/update_service.rb index d38e65a2ea6..7d10ff6b036 100644 --- a/app/services/shares/update_service.rb +++ b/app/services/shares/update_service.rb @@ -1,6 +1,6 @@ # -- copyright # OpenProject is an open source project management software. -# Copyright (C) 2010-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/update_projects_types_service.rb b/app/services/update_projects_types_service.rb index 94ff181aab4..909cafad217 100644 --- a/app/services/update_projects_types_service.rb +++ b/app/services/update_projects_types_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/update_query_from_params_service.rb b/app/services/update_query_from_params_service.rb index be1799c7505..33509fb338c 100644 --- a/app/services/update_query_from_params_service.rb +++ b/app/services/update_query_from_params_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/update_type_service.rb b/app/services/update_type_service.rb index 919f67a450e..be475bdf48e 100644 --- a/app/services/update_type_service.rb +++ b/app/services/update_type_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/user_preferences/set_attributes_service.rb b/app/services/user_preferences/set_attributes_service.rb index 8638e559060..ebbca864b57 100644 --- a/app/services/user_preferences/set_attributes_service.rb +++ b/app/services/user_preferences/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/user_preferences/update_service.rb b/app/services/user_preferences/update_service.rb index 10595fa169c..0c6e867215b 100644 --- a/app/services/user_preferences/update_service.rb +++ b/app/services/user_preferences/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/user_search_service.rb b/app/services/user_search_service.rb index 1d4569ca078..36f82c3e702 100644 --- a/app/services/user_search_service.rb +++ b/app/services/user_search_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/change_password_service.rb b/app/services/users/change_password_service.rb index b2f5c41f7ab..6668eb77b4d 100644 --- a/app/services/users/change_password_service.rb +++ b/app/services/users/change_password_service.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/create_service.rb b/app/services/users/create_service.rb index 15cc2657d05..206565a09b1 100644 --- a/app/services/users/create_service.rb +++ b/app/services/users/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/delete_service.rb b/app/services/users/delete_service.rb index faae57ab31f..1c68ab7a874 100644 --- a/app/services/users/delete_service.rb +++ b/app/services/users/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/drop_tokens_service.rb b/app/services/users/drop_tokens_service.rb index 56f79cb75c1..61252fb8299 100644 --- a/app/services/users/drop_tokens_service.rb +++ b/app/services/users/drop_tokens_service.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/login_service.rb b/app/services/users/login_service.rb index 3bda281e2fd..234d6afd4c0 100644 --- a/app/services/users/login_service.rb +++ b/app/services/users/login_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/logout_service.rb b/app/services/users/logout_service.rb index bb7d58e0a0a..d54a096b555 100644 --- a/app/services/users/logout_service.rb +++ b/app/services/users/logout_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/register_user_service.rb b/app/services/users/register_user_service.rb index 647b5adcdbf..3ab6efc7baa 100644 --- a/app/services/users/register_user_service.rb +++ b/app/services/users/register_user_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/replace_mentions_service.rb b/app/services/users/replace_mentions_service.rb index ffe7d84a7d3..e4aface0388 100644 --- a/app/services/users/replace_mentions_service.rb +++ b/app/services/users/replace_mentions_service.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2010-2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/set_attributes_service.rb b/app/services/users/set_attributes_service.rb index 63f9ef98259..aa9d9e30a11 100644 --- a/app/services/users/set_attributes_service.rb +++ b/app/services/users/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/users/update_service.rb b/app/services/users/update_service.rb index efd5c36ce69..07dedb76ccd 100644 --- a/app/services/users/update_service.rb +++ b/app/services/users/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/versions/create_service.rb b/app/services/versions/create_service.rb index a017aa8d6f3..6ce874c8d54 100644 --- a/app/services/versions/create_service.rb +++ b/app/services/versions/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/versions/delete_service.rb b/app/services/versions/delete_service.rb index bd8d2cdbb24..be09259de8f 100644 --- a/app/services/versions/delete_service.rb +++ b/app/services/versions/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/versions/set_attributes_service.rb b/app/services/versions/set_attributes_service.rb index 22293ee0e31..dd0e2e87f43 100644 --- a/app/services/versions/set_attributes_service.rb +++ b/app/services/versions/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/versions/update_service.rb b/app/services/versions/update_service.rb index 81c48f28bad..ea7f555e7e5 100644 --- a/app/services/versions/update_service.rb +++ b/app/services/versions/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/views/create_service.rb b/app/services/views/create_service.rb index 6a68e098d2e..96dfc2c72fb 100644 --- a/app/services/views/create_service.rb +++ b/app/services/views/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/views/global_create_service.rb b/app/services/views/global_create_service.rb index 1dfec30d44f..4679e7aa622 100644 --- a/app/services/views/global_create_service.rb +++ b/app/services/views/global_create_service.rb @@ -2,7 +2,7 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/views/set_attributes_service.rb b/app/services/views/set_attributes_service.rb index 1176385a270..543e23aa4e8 100644 --- a/app/services/views/set_attributes_service.rb +++ b/app/services/views/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/wiki_pages/copy_service.rb b/app/services/wiki_pages/copy_service.rb index 5942f08e410..400cd92e543 100644 --- a/app/services/wiki_pages/copy_service.rb +++ b/app/services/wiki_pages/copy_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/wiki_pages/create_service.rb b/app/services/wiki_pages/create_service.rb index 4c23ce543c7..4dbf7af450b 100644 --- a/app/services/wiki_pages/create_service.rb +++ b/app/services/wiki_pages/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/wiki_pages/set_attributes_service.rb b/app/services/wiki_pages/set_attributes_service.rb index 4be9d21336b..2103aaaaf3e 100644 --- a/app/services/wiki_pages/set_attributes_service.rb +++ b/app/services/wiki_pages/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/wiki_pages/update_service.rb b/app/services/wiki_pages/update_service.rb index 3d4e59d6659..7cd7e211bcb 100644 --- a/app/services/wiki_pages/update_service.rb +++ b/app/services/wiki_pages/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/bulk/bulked_service.rb b/app/services/work_packages/bulk/bulked_service.rb index 9e932f93a95..777a77d4720 100644 --- a/app/services/work_packages/bulk/bulked_service.rb +++ b/app/services/work_packages/bulk/bulked_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/bulk/copy_service.rb b/app/services/work_packages/bulk/copy_service.rb index b72aed6ca50..4f4475bfb01 100644 --- a/app/services/work_packages/bulk/copy_service.rb +++ b/app/services/work_packages/bulk/copy_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/bulk/move_service.rb b/app/services/work_packages/bulk/move_service.rb index d7a970e4c08..b67e25d9dac 100644 --- a/app/services/work_packages/bulk/move_service.rb +++ b/app/services/work_packages/bulk/move_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/bulk/update_service.rb b/app/services/work_packages/bulk/update_service.rb index cf9bff22388..bcb46158033 100644 --- a/app/services/work_packages/bulk/update_service.rb +++ b/app/services/work_packages/bulk/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/copy_service.rb b/app/services/work_packages/copy_service.rb index 3088a5c5e93..b34eaaf44ce 100644 --- a/app/services/work_packages/copy_service.rb +++ b/app/services/work_packages/copy_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/create_service.rb b/app/services/work_packages/create_service.rb index db48ec744dd..600c0f5d0eb 100644 --- a/app/services/work_packages/create_service.rb +++ b/app/services/work_packages/create_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/default_query_generator_service.rb b/app/services/work_packages/default_query_generator_service.rb index 0db02e7e77d..2a05b5ab2db 100644 --- a/app/services/work_packages/default_query_generator_service.rb +++ b/app/services/work_packages/default_query_generator_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -61,7 +61,7 @@ module ::WorkPackages return if params.nil? - { query_props: params.to_json, name: query_key } + { query_props: params.to_json, name: query_key, show_enterprise_icon: self.class.show_enterprise_icon?(query_key) } end class << self @@ -169,6 +169,10 @@ module ::WorkPackages shared_with_me_query end end + + def show_enterprise_icon?(query_key) + !EnterpriseToken.allows_to?(:work_package_sharing) && %i[shared_with_users shared_with_me].any?(query_key) + end end end end diff --git a/app/services/work_packages/delete_service.rb b/app/services/work_packages/delete_service.rb index 1cc454aafdb..f1e629f167b 100644 --- a/app/services/work_packages/delete_service.rb +++ b/app/services/work_packages/delete_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/exports/schedule_service.rb b/app/services/work_packages/exports/schedule_service.rb index cd873c2e99a..0395e8556c3 100644 --- a/app/services/work_packages/exports/schedule_service.rb +++ b/app/services/work_packages/exports/schedule_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/schedule_dependency.rb b/app/services/work_packages/schedule_dependency.rb index d42f54a7e2a..ed6976377a0 100644 --- a/app/services/work_packages/schedule_dependency.rb +++ b/app/services/work_packages/schedule_dependency.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/schedule_dependency/dependency.rb b/app/services/work_packages/schedule_dependency/dependency.rb index ce533dd3ec6..4836ce1cbd4 100644 --- a/app/services/work_packages/schedule_dependency/dependency.rb +++ b/app/services/work_packages/schedule_dependency/dependency.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/schedule_dependency/dependency_graph.rb b/app/services/work_packages/schedule_dependency/dependency_graph.rb index 33f626f25c1..551506482cb 100644 --- a/app/services/work_packages/schedule_dependency/dependency_graph.rb +++ b/app/services/work_packages/schedule_dependency/dependency_graph.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/set_attributes_service.rb b/app/services/work_packages/set_attributes_service.rb index 31c644ed7ba..ee168d4dbd0 100644 --- a/app/services/work_packages/set_attributes_service.rb +++ b/app/services/work_packages/set_attributes_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -251,7 +251,7 @@ class WorkPackages::SetAttributesService < BaseServices::SetAttributes reassign_category set_parent_to_nil - reassign_type unless work_package.type_id_changed? + assign_default_type unless work_package.type end end @@ -285,145 +285,13 @@ class WorkPackages::SetAttributesService < BaseServices::SetAttributes end def update_progress_attributes - if WorkPackage.use_status_for_done_ratio? - update_done_ratio - update_remaining_hours - elsif only_percent_complete_initially_set? - update_remaining_hours_from_percent_complete - else - update_estimated_hours - update_remaining_hours - update_done_ratio - end - round_progress_values - end - - def only_percent_complete_initially_set? - return false if work_package.done_ratio.nil? - return false if work_package.remaining_hours.present? - - work_package.estimated_hours_changed? && work_package.estimated_hours.present? - end - - def work_was_unset_and_remaining_work_is_set? - work_package.estimated_hours_was.nil? && work_package.remaining_hours.present? - end - - # Compute and update +done_ratio+ if its dependent attributes are being modified. - # The dependent attributes for +done_ratio+ are - # - +remaining_hours+ - # - +estimated_hours+ - # - # Unless both +remaining_hours+ and +estimated_hours+ are set, +done_ratio+ will be - # considered nil. - def update_done_ratio - if WorkPackage.use_status_for_done_ratio? - return unless work_package.status_id_changed? - - work_package.done_ratio = work_package.status.default_done_ratio - else - return unless work_package.remaining_hours_changed? || work_package.estimated_hours_changed? - - work_package.done_ratio = if done_ratio_dependent_attribute_unset? - nil - else - compute_done_ratio - end - end - end - - def round_progress_values - rounded = work_package.estimated_hours&.round(2) - if rounded != work_package.estimated_hours - work_package.estimated_hours = rounded - end - rounded = work_package.remaining_hours&.round(2) - if rounded != work_package.remaining_hours - work_package.remaining_hours = rounded - end - end - - def update_remaining_hours_from_percent_complete - return if work_package.remaining_hours_came_from_user? - return if work_package.estimated_hours&.negative? - - work_package.remaining_hours = remaining_hours_from_done_ratio_and_estimated_hours - end - - def done_ratio_dependent_attribute_unset? - work_package.remaining_hours.nil? || work_package.estimated_hours.nil? - end - - def compute_done_ratio - # do not change done ratio if the values are invalid - if invalid_progress_values? - return work_package.done_ratio - end - - completed_work = work_package.estimated_hours - work_package.remaining_hours - completion_ratio = completed_work.to_f / work_package.estimated_hours - - (completion_ratio * 100).round(2) - end - - def invalid_progress_values? - work = work_package.estimated_hours - remaining_work = work_package.remaining_hours - - return true if work.negative? - return true if remaining_work.negative? - - work && remaining_work && remaining_work > work - end - - def update_estimated_hours - return unless WorkPackage.use_field_for_done_ratio? - return if work_package.estimated_hours_came_from_user? - return unless work_package.remaining_hours_changed? - - work = work_package.estimated_hours - remaining_work = work_package.remaining_hours - return if work.present? - return if remaining_work.nil? || remaining_work.negative? - - work_package.estimated_hours = estimated_hours_from_done_ratio_and_remaining_hours - end - - # When in "Status-based" mode for % Complete, remaining hours are based - # on the computation of it derived from the status's default done ratio - # and the estimated hours. If the estimated hours are unset, then also - # unset the remaining hours. - # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity - def update_remaining_hours - if WorkPackage.use_status_for_done_ratio? - update_remaining_hours_from_percent_complete - elsif WorkPackage.use_field_for_done_ratio? && - work_package.estimated_hours_changed? - return if work_package.remaining_hours_came_from_user? - return if work_package.estimated_hours&.negative? - return if work_was_unset_and_remaining_work_is_set? # remaining work is kept and % complete will be set - - if work_package.estimated_hours.nil? || work_package.remaining_hours.nil? - work_package.remaining_hours = work_package.estimated_hours + derive_progress_values_class = + if OpenProject::FeatureDecisions.percent_complete_edition_active? + WorkPackage.use_status_for_done_ratio? ? DeriveProgressValuesStatusBased : DeriveProgressValuesWorkBased else - delta = work_package.estimated_hours - work_package.estimated_hours_was - work_package.remaining_hours = (work_package.remaining_hours + delta).clamp(0.0, work_package.estimated_hours) + Pre144DeriveProgressValues end - end - end - # rubocop:enable Metrics/AbcSize,Metrics/PerceivedComplexity - - def estimated_hours_from_done_ratio_and_remaining_hours - remaining_ratio = 1.0 - ((work_package.done_ratio || 0) / 100.0) - work_package.remaining_hours / remaining_ratio - end - - def remaining_hours_from_done_ratio_and_estimated_hours - return nil if work_package.done_ratio.nil? || work_package.estimated_hours.nil? - - completed_work = work_package.estimated_hours * work_package.done_ratio / 100.0 - remaining_hours = (work_package.estimated_hours - completed_work).round(2) - remaining_hours.clamp(0.0, work_package.estimated_hours) + derive_progress_values_class.new(work_package).call end def set_version_to_nil @@ -452,11 +320,9 @@ class WorkPackages::SetAttributesService < BaseServices::SetAttributes end end - def reassign_type + def assign_default_type available_types = work_package.project.types.order(:position) - return if available_types.include?(work_package.type) && work_package.type - work_package.type = available_types.first update_duration unify_milestone_dates diff --git a/app/services/work_packages/set_attributes_service/derive_progress_values_base.rb b/app/services/work_packages/set_attributes_service/derive_progress_values_base.rb new file mode 100644 index 00000000000..3293be1010c --- /dev/null +++ b/app/services/work_packages/set_attributes_service/derive_progress_values_base.rb @@ -0,0 +1,185 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class WorkPackages::SetAttributesService + class DeriveProgressValuesBase + attr_reader :work_package + + def initialize(work_package) + @work_package = work_package + end + + def call + derive_progress_attributes + round_progress_values + end + + def work + work_package.estimated_hours + end + + def work=(value) + work_package.estimated_hours = value + end + + def work_was + work_package.estimated_hours_was + end + + def work_set? + work.present? + end + + def work_empty? + work.nil? + end + + def work_was_empty? + work_package.estimated_hours_was.nil? + end + + def work_changed? + work_package.estimated_hours_changed? + end + + def work_came_from_user? + work_package.estimated_hours_came_from_user? + end + + def work_not_provided_by_user? + !work_came_from_user? + end + + def work_valid? + DurationConverter.valid?(work_package.estimated_hours_before_type_cast) + end + + def work_invalid? + !work_valid? + end + + def remaining_work + work_package.remaining_hours + end + + def remaining_work=(value) + work_package.remaining_hours = value + end + + def remaining_work_set? + remaining_work.present? + end + + def remaining_work_empty? + remaining_work.nil? + end + + def remaining_work_was_empty? + work_package.remaining_hours_was.nil? + end + + def remaining_work_changed? + work_package.remaining_hours_changed? + end + + def remaining_work_came_from_user? + work_package.remaining_hours_came_from_user? + end + + def remaining_work_not_provided_by_user? + !remaining_work_came_from_user? + end + + def remaining_work_valid? + DurationConverter.valid?(work_package.remaining_hours_before_type_cast) + end + + def remaining_work_invalid? + !remaining_work_valid? + end + + def percent_complete + work_package.done_ratio + end + + def percent_complete=(value) + work_package.done_ratio = value + end + + def percent_complete_set? + percent_complete.present? + end + + def percent_complete_empty? + percent_complete.nil? + end + + def percent_complete_was_empty? + work_package.done_ratio_was.nil? + end + + def percent_complete_changed? + work_package.done_ratio_changed? + end + + def percent_complete_came_from_user? + work_package.done_ratio_came_from_user? + end + + def percent_complete_not_provided_by_user? + !percent_complete_came_from_user? + end + + private + + def set_hint(field, hint, **params) + work_package.set_derived_progress_hint(field, hint, **params) + end + + def round_progress_values + # The values are set only when rounding returns a different value. Doing + # otherwise would modify the values returned by `xxx_before_type_cast` and + # prevent the numericality validator from working when setting the field + # to a string value. + rounded = work&.round(2) + if rounded != work && work_valid? + self.work = rounded + end + rounded = remaining_work&.round(2) + if rounded != remaining_work && remaining_work_valid? + self.remaining_work = rounded + end + end + + def remaining_work_from_percent_complete_and_work + completed_work = work * percent_complete / 100.0 + remaining_work = (work - completed_work).round(2) + remaining_work.clamp(0.0, work) + end + end +end diff --git a/app/services/work_packages/set_attributes_service/derive_progress_values_status_based.rb b/app/services/work_packages/set_attributes_service/derive_progress_values_status_based.rb new file mode 100644 index 00000000000..7f140a9caf1 --- /dev/null +++ b/app/services/work_packages/set_attributes_service/derive_progress_values_status_based.rb @@ -0,0 +1,80 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class WorkPackages::SetAttributesService + class DeriveProgressValuesStatusBased < DeriveProgressValuesBase + private + + def derive_progress_attributes + raise ArgumentError, "Cannot use #{self.class.name} in work-based mode" if WorkPackage.work_based_mode? + + # do not change anything if some values are invalid: this will be detected + # by the contract and errors will be set. + return if invalid_progress_values? + + update_percent_complete if derive_percent_complete? + update_remaining_work if derive_remaining_work? + end + + def invalid_progress_values? + work_invalid? + end + + def derive_percent_complete? + status_percent_complete_changed? + end + + def derive_remaining_work? + status_percent_complete_changed? || work_changed? + end + + def status_percent_complete_changed? + work_package.status_id_changed? && work_package.status.default_done_ratio != work_package.done_ratio_was + end + + # Update +% complete+ from the status if the status changed. + def update_percent_complete + self.percent_complete = work_package.status.default_done_ratio + end + + # When in "Status-based" mode for progress calculation, remaining work is + # always derived from % complete and work. If work is unset, then remaining + # work must be unset too. + def update_remaining_work + if work_empty? + return unless work_changed? + + set_hint(:remaining_hours, :cleared_because_work_is_empty) + self.remaining_work = nil + else + set_hint(:remaining_hours, :derived) + self.remaining_work = remaining_work_from_percent_complete_and_work + end + end + end +end diff --git a/app/services/work_packages/set_attributes_service/derive_progress_values_work_based.rb b/app/services/work_packages/set_attributes_service/derive_progress_values_work_based.rb new file mode 100644 index 00000000000..fe27c92603d --- /dev/null +++ b/app/services/work_packages/set_attributes_service/derive_progress_values_work_based.rb @@ -0,0 +1,180 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +class WorkPackages::SetAttributesService + class DeriveProgressValuesWorkBased < DeriveProgressValuesBase + private + + attr_accessor :skip_percent_complete_derivation + + def derive_progress_attributes + raise ArgumentError, "Cannot use #{self.class.name} in status-based mode" if WorkPackage.status_based_mode? + + # do not change anything if some values are invalid: this will be detected + # by the contract and errors will be set. + return if invalid_progress_values? + + update_work if derive_work? + update_remaining_work if derive_remaining_work? + update_percent_complete if derive_percent_complete? + end + + def invalid_progress_values? + work_invalid? \ + || remaining_work_invalid? \ + || percent_complete_out_of_range? \ + || percent_complete_unparsable? \ + || remaining_work_set_greater_than_work? + end + + def percent_complete_out_of_range? + percent_complete && !percent_complete.between?(0, 100) + end + + def derive_work? + work_not_provided_by_user? && (remaining_work_changed? || percent_complete_changed?) + end + + def derive_remaining_work? + remaining_work_not_provided_by_user? && (work_changed? || percent_complete_changed?) + end + + def derive_percent_complete? + percent_complete_not_provided_by_user? && (work_changed? || remaining_work_changed?) \ + && !skip_percent_complete_derivation + end + + # rubocop:disable Metrics/AbcSize,Metrics/PerceivedComplexity + def update_work + return if remaining_work_empty? && percent_complete_empty? + return if percent_complete == 100 # would be Infinity if computed when % complete is 100% + return unless work_can_be_derived? + + if remaining_work_empty? + return unless remaining_work_changed? + + set_hint(:estimated_hours, :cleared_because_remaining_work_is_empty) + self.work = nil + elsif percent_complete_empty? + set_hint(:estimated_hours, :same_as_remaining_work) + self.work = remaining_work + else + set_hint(:estimated_hours, :derived) + self.work = work_from_percent_complete_and_remaining_work + skip_percent_complete_derivation! + end + end + + def update_remaining_work + return if work_empty? && percent_complete_empty? + return if work_was_empty? && remaining_work_set? # remaining work is kept and % complete will be unset + + if work_set? && remaining_work_empty? && percent_complete_empty? + set_hint(:remaining_hours, :same_as_work) + self.remaining_work = work + elsif work_changed? && work_set? && remaining_work_set? && percent_complete_not_provided_by_user? + delta = work - work_was + if delta.positive? + set_hint(:remaining_hours, :increased_by_delta_like_work, delta:) + elsif delta.negative? + set_hint(:remaining_hours, :decreased_by_delta_like_work, delta:) + end + self.remaining_work = (remaining_work + delta).clamp(0.0, work) + elsif work_empty? + return unless work_changed? + + set_hint(:remaining_hours, :cleared_because_work_is_empty) + self.remaining_work = nil + elsif percent_complete_empty? + set_hint(:remaining_hours, :cleared_because_percent_complete_is_empty) + self.remaining_work = nil + else + set_hint(:remaining_hours, :derived) + self.remaining_work = remaining_work_from_percent_complete_and_work + skip_percent_complete_derivation! + end + end + # rubocop:enable Metrics/AbcSize,Metrics/PerceivedComplexity + + def update_percent_complete + return if work_empty? + + if work < 0.005 + set_hint(:done_ratio, :cleared_because_work_is_0h) + self.percent_complete = nil + elsif remaining_work_empty? + set_hint(:done_ratio, :cleared_because_remaining_work_is_empty) + self.percent_complete = nil + else + set_hint(:done_ratio, :derived) + self.percent_complete = percent_complete_from_work_and_remaining_work + end + end + + def skip_percent_complete_derivation! + self.skip_percent_complete_derivation = true + end + + def percent_complete_from_work_and_remaining_work + rounded_work = work.round(2) + rounded_remaining_work = remaining_work.round(2) + completed_work = rounded_work - rounded_remaining_work + completion_ratio = completed_work.to_f / rounded_work + + percentage = (completion_ratio * 100) + case percentage + in 0 then 0 + in 0..1 then 1 + in 99...100 then 99 + else + percentage.round + end + end + + def work_from_percent_complete_and_remaining_work + remaining_percent_complete = 1.0 - (percent_complete / 100.0) + remaining_work / remaining_percent_complete + end + + def percent_complete_unparsable? + !PercentageConverter.valid?(work_package.done_ratio_before_type_cast) + end + + def remaining_work_set_greater_than_work? + (work_was_empty? || remaining_work_came_from_user?) \ + && percent_complete_not_provided_by_user? \ + && work && remaining_work && remaining_work > work + end + + def work_can_be_derived? + work_empty? \ + || (remaining_work_came_from_user? && percent_complete_came_from_user?) \ + || (remaining_work_empty? && remaining_work_came_from_user?) + end + end +end diff --git a/app/services/work_packages/set_attributes_service/pre_14_4_derive_progress_values.rb b/app/services/work_packages/set_attributes_service/pre_14_4_derive_progress_values.rb new file mode 100644 index 00000000000..0248a413bf8 --- /dev/null +++ b/app/services/work_packages/set_attributes_service/pre_14_4_derive_progress_values.rb @@ -0,0 +1,186 @@ +#-- copyright +# OpenProject is an open source project management software. +# Copyright (C) the OpenProject GmbH +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License version 3. +# +# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows: +# Copyright (C) 2006-2013 Jean-Philippe Lang +# Copyright (C) 2010-2013 the ChiliProject Team +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. +# +# See COPYRIGHT and LICENSE files for more details. +#++ + +# rubocop:disable Metrics/AbcSize +class WorkPackages::SetAttributesService + class Pre144DeriveProgressValues + attr_reader :work_package + + def initialize(work_package) + @work_package = work_package + end + + def call + update_progress_attributes + end + + # From this point, copied over from 109b135b:app/services/work_packages/set_attributes_service.rb#L287-L427 + def update_progress_attributes + if WorkPackage.use_status_for_done_ratio? + update_done_ratio + update_remaining_hours + elsif only_percent_complete_initially_set? + update_remaining_hours_from_percent_complete + else + update_estimated_hours + update_remaining_hours + update_done_ratio + end + round_progress_values + end + + def only_percent_complete_initially_set? + return false if work_package.done_ratio.nil? + return false if work_package.remaining_hours.present? + + work_package.estimated_hours_changed? && work_package.estimated_hours.present? + end + + def work_was_unset_and_remaining_work_is_set? + work_package.estimated_hours_was.nil? && work_package.remaining_hours.present? + end + + # Compute and update +done_ratio+ if its dependent attributes are being modified. + # The dependent attributes for +done_ratio+ are + # - +remaining_hours+ + # - +estimated_hours+ + # + # Unless both +remaining_hours+ and +estimated_hours+ are set, +done_ratio+ will be + # considered nil. + def update_done_ratio + if WorkPackage.use_status_for_done_ratio? + return unless work_package.status_id_changed? + + work_package.done_ratio = work_package.status.default_done_ratio + else + return unless work_package.remaining_hours_changed? || work_package.estimated_hours_changed? + + work_package.done_ratio = if done_ratio_dependent_attribute_unset? + nil + else + compute_done_ratio + end + end + end + + def round_progress_values + rounded = work_package.estimated_hours&.round(2) + if rounded != work_package.estimated_hours + work_package.estimated_hours = rounded + end + rounded = work_package.remaining_hours&.round(2) + if rounded != work_package.remaining_hours + work_package.remaining_hours = rounded + end + end + + def update_remaining_hours_from_percent_complete + return if work_package.remaining_hours_came_from_user? + return if work_package.estimated_hours&.negative? + + work_package.remaining_hours = remaining_hours_from_done_ratio_and_estimated_hours + end + + def done_ratio_dependent_attribute_unset? + work_package.remaining_hours.nil? || work_package.estimated_hours.nil? + end + + def compute_done_ratio + # do not change done ratio if the values are invalid + if invalid_progress_values? + return work_package.done_ratio + end + + completed_work = work_package.estimated_hours - work_package.remaining_hours + completion_ratio = completed_work.to_f / work_package.estimated_hours + + (completion_ratio * 100).round(2) + end + + def invalid_progress_values? + work = work_package.estimated_hours + remaining_work = work_package.remaining_hours + + return true if work.negative? + return true if remaining_work.negative? + + work && remaining_work && remaining_work > work + end + + def update_estimated_hours + return unless WorkPackage.use_field_for_done_ratio? + return if work_package.estimated_hours_came_from_user? + return unless work_package.remaining_hours_changed? + + work = work_package.estimated_hours + remaining_work = work_package.remaining_hours + return if work.present? + return if remaining_work.nil? || remaining_work.negative? + + work_package.estimated_hours = estimated_hours_from_done_ratio_and_remaining_hours + end + + # When in "Status-based" mode for % Complete, remaining hours are based + # on the computation of it derived from the status's default done ratio + # and the estimated hours. If the estimated hours are unset, then also + # unset the remaining hours. + # rubocop:disable Metrics/PerceivedComplexity + def update_remaining_hours + if WorkPackage.use_status_for_done_ratio? + update_remaining_hours_from_percent_complete + elsif WorkPackage.use_field_for_done_ratio? && + work_package.estimated_hours_changed? + return if work_package.remaining_hours_came_from_user? + return if work_package.estimated_hours&.negative? + return if work_was_unset_and_remaining_work_is_set? # remaining work is kept and % complete will be set + + if work_package.estimated_hours.nil? || work_package.remaining_hours.nil? + work_package.remaining_hours = work_package.estimated_hours + else + delta = work_package.estimated_hours - work_package.estimated_hours_was + work_package.remaining_hours = (work_package.remaining_hours + delta).clamp(0.0, work_package.estimated_hours) + end + end + end + # rubocop:enable Metrics/PerceivedComplexity + + def estimated_hours_from_done_ratio_and_remaining_hours + remaining_ratio = 1.0 - ((work_package.done_ratio || 0) / 100.0) + work_package.remaining_hours / remaining_ratio + end + + def remaining_hours_from_done_ratio_and_estimated_hours + return nil if work_package.done_ratio.nil? || work_package.estimated_hours.nil? + + completed_work = work_package.estimated_hours * work_package.done_ratio / 100.0 + remaining_hours = (work_package.estimated_hours - completed_work).round(2) + remaining_hours.clamp(0.0, work_package.estimated_hours) + end + end +end +# rubocop:enable Metrics/AbcSize diff --git a/app/services/work_packages/set_schedule_service.rb b/app/services/work_packages/set_schedule_service.rb index a27d13e680c..f019d28cc3e 100644 --- a/app/services/work_packages/set_schedule_service.rb +++ b/app/services/work_packages/set_schedule_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/shared/all_days.rb b/app/services/work_packages/shared/all_days.rb index 3efe16d213b..bcceae1539f 100644 --- a/app/services/work_packages/shared/all_days.rb +++ b/app/services/work_packages/shared/all_days.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/shared/days.rb b/app/services/work_packages/shared/days.rb index bc95af09e79..90a75e27e68 100644 --- a/app/services/work_packages/shared/days.rb +++ b/app/services/work_packages/shared/days.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/shared/update_ancestors.rb b/app/services/work_packages/shared/update_ancestors.rb index 5d673b7a2b5..6ee5ba33e2e 100644 --- a/app/services/work_packages/shared/update_ancestors.rb +++ b/app/services/work_packages/shared/update_ancestors.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/shared/working_days.rb b/app/services/work_packages/shared/working_days.rb index b7c87f2a5d0..ecaf0a88754 100644 --- a/app/services/work_packages/shared/working_days.rb +++ b/app/services/work_packages/shared/working_days.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/update_ancestors/loader.rb b/app/services/work_packages/update_ancestors/loader.rb index 3e9646e5f99..966a04fd462 100644 --- a/app/services/work_packages/update_ancestors/loader.rb +++ b/app/services/work_packages/update_ancestors/loader.rb @@ -1,5 +1,5 @@ # OpenProject is an open source project management software. -# Copyright (C) 2022 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/update_ancestors_service.rb b/app/services/work_packages/update_ancestors_service.rb index 0ced628eac7..b6f0c3e0d78 100644 --- a/app/services/work_packages/update_ancestors_service.rb +++ b/app/services/work_packages/update_ancestors_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/work_packages/update_service.rb b/app/services/work_packages/update_service.rb index 7865485a118..4788e737423 100644 --- a/app/services/work_packages/update_service.rb +++ b/app/services/work_packages/update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/services/workflows/bulk_update_service.rb b/app/services/workflows/bulk_update_service.rb index 39ce29d932f..0008eb51e37 100644 --- a/app/services/workflows/bulk_update_service.rb +++ b/app/services/workflows/bulk_update_service.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/uploaders/file_uploader.rb b/app/uploaders/file_uploader.rb index 62db04ecfe0..f5dac20f39a 100644 --- a/app/uploaders/file_uploader.rb +++ b/app/uploaders/file_uploader.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/uploaders/fog_file_uploader.rb b/app/uploaders/fog_file_uploader.rb index 9349402b6b3..77633b6b918 100644 --- a/app/uploaders/fog_file_uploader.rb +++ b/app/uploaders/fog_file_uploader.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/uploaders/local_file_uploader.rb b/app/uploaders/local_file_uploader.rb index a3e3fb90eab..23bc605e689 100644 --- a/app/uploaders/local_file_uploader.rb +++ b/app/uploaders/local_file_uploader.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/validators/not_nil_validator.rb b/app/validators/not_nil_validator.rb index 4711355806f..ac97716dbd8 100644 --- a/app/validators/not_nil_validator.rb +++ b/app/validators/not_nil_validator.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. @@ -23,7 +23,7 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # -# See docs/COPYRIGHT.rdoc for more details. +# See COPYRIGHT and LICENSE files for more details. #++ class NotNilValidator < ActiveModel::EachValidator diff --git a/app/validators/secure_context_uri_validator.rb b/app/validators/secure_context_uri_validator.rb index 8eb2df613a4..573beec7f29 100644 --- a/app/validators/secure_context_uri_validator.rb +++ b/app/validators/secure_context_uri_validator.rb @@ -1,6 +1,6 @@ #-- copyright # OpenProject is an open source project management software. -# Copyright (C) 2012-2024 the OpenProject GmbH +# Copyright (C) the OpenProject GmbH # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License version 3. diff --git a/app/views/accessibility/_empty_element_tag.html.erb b/app/views/accessibility/_empty_element_tag.html.erb index 3699d4209d1..c952f6e5abd 100644 --- a/app/views/accessibility/_empty_element_tag.html.erb +++ b/app/views/accessibility/_empty_element_tag.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. diff --git a/app/views/account/_auth_providers.html.erb b/app/views/account/_auth_providers.html.erb index b2bcbec89e0..f399507f033 100644 --- a/app/views/account/_auth_providers.html.erb +++ b/app/views/account/_auth_providers.html.erb @@ -1,6 +1,6 @@ <%#-- copyright OpenProject is an open source project management software. -Copyright (C) 2012-2024 the OpenProject GmbH +Copyright (C) the OpenProject GmbH This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License version 3. @@ -26,7 +26,6 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. See COPYRIGHT and LICENSE files for more details. ++#%> - <% # Remove this ugly hack when creating an authentication plugin. # @@ -44,9 +43,11 @@ wclass = local_assigns[:wide] ? 'wide' : '' <% if auth_provider_html.strip != '' %>