Skip to content

Commit

Permalink
Cleanup of PLIP #1734
Browse files Browse the repository at this point in the history
  • Loading branch information
thet committed Jun 12, 2017
1 parent d39ccd3 commit 262e7ff
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 10 deletions.
9 changes: 4 additions & 5 deletions CHANGES.rst
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,9 @@ Breaking changes:

New features:

- make thumbsize in folder contents listing adjustable/supressable
(uses site control panel settings: thumb_size_tables ...)
clean up deprecated icon related code
replace paperclip icon with mime type icons
- Make thumb_scale in folder contents listing adjustable/supressable (uses site control panel settings: thumb_scale_tables ...).
Clean up deprecated icon related code.
Replace paperclip icon with mime type icons.
https://github.com/plone/Products.CMFPlone/issues/1734
[fgrcon]

Expand Down Expand Up @@ -44,7 +43,7 @@ Bug fixes:

- removed unittest2 dependency.
[kakshay21]

3.4 (2017-04-01)
----------------

Expand Down
10 changes: 5 additions & 5 deletions plone/app/content/browser/contents/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -219,15 +219,15 @@ def get_columns(self):
columns[column] = translate(_(column), context=self.request)
return columns

def get_thumbSize(self):
def get_thumb_scale(self):
registry = getUtility(IRegistry)
settings = registry.forInterface(
ISiteSchema, prefix="plone", check=False)
if settings.no_thumbs_tables:
# thumbs to be supressed
return 'none'
thumb_size_table = settings.thumb_size_table
return thumb_size_table
return None
thumb_scale_table = settings.thumb_scale_table
return thumb_scale_table

@property
def ignored_indexes(self):
Expand Down Expand Up @@ -316,7 +316,7 @@ def get_options(self):
'initialFolder': IUUID(self.context, None),
'useTus': TUS_ENABLED
},
'thumbSize' : self.get_thumbSize(),
'thumb_scale': self.get_thumb_scale(),
}
return options

Expand Down

0 comments on commit 262e7ff

Please sign in to comment.