Sync upstream 2.6 latest #4
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…he other tables is deleted.
Session, that used for querying config varibales diring startup was not finished and one idle connection appeared in postgres. Now session committed in the end of environment setup.
`datastore_create` directly updates database and solr index and this reduces possibility of conflicts inside simultaneous calls
Small change in datastore plugin, that generates fully-qualified url during datastore creation
The problem was that dashboard_mark_activities_old method was not changed to utcnow() format, so when datasets were updated, because of the time difference, user have seen them before he actually entered the page. I've adde utcnow() format for this method and now the time works fine. Also added untnow() to Dashboard model, so the time can be saved correctly.
Now documentation contains correct default value - False. Also this option mentioned in writhing extension guide
Added few additional allowed tags to `bleach.clean` function and changed sanitization sequence so that markdown applied first and only after that result cleaned
the code below
```
if not authorized1 and authorized2:
return {'success': False, 'msg': _('User %s not authorized to edit these packages') % user}
else:
return {'success': True}
```
didn't work when authorized1 == authorized2 == False which presented that user cannot access to both packages(datasets).
It would be ： `if not False and False` -> `if True and False` -> `if Fasle`, then return `'success' : True`
Dataset counts were not displayed at all for group items because the template checked `packages` rather than `package_count`.
Backport ckan#3366 for ckan 2.6
When ckan.i18n_directory was used we were passing the wrong keyword (`config`) instead of `pylons_config`
…-upstream-2.6-latest for get_reset_link, upstream already has a fix, so our own fix is not necessary, removed.
|
Hi Karen: |
|
closing this was a while ago |
|
actually can't close. :-) |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #
Proposed fixes:
Features:
Please [X] all the boxes above that apply