Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: zonky2/attribute_select
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: master
Choose a base ref
...
head repository: MetaModels/attribute_select
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Able to merge. These branches can be automatically merged.

Commits on Jan 14, 2016

  1. Add php 7.0 to .travis.yml

    discordier committed Jan 14, 2016
    Copy the full SHA
    2503366 View commit details
  2. Copy the full SHA
    f80e6b7 View commit details
  3. Fix code style

    discordier committed Jan 14, 2016
    Copy the full SHA
    648a48c View commit details
  4. Add LICENSE file

    discordier committed Jan 14, 2016
    Copy the full SHA
    6147a18 View commit details
  5. Add .gitattributes

    discordier committed Jan 14, 2016
    Copy the full SHA
    155aa4b View commit details
  6. Add AbstractSelect::getFilterOptionsForDcGeneral

    This method will always return the options list based on id instead of
    alias.
    Therefore we do not have problems anymore, when editing data in a
    language different from the language the ui is using.
    The problem was, when the select was referencing a translated MetaModel
    and the configured alias column was also translated, then is was tried
    to save an alias value in the language of the UI instead of the
    currently active dataset rendering an exception to be thrown as the
    select attribute does not accept the value (it does not know about).
    discordier committed Jan 14, 2016
    Copy the full SHA
    064d211 View commit details

Commits on Jan 20, 2016

  1. Change the result value of the sortIds function.

    Add the IDs from the start list to the sorted values. This should fix a bug where IDs where removed from the sorted list.
    stefanheimes committed Jan 20, 2016
    Copy the full SHA
    8cf9a45 View commit details
  2. Copy the full SHA
    e8d8bcb View commit details

Commits on Feb 10, 2016

  1. Copy the full SHA
    aa53353 View commit details

Commits on Feb 19, 2016

  1. Copy the full SHA
    d5fc665 View commit details
  2. Copy the full SHA
    c8a3075 View commit details
  3. Copy the full SHA
    ea0a52b View commit details
  4. Copy the full SHA
    fff4296 View commit details

Commits on Mar 13, 2016

  1. Copy the full SHA
    e137fa4 View commit details

Commits on Mar 15, 2016

  1. Merge tag '2.0.0-alpha11'

    Bugfix release.
    stefanheimes committed Mar 15, 2016
    Copy the full SHA
    bd15823 View commit details

Commits on Mar 20, 2016

  1. Copy the full SHA
    365c0be View commit details

Commits on Dec 20, 2016

  1. Copy the full SHA
    a4e0284 View commit details
  2. Tackle MetaModels#55

    discordier committed Dec 20, 2016
    Copy the full SHA
    b4c3c21 View commit details
  3. Copy the full SHA
    8ef45f0 View commit details

Commits on Feb 22, 2017

  1. Copy the full SHA
    1926211 View commit details
  2. Copy the full SHA
    c6914b2 View commit details
  3. Merge tag '2.0.0'

    Stable release 2.0.0
    discordier committed Feb 22, 2017
    Copy the full SHA
    0689f91 View commit details

Commits on Apr 25, 2017

  1. Update MetaModelSelect.php

    Fixes #1101
    davidmaack authored Apr 25, 2017
    Copy the full SHA
    9bac626 View commit details
  2. Update MetaModelSelect.php

    Fixed syntax error
    davidmaack authored Apr 25, 2017
    Copy the full SHA
    2e6e495 View commit details

Commits on Jul 9, 2017

  1. Copy the full SHA
    e93a36f View commit details
  2. Copy the full SHA
    a68234d View commit details

Commits on Aug 21, 2017

  1. Copy the full SHA
    0c3c2e5 View commit details
  2. Merge tag '2.0.1'

    Pugfix for filter options.
    stefanheimes committed Aug 21, 2017
    Copy the full SHA
    37569e0 View commit details

Commits on Nov 2, 2017

  1. Optimize valueToWidget

    As this is called multiple times by dc-general, we can cache the result.
    We also only obtain the required value columns.
    discordier committed Nov 2, 2017
    Copy the full SHA
    1a1a14e View commit details

Commits on Nov 3, 2017

  1. Prepare bundle rework.

    dmolineus committed Nov 3, 2017
    Copy the full SHA
    dd09c9c View commit details
  2. Switch to psr-4.

    dmolineus committed Nov 3, 2017
    Copy the full SHA
    1d69db2 View commit details
  3. Change project files.

    dmolineus committed Nov 3, 2017
    Copy the full SHA
    ba091bc View commit details
  4. Update file headers.

    dmolineus committed Nov 3, 2017
    Copy the full SHA
    3cffb81 View commit details
  5. Move contao resources.

    dmolineus committed Nov 3, 2017
    Copy the full SHA
    c34fa99 View commit details
  6. Copy the full SHA
    620cf1a View commit details
  7. Add base bundle structure.

    dmolineus committed Nov 3, 2017
    Copy the full SHA
    08b548f View commit details
  8. Fix the tests.

    dmolineus committed Nov 3, 2017
    Copy the full SHA
    ecd656c View commit details
  9. Rework to use services.

    dmolineus committed Nov 3, 2017
    Copy the full SHA
    bdb557e View commit details
  10. Copy the full SHA
    e4cf668 View commit details
  11. Copy the full SHA
    1ccb84c View commit details
  12. Copy the full SHA
    942ce7e View commit details

Commits on Nov 7, 2017

  1. Remove route loading from plugin.

    We do not have custom entry points in this bundle.
    discordier committed Nov 7, 2017
    Copy the full SHA
    73c6828 View commit details
  2. Add missing arguments

    discordier committed Nov 7, 2017
    Copy the full SHA
    bd2cc01 View commit details
  3. Fix language path

    discordier committed Nov 7, 2017
    Copy the full SHA
    1cc321d View commit details
  4. Copy the full SHA
    1e7a9e4 View commit details
  5. more more more...

    discordier committed Nov 7, 2017
    Copy the full SHA
    822db43 View commit details
  6. Add commas

    discordier committed Nov 7, 2017
    Copy the full SHA
    64a6e6f View commit details

Commits on Nov 17, 2017

  1. Optimize getFilterOptionsForDcGeneral()

    We now only fetch the columns we really use.
    discordier committed Nov 17, 2017
    Copy the full SHA
    e77a43f View commit details

Commits on Nov 23, 2017

  1. Fix sql statement errors.

    dmolineus committed Nov 23, 2017
    Copy the full SHA
    49763b4 View commit details

Commits on Nov 24, 2017

  1. Copy the full SHA
    c111787 View commit details
Showing with 4,718 additions and 2,287 deletions.
  1. +10 −3 .check-author.yml
  2. +10 −0 .gitattributes
  3. +66 −0 .github/CONTRIBUTING.md
  4. +41 −0 .github/ISSUE_TEMPLATE.md
  5. +12 −0 .github/PULL_REQUEST_TEMPLATE.md
  6. +9 −0 .github/dependabot.yml
  7. +52 −0 .github/workflows/diagnostics.yml
  8. +20 −18 .gitignore
  9. +0 −32 .travis.yml
  10. +165 −0 LICENSE
  11. +2 −2 README.md
  12. +4 −0 build.default.properties
  13. +1 −0 build.xml
  14. +70 −66 composer.json
  15. +0 −7 contao/config/autoload.ini
  16. +0 −24 contao/config/autoload.php
  17. +0 −33 contao/config/database.sql
  18. +0 −38 contao/config/event_listeners.php
  19. +0 −151 contao/dca/tl_metamodel_attribute.php
  20. +0 −79 contao/dca/tl_metamodel_dcasetting.php
  21. +0 −7 contao/html/.htaccess
  22. +0 −20 contao/languages/el/tl_metamodel_attribute.php
  23. +0 −16 contao/languages/el/tl_metamodel_dcasetting.php
  24. +0 −21 contao/languages/fr/tl_metamodel_attribute.php
  25. +0 −16 contao/languages/fr/tl_metamodel_dcasetting.php
  26. +0 −21 contao/languages/it/tl_metamodel_attribute.php
  27. +0 −16 contao/languages/it/tl_metamodel_dcasetting.php
  28. +0 −21 contao/languages/rm/tl_metamodel_attribute.php
  29. +0 −16 contao/languages/rm/tl_metamodel_dcasetting.php
  30. +0 −3 contao/templates/mm_attr_select.xhtml
  31. +28 −0 ctb.json
  32. +24 −30 phpunit.xml.dist
  33. +92 −59 src/{MetaModels/Attribute/Select → Attribute}/AbstractSelect.php
  34. +147 −0 src/Attribute/AttributeTypeFactory.php
  35. +967 −0 src/Attribute/MetaModelSelect.php
  36. +332 −0 src/Attribute/Select.php
  37. +49 −0 src/ContaoManager/Plugin.php
  38. +41 −0 src/DependencyInjection/MetaModelsAttributeSelectExtension.php
  39. +204 −139 ...DcGeneral/Events/Table/Attribute/Select/Subscriber.php → EventListener/BackendEventsListener.php}
  40. +96 −0 src/EventListener/GetPropertyOptionsListener.php
  41. +98 −0 src/FilterRule/FilterRuleSelect.php
  42. +0 −83 src/MetaModels/Attribute/Select/AttributeTypeFactory.php
  43. +0 −605 src/MetaModels/Attribute/Select/MetaModelSelect.php
  44. +0 −321 src/MetaModels/Attribute/Select/Select.php
  45. +0 −72 src/MetaModels/DcGeneral/Events/MetaModels/Select/BackendSubscriber.php
  46. +0 −81 src/MetaModels/Filter/Rules/FilterRuleSelect.php
  47. +30 −0 src/MetaModelsAttributeSelectBundle.php
  48. +210 −0 src/Migration/AllowNullMigration.php
  49. +46 −0 src/Resources/config/listeners.yml
  50. +16 −0 src/Resources/config/services.yml
  51. +157 −0 src/Resources/contao/dca/tl_metamodel_attribute.php
  52. +82 −0 src/Resources/contao/dca/tl_metamodel_dcasetting.php
  53. 0 { → src/Resources}/contao/languages/da/tl_metamodel_attribute.php
  54. +25 −11 { → src/Resources}/contao/languages/de/tl_metamodel_attribute.php
  55. 0 { → src/Resources}/contao/languages/de/tl_metamodel_dcasetting.php
  56. +31 −0 src/Resources/contao/languages/el/tl_metamodel_attribute.php
  57. +27 −0 src/Resources/contao/languages/el/tl_metamodel_dcasetting.php
  58. +35 −18 { → src/Resources}/contao/languages/en/tl_metamodel_attribute.php
  59. +12 −7 { → src/Resources}/contao/languages/en/tl_metamodel_dcasetting.php
  60. +41 −0 src/Resources/contao/languages/et/tl_metamodel_attribute.php
  61. +17 −0 src/Resources/contao/languages/et/tl_metamodel_dcasetting.php
  62. +48 −0 src/Resources/contao/languages/fr/tl_metamodel_attribute.php
  63. +23 −0 src/Resources/contao/languages/fr/tl_metamodel_dcasetting.php
  64. +32 −0 src/Resources/contao/languages/it/tl_metamodel_attribute.php
  65. +27 −0 src/Resources/contao/languages/it/tl_metamodel_dcasetting.php
  66. +32 −0 src/Resources/contao/languages/rm/tl_metamodel_attribute.php
  67. +27 −0 src/Resources/contao/languages/rm/tl_metamodel_dcasetting.php
  68. +20 −7 { → src/Resources}/contao/languages/ru/tl_metamodel_attribute.php
  69. 0 { → src/Resources}/contao/languages/ru/tl_metamodel_dcasetting.php
  70. 0 { → src/Resources}/contao/languages/sk/tl_metamodel_attribute.php
  71. 0 { → src/Resources}/contao/templates/mm_attr_select.html5
  72. 0 { → src/Resources}/contao/templates/mm_attr_select.text
  73. BIN {contao/html → src/Resources/public}/select.png
  74. +45 −0 src/deprecated-autoload.php
  75. +279 −0 tests/Attribute/MetaModelSelectTest.php
  76. +173 −0 tests/Attribute/SelectAttributeTypeFactoryTest.php
  77. +264 −0 tests/Attribute/SelectTest.php
  78. +74 −0 tests/ContaoManager/PluginTest.php
  79. +98 −0 tests/DependencyInjection/MetaModelsAttributeSelectExtensionTest.php
  80. +81 −0 tests/DeprecatedAutoloaderTest.php
  81. +0 −127 tests/MetaModels/Test/Attribute/Select/SelectAttributeTypeFactoryTest.php
  82. +0 −84 tests/MetaModels/Test/Attribute/Select/SelectTest.php
  83. +226 −0 tests/Migration/AllowNullMigrationTest.php
  84. +0 −33 tests/bootstrap.php
13 changes: 10 additions & 3 deletions .check-author.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
ignore:
# Mini Model <minimodel@metamodel.me>
- 'Mini Model <minimodel@metamodel.me>'

exclude:
languages
- /^src\/Resources\/contao\/languages/

mapping:
Andreas Isaak <info@andreas-isaak.de>: Andreas Isaak <andy.jared@googlemail.com>
'Andreas Isaak <info@andreas-isaak.de>': 'Andreas Isaak <andy.jared@googlemail.com>'
'Stefan Heimes <stefan_heimes@hotmail.com>': 'Stefan Heimes <heimes@men-at-work.de>'
'Ingolf Steinhardt <info@e-spin.de>':
- 'e-spin <gitlab@e-spin.de>'
- 'zonky <info@e-spin.de>'
- 'zonky2 <info@e-spin.de>'
- 'sandokan <info@e-spin.de>'
- 'e-spin <git@e-spin.de>'
10 changes: 10 additions & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
.check-author.yml export-ignore
.gitattributes export-ignore
.gitignore export-ignore
.travis.yml export-ignore
build.default.properties export-ignore
build.xml export-ignore
phpunit.xml.dist export-ignore
/.github export-ignore
/tests export-ignore
ctb.json export-ignore
66 changes: 66 additions & 0 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
# How to contribute

We are really glad you're reading this, because we need volunteer developers to
help this project come to fruition.

If you haven't already, come find us in IRC (#contao.mm on freenode).
We want you working on things you're excited about.

The following is a set of guidelines for contributing to MetaModels and its
packages, which are hosted in the [MetaModels organization][1] on GitHub. These
are just guidelines, not rules, use your best judgement and feel free to
propose changes to this document in a pull request.

## Submitting issues

* Use the search function to see if a similar issue has already been submitted.
* Describe the issue in detail and include all the steps to follow in order to
reproduce the bug.
* Include the version of Contao, PHP and MetaModels you are using (if possible
with a detailed list of other installed extensions that might be related).
* Include screenshots or screencasts if possible; they are immensely helpful.
* If you are reporting a bug, please include any related error message you are
seeing and also check the `system/logs/error.log` file. The error message is
not just the message but also the complete(!) stack trace below the message.
This trace is a long list of function calls which helps us to diagnose the
problem en detail.

## Submitting changes

* Please send a [GitHub Pull Request to MetaModels][1] with a clear list of what
you've done (read more about [pull requests][2]).
* When you send a pull request, we will love you forever if you include
phpunit tests. We can always use more test coverage.
* Please follow the [phpcq 2.0][3] coding standards.
* Please make sure all of your commits are atomic (only one feature or fix per
commit).
* We use phpcq/all-tasks in these projects, so please check your changes
using phpcq when submitting a pull request.
* Create your pull request against the [`master`][4] branch for bug fixes or the
[`develop`][5] branch for new features.
* Include screenshots in your pull request whenever possible.

Always write a clear log message for your commits.
One-line messages are fine for small changes, but bigger changes should look
like this:

$ git commit -m "A brief summary of the commit
>
> A paragraph describing what changed and its impact."

## Testing

We have a handful of unit tests. Please write unit tests for new code you
create.

## Git commit messages

* Use the present tense ("Add feature" not "Added feature").
* Use the imperative mood ("Move cursor to …" not "Moves cursor to …").
* Reference issues and pull requests liberally.

[1]: https://github.com/MetaModels
[2]: http://help.github.com/pull-requests/
[3]: https://github.com/phpcq/coding-standard
[4]: https://github.com/MetaModels/attribute_select/pull/new/master
[5]: https://github.com/MetaModels/attribute_select/pull/new/develop
41 changes: 41 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
## Checklist before I submit this issue report

I confirm that:
- [ ] I have tested this with the latest version available
- [ ] I have read documentation @ http://metamodels.readthedocs.org/en/ or http://metamodels.readthedocs.org/de/
- [ ] I have checked the Contao community forums for references https://community.contao.org/
- [ ] I have checked existing issues for duplicates and found none @ https://github.com/MetaModels/attribute_select/issues?q=is%3Aissue

## My environment is:

(Please fill in the actual values from your environment)

| Key | Value | Comments |
| ----------------------------------- | ---------| ---------------------------------|
| PHP version: | | |
| Contao version: | | |
| MetaModels version: | | |
| Installation via composer | (yes/no) | |
| Installed MetaModels packages | | |

## Issue description

(Describe the problem you are having)

## Steps to reproduce

1. [First Step]
2. [Second Step]
3. [and so on…]

## Describe the behaviour of the application

(Tell us what happens)

## Describe the expected behaviour of the application

(Tell us what should have happened)

## Screenshots

(Add some visual love or even a video if you can)
12 changes: 12 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
## Description

Please explain the detailed changes you made here.
Reference any issue number this pull request fixes.

## Checklist
- [ ] Read and understood the [CONTRIBUTING guidelines](CONTRIBUTING.md)
- [ ] Created tests, if possible
- [ ] All tests passing
- [ ] Extended the README / documentation, if necessary
- [ ] Added myself to the `@authors` in touched PHP files
- [ ] Checked the changes with phpcq and introduced no new issues
9 changes: 9 additions & 0 deletions .github/dependabot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
version: 2
updates:
- package-ecosystem: composer
directory: "/"
schedule:
interval: daily
time: "04:00"
timezone: Europe/Berlin
open-pull-requests-limit: 10
52 changes: 52 additions & 0 deletions .github/workflows/diagnostics.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
name: MetaModels attribute_select

on:
push:
branches-ignore:
- '**-translation'
pull_request:

jobs:
build:
runs-on: ubuntu-latest
strategy:
matrix:
php: [7.4]
contao: [~4.9.0]

steps:
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Pull source
uses: actions/checkout@v2
with:
fetch-depth: 0

# see https://github.com/shivammathur/setup-php
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Setup PHP.
uses: shivammathur/setup-php@v2
with:
php-version: ${{ matrix.php }}
coverage: none

- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache composer cache directory
uses: actions/cache@v1
env:
cache-name: composer-cache-dir
with:
path: ~/.cache/composer
key: ${{ runner.os }}-build-${{ env.cache-name }}

- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Cache vendor directory
uses: actions/cache@v1
env:
cache-name: composer-vendor
with:
path: vendor
key: ${{ runner.os }}-build-${{ env.cache-name }}-${{ hashFiles('**/composer.lock') }}
restore-keys: |
${{ runner.os }}-build-${{ env.cache-name }}-
- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Install composer dependencies
run: composer update --prefer-dist --no-interaction --no-suggest

- name: PHP ${{ matrix.php }} ${{ matrix.contao }} Run tests
run: ant -keep-going
38 changes: 20 additions & 18 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,18 +1,20 @@
# OS
.DS_Store
Thumbs.db

# IDEs
.buildpath
.project
.settings/
.build/
.external*/
.idea/
nbproject/

# composer related
vendor/

# build
build/
# OS
.DS_Store
Thumbs.db

# IDEs
.buildpath
.project
.settings/
.build/
.external*/
.idea/
nbproject/

# composer related
vendor/

# build
build/
composer.lock
.phpunit.result.cache
32 changes: 0 additions & 32 deletions .travis.yml

This file was deleted.

Loading