Skip to content

Commit

Permalink
Principals: don't merge titles.
Browse files Browse the repository at this point in the history 
The first one is the one from the plugin with the highest priority.
  • Loading branch information
@reinhardt
reinhardt committed Jul 12, 2019
1 parent a04fa18 commit be08e50
Showing 1 changed file with 5 additions and 3 deletions.
8 changes: 5 additions & 3 deletions plone/app/vocabularies/principals.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,11 @@ def merge_principal_infos(infos, prefix=False):
# Principals with the same ID but different types. Should not
# happen.
raise ValueError('Principal ID not unique: {}'.format(info['id']))
info['title'] = ';'.join(
[info['title'] for info in infos if info['title']]
)
if not info['title']:
for candidate in infos:
if candidate['title']:
info['title'] = candidate['title']
break
return info


Expand Down

1 comment on commit be08e50

@jenkins-plone-org
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@reinhardt Jenkins CI reporting about code analysis
See the full report here: https://jenkins.plone.org/job/package-plone.app.vocabularies/17/violations

plone/app/vocabularies/actions.py:24:71: C812 missing trailing comma
plone/app/vocabularies/actions.py:50:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/groups.py:75:11: T000 Todo note found.
plone/app/vocabularies/security.py:17:5: Q000 Remove bad quotes.
plone/app/vocabularies/types.py:99:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/types.py:150:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/types.py:190:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/types.py:241:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/types.py:315:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/testing.py:15:41: C812 missing trailing comma
plone/app/vocabularies/testing.py:18:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/syndication.py:16:7: T000 Todo note found.
plone/app/vocabularies/syndication.py:45:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/syndication.py:58:33: C812 missing trailing comma
plone/app/vocabularies/syndication.py:73:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/users.py:18:5: Q000 Remove bad quotes.
plone/app/vocabularies/principals.py:66:40: F812 list comprehension redefines 'info' from line 63
plone/app/vocabularies/principals.py:66:80: C812 missing trailing comma
plone/app/vocabularies/principals.py:71:30: P101 format string does contain unindexed parameters
plone/app/vocabularies/principals.py:109:70: C812 missing trailing comma
plone/app/vocabularies/principals.py:131:70: C812 missing trailing comma
plone/app/vocabularies/principals.py:135:31: P101 format string does contain unindexed parameters
plone/app/vocabularies/principals.py:248:42: P101 format string does contain unindexed parameters
plone/app/vocabularies/principals.py:257:55: C812 missing trailing comma
plone/app/vocabularies/principals.py:265:62: C812 missing trailing comma
plone/app/vocabularies/principals.py:267:14: C812 missing trailing comma
plone/app/vocabularies/__init__.py:12:1: E731 do not assign a lambda expression, use a def
plone/app/vocabularies/__init__.py:29:13: D001 found directlyProvides( replace it with zope.interface.provider
plone/app/vocabularies/editors.py:25:24: C812 missing trailing comma
plone/app/vocabularies/editors.py:33:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/datetimerelated.py:54:25: C812 missing trailing comma
plone/app/vocabularies/catalog.py:510:14: C812 missing trailing comma
plone/app/vocabularies/catalog.py:650:32: C812 missing trailing comma
plone/app/vocabularies/workflow.py:76:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/workflow.py:124:11: T000 Todo note found.
plone/app/vocabularies/workflow.py:136:14: C812 missing trailing comma
plone/app/vocabularies/workflow.py:145:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/workflow.py:244:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/language.py:112:64: C812 missing trailing comma
plone/app/vocabularies/terms.py:59:24: C812 missing trailing comma
plone/app/vocabularies/terms.py:90:36: C812 missing trailing comma
plone/app/vocabularies/skins.py:65:41: C812 missing trailing comma
plone/app/vocabularies/skins.py:66:22: C812 missing trailing comma
plone/app/vocabularies/skins.py:72:1: E305 expected 2 blank lines after class or function definition, found 1
plone/app/vocabularies/tests/test_editors.py:24:54: C812 missing trailing comma
plone/app/vocabularies/tests/test_imagesvocabularies.py:18:50: C812 missing trailing comma
plone/app/vocabularies/tests/test_principals.py:16:45: C812 missing trailing comma
plone/app/vocabularies/tests/test_principals.py:207:69: C812 missing trailing comma
plone/app/vocabularies/tests/test_principals.py:210:69: C812 missing trailing comma
plone/app/vocabularies/tests/test_principals.py:223:73: C812 missing trailing comma
plone/app/vocabularies/tests/test_principals.py:226:73: C812 missing trailing comma
plone/app/vocabularies/tests/test_principals.py:229:67: C812 missing trailing comma
plone/app/vocabularies/tests/test_principals.py:351:80: E501 line too long (82 > 79 characters)
plone/app/vocabularies/tests/test_principals.py:352:80: E501 line too long (82 > 79 characters)
plone/app/vocabularies/tests/test_principals.py:373:77: C812 missing trailing comma
plone/app/vocabularies/tests/test_principals.py:383:80: E501 line too long (82 > 79 characters)
plone/app/vocabularies/tests/test_principals.py:384:80: E501 line too long (82 > 79 characters)
plone/app/vocabularies/tests/test_principals.py:401:21: E126 continuation line over-indented for hanging indent
plone/app/vocabularies/tests/test_principals.py:431:21: E126 continuation line over-indented for hanging indent
plone/app/vocabularies/tests/test_principals.py:464:21: E126 continuation line over-indented for hanging indent
plone/app/vocabularies/tests/test_subjects_under_context.py:43:33: C812 missing trailing comma
plone/app/vocabularies/tests/test_subjects_under_context.py:51:33: C812 missing trailing comma
plone/app/vocabularies/tests/test_vocabularies.py:43:47: C812 missing trailing comma
plone/app/vocabularies/tests/test_vocabularies.py:108:10: C812 missing trailing comma
plone/app/vocabularies/tests/test_timezonevocabularies.py:19:47: C812 missing trailing comma
plone/app/vocabularies/tests/test_timezonevocabularies.py:28:47: C812 missing trailing comma
plone/app/vocabularies/tests/test_timezonevocabularies.py:46:53: C812 missing trailing comma
plone/app/vocabularies/tests/test_timezonevocabularies.py:50:56: C812 missing trailing comma
plone/app/vocabularies/tests/test_timezonevocabularies.py:63:56: C812 missing trailing comma
plone/app/vocabularies/tests/test_timezonevocabularies.py:74:56: C812 missing trailing comma

Follow these instructions to reproduce it locally.

Please sign in to comment.