Skip to content
This repository has been archived by the owner on Sep 29, 2023. It is now read-only.

Merge develop back to master #44

Merged
merged 110 commits into from
Feb 9, 2018
Merged

Merge develop back to master #44

merged 110 commits into from
Feb 9, 2018

Conversation

tsteinruecken
Copy link
Contributor

Develop contains the 2.1 release, while master is still stuck on 2.0.3.
I simply forgot to merge it back..

tsteinruecken and others added 30 commits January 23, 2017 13:38
It currently break if non-asci chars (eg. März) are supplied
skel can also be a RelSkel - which is no subclass of Skeleton, so the super() call will fail
Replaced str() with unicode() in bone/dateBone:fromClient
Fixed a type-mismatch in renders/html/default:edit

Approved-by: codepilot
Approved-by: Andreas Kelch
Approved-by: Stefan Kögl
…singSkel class

Until now, for each referenced entry in any relation a new refSkel class was beeing created and assigned
to valuesCache[boneName]["dest"]. Now, we're reusing a global refSkel class and assign only its valuesCache
to our valuesCache[boneName]["dest"].

Warning: Break threadsafety in it's current form.

We'll have to decide if we want to support it and adapt accordingly.
… an user without any access rights the possibility to logout and view himself.
…naviable for templates

The values of "rel" had been dupplicated into "dest" if multiple=True and an using-skel is set.
Fixing the canAccess() functions of the admin- and vi-renders to give an user without any access rights the possibility to logout and view himself.

Approved-by: Tobias Steinrücken <ts@mausbrand.de>
Approved-by: Andreas H. Kelch <ak@mausbrand.de>
anyway, I found out that skel["key"] always works to set an skeleton's key attribute, which is very awesome, so IMHO this key parameter can be entirely removed.
…e onItemDeleted() from the List-module sometimes depend on this value to perform further operations with the old (set to None!) key..

It must be available even after the entity has been deleted. The old server made it so.
…uld it always be invisible? This fixes it and keeps the existing behavior.
Fixing the order module.

Approved-by: Andreas H. Kelch <ak@mausbrand.de>
Approved-by: codepilot <jmm@phorward.de>
Feature/splitCommitCustomEmailHandler

Approved-by: Andreas H. Kelch <ak@mausbrand.de>
Approved-by: codepilot <jmm@phorward.de>
When a userBone with updatemagic or creationmagic is created, why should it always be invisible? This fixes it and keeps the existing behavior.

Approved-by: Tobias Steinrücken <ts@mausbrand.de>
Approved-by: Andreas H. Kelch <ak@mausbrand.de>
Don't set key to None when skeleton.delete() is called

Approved-by: Andreas H. Kelch <ak@mausbrand.de>
Approved-by: Tobias Steinrücken <ts@mausbrand.de>
Export "unique" property of bone structure in json renderer.

Approved-by: codepilot <jmm@phorward.de>
Approved-by: Tobias Steinrücken <ts@mausbrand.de>
Approved-by: Andreas H. Kelch <ak@mausbrand.de>
tsteinruecken and others added 23 commits October 24, 2017 13:40
…rPassThrough

Introduced the passThrough parameter to renders and unified the API of renders
…entFields

serializing a textBone failed in getSearchDocumentFields if valuesCache[name] is None
Updated changelog.md to reflect latest merges
…otimestamp() but our datebone class ExtendedDateTime does
This bug only came up when using a dateBone inside a RelSkel with ViUR 2.1.
In ViUR 2.0, where it was previously developed with, the bug did not raise.
This fixes the issue by simply returning None when no value is provided.
This commit should provide ways to export the new params-variable to provide additional information to the client. It is used by refactor_secondfactor.

Tendering the XML-renderer anymore should be discussed soon.
Fixing the bug that comes up when a DB entry has no defaultValue and the value even is not set in the database, causing that it does not exist in the valuesCache.
Bugfix for stringBone not existing in DB
Consequently provide the tpl parameter
Export params variables by json and xml renderer
This always came into the case "if len( tmpdata ) > 2:" below, because key.partition("$") always returns a 3-item tuple, but the structural logic was created to deal with the result of a split() function call.
Copy link
Member

@phorward phorward left a comment

Choose a reason for hiding this comment

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

Make it so!

@tsteinruecken tsteinruecken merged commit 9f3b61c into master Feb 9, 2018
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants