Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Plone5 only WIP #66

Open
wants to merge 148 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
148 commits
Select commit Hold shift + click to select a range
9337238
updated checkEmailAddress to not be dependend on CMFDefault
agitator Aug 15, 2016
e6b01a9
disable plone.app.linkintegrity subscribers
agitator Aug 19, 2016
3b55c59
disable filter function
agitator Aug 19, 2016
390dd3a
disable RelationChoiceHandler
agitator Aug 19, 2016
317bc23
disable postinstall
agitator Sep 28, 2016
f6c9881
move icons to resource directory
agitator Sep 28, 2016
a2b11b9
move styles to resource directory
agitator Sep 28, 2016
ac7fa90
update icon paths
agitator Sep 28, 2016
3068384
replaced portal_url with actual string, degrok
agitator Sep 30, 2016
a61ca25
fix constraint error
agitator Sep 30, 2016
b235fbd
fix js url construction
agitator Sep 30, 2016
07c1875
back to grok for now…
agitator Sep 30, 2016
e306e79
plone5 form styling
agitator Oct 5, 2016
a986ee9
move styles to resource directory
agitator Sep 28, 2016
08fc8d7
replaced portal_url with actual string, degrok
agitator Sep 30, 2016
6a36d31
back to grok for now…
agitator Sep 30, 2016
ccb9e97
plone5 form styling
agitator Oct 5, 2016
7878f9a
remove label, already there from vocab
agitator Nov 25, 2016
191a2af
make it easier to override held position order on organisation view
agitator Nov 25, 2016
6dc70d2
added , if more than one person fills a position - avoiding extra whi…
agitator Nov 25, 2016
09a5832
add Plone 5.0 classifier
tkimnguyen Jan 11, 2017
f007a28
mention Plone 5 compatibility
tkimnguyen Jan 11, 2017
efbdace
fix translation
agitator Jan 23, 2017
7786f47
step one …
agitator Jan 23, 2017
ed85405
degrok views
agitator Jan 26, 2017
ed61db9
add separate __call__ method
agitator Feb 7, 2017
51eed48
fix space before end date
vincentfretin Jan 17, 2017
31c730b
added , if more than one person fills a position - avoiding extra whi…
agitator Nov 25, 2016
87c76c7
do not fail on missing get_organization
agitator Mar 1, 2017
b36f5a2
added png icons (for now)
agitator Mar 1, 2017
b9f9c4b
sort persons on sortable_title
agitator Mar 7, 2017
2f5667f
Prevent address field from being erased if they are changed programma…
tdesvenain Nov 22, 2017
c1a241b
do not show add link if content type is disallowed on directory
tdesvenain Jan 22, 2019
d6910c0
Merge branch 'master' into plone5
tdesvenain Jan 22, 2019
a70bb59
fix imports + flake8
tdesvenain Jan 22, 2019
0748651
flake8
tdesvenain Jan 22, 2019
067e677
plone 5 buildout
tdesvenain Jan 22, 2019
d10dabf
fix tests for plone 5
tdesvenain Jan 24, 2019
d4ed369
upgrade travis to plone 5.1
tdesvenain Jan 24, 2019
250044b
always allow adding held_position
tdesvenain Jan 25, 2019
c753a9a
upgrade: reimport types
tdesvenain Jan 25, 2019
6a26541
install doc for plone 4
tdesvenain Jan 25, 2019
2a48c98
add a note about compatibility with jqueryui
tdesvenain Jan 29, 2019
c103b06
jslint
tdesvenain Jan 29, 2019
bbab01b
fix broken icon in sub organization
tdesvenain Jan 29, 2019
c64c8aa
install js and css ressources the right way for plone 4 or 5
tdesvenain Jan 29, 2019
77198d0
fix changelog
tdesvenain Jan 30, 2019
3cfd0d6
more robust organization type vocabulary
tdesvenain Jan 30, 2019
112dd95
we can actually 'disable linkintegrity under plone 5' cf e6b01a98298b…
tdesvenain Jan 30, 2019
d1302b6
enable relationchoicehandler for plone 4 cf 390dd3a84be1edd1d68ccc9ae…
tdesvenain Jan 30, 2019
bf10656
remove test_data profile
tdesvenain Feb 1, 2019
493206c
rename base profile: install-base
tdesvenain Feb 4, 2019
6928915
fix content filter cf 3b55c59cfd4bed11c4d1a9dd7917e6bc4e288a73
tdesvenain Feb 4, 2019
fe60a64
use mockup for create contact overlay
tdesvenain Feb 5, 2019
76bdd5e
fix: address is back on organization view
tdesvenain Feb 14, 2019
c1e4cce
use mockup modal instead of overlay
tdesvenain Feb 14, 2019
f94ff83
add a bundle + compile js
tdesvenain Feb 15, 2019
ca2ba1b
replace jquerytools tooltip by mockup tooltip
tdesvenain Feb 21, 2019
a3040ec
doc: remove plone 4 compatibility
tdesvenain Feb 21, 2019
5fd5235
use mockup widget for date. remove plone.formwidget.datetime dependency
tdesvenain Feb 21, 2019
b601e1c
Update package and test structure (based on bobtemplates.plone)
agitator Jan 6, 2020
1e33dbc
disable code-analysis for now
agitator Jan 6, 2020
f40a9bb
reenable code-analysis
agitator Jan 6, 2020
6e15f57
isort
agitator Jan 6, 2020
cb1e73b
make code-analysis happy
agitator Jan 6, 2020
1ba0b58
update checkouts
agitator Jan 6, 2020
e78f33f
update sources for travis
agitator Jan 7, 2020
07194eb
remove Plone4 profile and cleanup
agitator Jan 9, 2020
a9bc5af
degrok vcard export
agitator Jan 9, 2020
87531e9
degrok address view
agitator Jan 9, 2020
1d0211a
degrok gender_person_title_mapping.json
agitator Jan 9, 2020
71917bf
degrok .content
agitator Jan 9, 2020
ee0115f
degrok subscribers
agitator Jan 9, 2020
e5bcbab
degrok vocabularies
agitator Jan 9, 2020
412b72d
degrok addcontact
agitator Jan 10, 2020
02db531
readd IPerson
agitator Jan 13, 2020
0ba7c8a
remove grok leftovers
agitator Jan 13, 2020
ae7e650
update buildout, default to 5.1 for now
agitator Jan 13, 2020
57b6feb
update test setup based on bobtemplates
agitator Jan 13, 2020
bdd1434
disable some robot tests for now
agitator Jan 13, 2020
4f78bd8
code cleanup
agitator Jan 14, 2020
4e89d81
use decorators
agitator Jan 14, 2020
561a77a
degrok adapters
agitator Jan 15, 2020
466cb14
fix UnicodeDecodeError
agitator Jan 15, 2020
be9e9a7
all grok removed
agitator Jan 15, 2020
ca56718
disable legacy import step
agitator Jan 27, 2020
27112eb
remove extra resource upgrade step
agitator Jan 27, 2020
77bc1de
version shift 2.0
agitator Jan 27, 2020
5116d70
add contact_source index & indexer
agitator Jan 28, 2020
ffaca9d
update checkouts - plone5-mockup-degrok
agitator Jan 28, 2020
cdf8abf
Added method `held_position.get_label` to get the `held_position` lab…
gbastien Jan 24, 2019
77bb450
Use `canonical link` to call `@@gender_person_title_mapping.json`.
gbastien May 13, 2019
0115764
Call @@gender_person_title_mapping.json on portal_url instead canonic…
gbastien May 16, 2019
cbb72e4
Typo, replaced tabs by blanks
gbastien May 16, 2019
548c0e1
Index email field for contact types
daggelpop May 23, 2019
769201e
Keep div and CSS id `viewlet-below-content-body` when rendering `plon…
gbastien Jun 17, 2019
4d8033d
Extended `utils.get_gender_and_number` to manage parameters `use_by` …
gbastien Jun 27, 2019
9cfd024
update changes
agitator Jan 31, 2020
62b5678
Added email index
sgeulette Jun 27, 2019
5512784
Use sc-4.5.4-linux.tar.gz for SauceLabs
agitator Jan 31, 2020
6897c15
Adapted travis for https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz
agitator Jan 31, 2020
d5b8bcd
Completed keywords and adapted project url
gbastien Jun 28, 2019
1d2a1b5
Added contact_source metadata to be used in contact widget
sgeulette Sep 5, 2019
8d8b081
Updated indexer and added test
sgeulette Sep 6, 2019
5788d0f
Made previous update working if never applied
sgeulette Sep 6, 2019
c1afd47
If person details privacy is True, contact details on person don't se…
sgeulette Sep 6, 2019
d10a420
Avoid key error in formatting
sgeulette Sep 18, 2019
05cb536
Safe unicode (#64)
boulch Nov 4, 2019
826c028
Added option to display belowcontenttitle viewlet on contact views.
sgeulette Nov 15, 2019
e234987
Avoid an error when we try to remove a working copy from plone.app.it…
mpeeters Dec 27, 2019
3ea58ba
Display `description` on the organization view. Field `description` m…
gbastien Jan 7, 2020
babfafc
remove grok import
agitator Feb 3, 2020
68cb2ec
disable referencedObjectRemoved subscribers for now
agitator Feb 3, 2020
ac2c58d
cleanup after cherry picking
agitator Feb 3, 2020
3546c41
fix subclassing
agitator Feb 4, 2020
64cefb1
remove from_interfaces_flattened from query - index was removed from …
agitator Feb 5, 2020
6df799a
py3 fixes
agitator Feb 5, 2020
bdf5c12
Merge branch 'plone5-only' of github.com:collective/collective.contac…
agitator Feb 6, 2020
0cb250b
use lambda for sort
agitator Feb 7, 2020
d5162dd
condition for decode
agitator Feb 7, 2020
205e8ca
update changelog
agitator Feb 7, 2020
53a99d2
use behavior shortnames
agitator Feb 7, 2020
6da64e9
Merge branch 'plone5-only' of git://github.com/collective/collective.…
agitator Feb 7, 2020
e33f01c
do not encode held position title for py3
agitator Mar 2, 2020
43c3ad9
remove dependency on ecreall.helpers.upgrade
agitator Mar 2, 2020
9f575f8
Merge branch 'plone5-only' of github.com:collective/collective.contac…
agitator Mar 2, 2020
dc37b27
update classifiers
agitator Mar 2, 2020
55df5fb
autopep8 & isort
agitator Mar 2, 2020
f4a361b
disable for now
agitator Mar 2, 2020
bd28c79
add python3 plone.formwidget.contenttree
agitator Mar 2, 2020
a6ce182
add plone.formwidget.contenttree to checkouts
agitator Mar 2, 2020
d5fb5ca
add python3branch for plone.formwidget.masterselect
agitator Mar 2, 2020
0364a21
fix test setup & improvements
agitator Mar 2, 2020
2ef5d41
test setup fixes
agitator Mar 3, 2020
9f799cd
py3 fixes
agitator Mar 3, 2020
b464915
fix tests
agitator Mar 3, 2020
32b495a
test cleanup
agitator Mar 3, 2020
1332661
use chrome webdriver
agitator Mar 3, 2020
a6d5d67
saucelabs config
agitator Mar 3, 2020
dbda6a6
disable saucelabs for now
agitator Mar 3, 2020
45d2e2e
keywords.open
agitator Mar 3, 2020
8f49908
more robot fixes
agitator Mar 3, 2020
bc28b38
fix upgrades
agitator Mar 5, 2020
ab19bd5
fix sub_org url
agitator Mar 5, 2020
0a7f518
use classes instead of ids, template cleanup
agitator Apr 8, 2020
09ec022
use classes instead of ids
agitator Apr 15, 2020
3e61502
fix condition
agitator Apr 16, 2020
e3f9ec0
Add new `enterprise number` field for organization content type
laulaz Jun 2, 2020
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .coveragerc
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[report]
include =
src/collective/*
src/collective.contact.widget/*
omit =
*/test*
*/upgrades/*
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.min.js binary
46 changes: 32 additions & 14 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,24 +1,42 @@
.coverage*
*.egg-info
*.log
*.mo
*.pyc
.installed.cfg
.mr.developer.cfg
.project
.pydevproject
.settings/
*.py?
*.swp
# dirs
bin/
buildout-cache/
develop-eggs/
eggs/
htmlcov/
include/
lib/
local/
node_modules/
parts/
src/*
!src/collective/
dist/*
test.plone_addon/
var/
buildout-cache/
htmlcov
.coverage
*.html
*.log
# files
.installed.cfg
.mr.developer.cfg
lib64
log.html
output.xml
*.swp
/.idea
pip-selfcheck.json
report.html
.vscode/
.tox/
reports/

# excludes
!.coveragerc
!.editorconfig
!.gitattributes
!.gitignore
!.gitkeep
!.travis.yml
!src/collective
.python-version
7 changes: 7 additions & 0 deletions .jshintrc
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"browser": true,
"globals": {
"$": false,
"window": false
}
}
116 changes: 88 additions & 28 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,33 +1,93 @@
dist: bionic
language: python
sudo: false
cache:
pip: true
directories:
- eggs
python:
- 2.7
- "2.7"
matrix:
include:
- python: "2.7"
env: PLONE_VERSION=51
- python: "2.7"
env: PLONE_VERSION=52
- python: "3.7"
env: PLONE_VERSION=52
sudo: true
fast_finish: true
before_install:
- mkdir webdriver;
wget https://chromedriver.storage.googleapis.com/2.40/chromedriver_linux64.zip;
unzip chromedriver_linux64.zip -d webdriver;
export PATH=$PATH:$(pwd)/webdriver;
- virtualenv -p `which python` .
- bin/pip install -r requirements.txt -c constraints_plone$PLONE_VERSION.txt
- cp test_plone$PLONE_VERSION.cfg buildout.cfg

install:
- mkdir -p buildout-cache/{eggs,downloads}
- python bootstrap.py -c travis.cfg
- bin/buildout -c travis.cfg -N -q -t 3
- pip install coverage
- curl -O https://saucelabs.com/downloads/sc-4.4.11-linux.tar.gz
- tar xzvf sc-4.4.11-linux.tar.gz
- ./sc-4.4.11-linux/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY -i $TRAVIS_JOB_ID -f CONNECTED &
- JAVA_PID=$!
- bash -c "while [ ! -f CONNECTED ]; do sleep 2; done"
- bin/buildout -N -t 3 code-analysis:return-status-codes=True annotate
- bin/buildout -N -t 3 code-analysis:return-status-codes=True

before_script:
- 'export DISPLAY=:99.0'
- Xvfb :99 -screen 0 1024x768x24 > /dev/null 2>&1 &
- sleep 3

script:
- bin/test
- coverage run ./bin/test -t \!robot
# Run code-analysis, except on Python 3.6, which mysteriously fails to find zc.buildout.
- python --version 2> /dev/stdout | grep 3.6 || bin/code-analysis
- ROBOT_BROWSER=chrome bin/test --all

after_success:
- pip install coveralls
- coveralls
after_script:
- kill $JAVA_PID
notifications:
email:
- [email protected]
- [email protected]
- [email protected]
env:
global:
- secure: vUcL3IrMd2Wc2fEnrIR6jD/e1tqnNKiJHKy83EPJM08xLPUghDbx5VoGtfrIur4GN22Ov+nCIH3U6n4BMrsaIj7KGSrOS31tY+UDQHpiu9t03oCfg5e7wHi1/4tn6aVN5UZI1A8a4xJO4S+ziXkM/VbOk2Ln5Petpsck/c2I9ps=
- secure: coD6Bmb6pK+dfbUj49Rmi7XNj1QCGYTECmZvpRWeJs2HFaYceb6Bc+yJI2hFc06P6XUwUoPOS52rn6C/JOcOFXdCuwSSXxKBVgXdt9jDTDYRumbhUqEJfLLqd012gfs10cZDE09uH0W+FPpLaD3Ft71JLhf9WzjXwgO6EVxFp/8=
- ROBOT_BUILD_NUMBER=travis-$TRAVIS_BUILD_NUMBER
- ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:[email protected]:80/wd/hub
- ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_ID
- bin/createcoverage --output-dir=parts/test/coverage
- bin/pip install coverage
- bin/python -m coverage.pickle2json
- bin/pip install -q coveralls
- bin/coveralls









#language: python
# python:
# - 2.7
# install:
# - mkdir -p buildout-cache/{eggs,downloads}
# - pip install --upgrade pip
# - pip install -r requirements.txt
# - python bootstrap.py --version=2.11.4 -c travis.cfg
# - bin/buildout -c travis.cfg -N -q -t 3
# - pip install coverage
# - curl -O https://saucelabs.com/downloads/sc-4.5.4-linux.tar.gz
# - tar xzvf sc-4.5.4-linux.tar.gz
# - ./sc-4.5.4-linux/bin/sc -u $SAUCE_USERNAME -k $SAUCE_ACCESS_KEY -i $TRAVIS_JOB_ID -f CONNECTED &
# - JAVA_PID=$!
# - bash -c "while [ ! -f CONNECTED ]; do sleep 2; done"
# script:
# - bin/test
# - coverage run ./bin/test -t \!robot
# after_success:
# - pip install coveralls
# - coveralls
# after_script:
# - kill $JAVA_PID
# notifications:
# email:
# - [email protected]
# - [email protected]
# - [email protected]
# env:
# global:
# - secure: vUcL3IrMd2Wc2fEnrIR6jD/e1tqnNKiJHKy83EPJM08xLPUghDbx5VoGtfrIur4GN22Ov+nCIH3U6n4BMrsaIj7KGSrOS31tY+UDQHpiu9t03oCfg5e7wHi1/4tn6aVN5UZI1A8a4xJO4S+ziXkM/VbOk2Ln5Petpsck/c2I9ps=
# - secure: coD6Bmb6pK+dfbUj49Rmi7XNj1QCGYTECmZvpRWeJs2HFaYceb6Bc+yJI2hFc06P6XUwUoPOS52rn6C/JOcOFXdCuwSSXxKBVgXdt9jDTDYRumbhUqEJfLLqd012gfs10cZDE09uH0W+FPpLaD3Ft71JLhf9WzjXwgO6EVxFp/8=
# - ROBOT_BUILD_NUMBER=travis-$TRAVIS_BUILD_NUMBER
# - ROBOT_REMOTE_URL=http://$SAUCE_USERNAME:[email protected]:80/wd/hub
# - ROBOT_DESIRED_CAPABILITIES=tunnel-identifier:$TRAVIS_JOB_ID
# - ZSERVER_PORT=55001
71 changes: 69 additions & 2 deletions CHANGES.rst
Original file line number Diff line number Diff line change
@@ -1,11 +1,78 @@
Changelog
=========

1.24 (unreleased)
2.0 (unreleased)
----------------

- Add new `enterprise number` field for organization content type
[laulaz]
- Update for Plone 5.2
[agitator]
- Use mockup for tooltips, modals and date widget.
This removes Plone 4 compatibility.
[thomasdesvenain]
- Do not show add link if content type is not allowed as directory subcontent.
[thomasdesvenain]
- Prevent address field from being erased if they are changed programmaticaly before any manual edition.
[thomasdesvenain]

1.30 (unreleased)
-----------------

- Avoid an error when we try to remove a working copy from plone.app.iterate
[mpeeters]
- Display `description` on the organization view. Field `description` may be
filled but was not displayed.
[gbastien]

1.29 (unreleased)
-----------------

- Nothing changed yet.
- Removed overlay on heldposition actions in person view.
[sgeulette]
- Added option to display belowcontenttitle viewlet on contact views.
[sgeulette]

1.28 (unreleased)
-----------------

- Ensure than export is unicode encoding.
[boulch]


1.27 (unreleased)
-----------------

- Added contact_source metadata to be used in contact widget.
[sgeulette]
- If person details privacy is True, contact details on person don't search related items.
[sgeulette]

1.26 (unreleased)
-----------------

- Keep div and CSS id `viewlet-below-content-body` when rendering
`plone.belowcontentbody` viewlets on various views.
[gbastien]
- Extended `utils.get_gender_and_number` to manage parameters `use_by` and
`use_to` that will add new values to returned result prepended by
`'B'` or `'T'`.
[gbastien]
- Added email index
[sgeulette, daggelpop]

1.25 (unreleased)
-----------------

- Call `@@gender_person_title_mapping.json` from JS on `portal_url`.
[gbastien]

1.24 (unreleased)
-----------------

- Added method `held_position.get_label` to get the `held_position` label so it
is easy to override.
[gbastien]

1.23 (2018-11-20)
-----------------
Expand Down
6 changes: 5 additions & 1 deletion CONTRIBUTORS.rst
Original file line number Diff line number Diff line change
@@ -1,7 +1,11 @@
Contributors
============

- Gauthier Bastien, IMIO
- Vincent Fretin, Ecreall
- Stéphan Geulette, IMIO
- Cédric Messiant, Ecreall
- Frédéric Peters, Entr'ouvert
- Thomas Desvenain, Ecreall

- Peter Holzer, [email protected]
- Laurent Lasudry, Affinitic
41 changes: 41 additions & 0 deletions DEVELOP.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
Using the development buildout
==============================

Create a virtualenv in the package::

$ virtualenv --clear .

Install requirements with pip::

$ ./bin/pip install -r requirements.txt

Run buildout::

$ ./bin/buildout

Start Plone in foreground:

$ ./bin/instance fg


Running tests
-------------

$ tox

list all tox environments:

$ tox -l
py27-Plone51
py27-Plone52
py37-Plone52
build_instance
code-analysis
lint-py27
lint-py37
coverage-report

run a specific tox env:

$ tox -e py37-Plone52

Loading