Fix (de)serialization of ComputedRelation read permissions
For normal relation types, permissions don't need to be stored since
they're just default values for the relation definitions. However,
computed relations are serialized (as CWComputedRType), while their
relation definitions are added at schema finalization time, and are only
in memory. So add the 'read_permission' relation to CWComputedRType,
and the appropriate hooks to save and restore those permissions.
To avoid having to touch yams, we drop the 'add' and 'delete'
permissions from the default computed relation permissions; this should
probably be backported there. The actual permissions (set on the
relation definitions) are hardcoded in finalize_computed_relations
anyway.
In deserialize_schema, the CWComputedRType handling needs to be delayed
a little bit, until after we've called deserialize_ertype_permissions.
The rql2sql test is adjusted because CWComputedRType has a 'name'
attribute and the 'read_permission' relation, which generates ambiguity
vs CWEType.
We add an explicit CubicWebRelationSchema.check_permission_definitions,
since we need to check both that computed and non-computed rtypes are
defined properly.
Based on report and initial patch from Christophe de Vienne (thanks!).
Closes #5706307
SRC=.
# You can set these sphinx variables from the command line.
SPHINXOPTS =
SPHINXBUILD = sphinx-build
PAPER =
#BUILDDIR = build
BUILDDIR = _build
CWDIR = ..
JSDIR = ${CWDIR}/web/data
JSTORST = tools/pyjsrest.py
BUILDJS = js_api
# Internal variables for sphinx
PAPEROPT_a4 = -D latex_paper_size=a4
PAPEROPT_letter = -D latex_paper_size=letter
ALLSPHINXOPTS = -d ${BUILDDIR}/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
.PHONY: help clean html web pickle htmlhelp latex changes linkcheck
help:
@echo "Please use \`make <target>' where <target> is one of"
@echo " all to make standalone HTML files, developer manual and API doc"
@echo " html to make standalone HTML files"
@echo "--- "
@echo " pickle to make pickle files (usable by e.g. sphinx-web)"
@echo " htmlhelp to make HTML files and a HTML help project"
@echo " latex to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
@echo " changes to make an overview over all changed/added/deprecated items"
@echo " linkcheck to check all external links for integrity"
clean:
rm -f *.html
-rm -rf ${BUILDDIR}/html ${BUILDDIR}/doctrees
-rm -rf ${BUILDJS}
all: html
# run sphinx ###
html: js
mkdir -p ${BUILDDIR}/html ${BUILDDIR}/doctrees
$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) ${BUILDDIR}/html
@echo
@echo "Build finished. The HTML pages are in ${BUILDDIR}/html."
js:
mkdir -p ${BUILDJS}
$(JSTORST) -p ${JSDIR} -o ${BUILDJS}
pickle:
mkdir -p ${BUILDDIR}/pickle ${BUILDDIR}/doctrees
$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) ${BUILDDIR}/pickle
@echo
@echo "Build finished; now you can process the pickle files or run"
@echo " sphinx-web ${BUILDDIR}/pickle"
@echo "to start the sphinx-web server."
web: pickle
htmlhelp:
mkdir -p ${BUILDDIR}/htmlhelp ${BUILDDIR}/doctrees
$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) ${BUILDDIR}/htmlhelp
@echo
@echo "Build finished; now you can run HTML Help Workshop with the" \
".hhp project file in ${BUILDDIR}/htmlhelp."
latex:
mkdir -p ${BUILDDIR}/latex ${BUILDDIR}/doctrees
$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) ${BUILDDIR}/latex
@echo
@echo "Build finished; the LaTeX files are in ${BUILDDIR}/latex."
@echo "Run \`make all-pdf' or \`make all-ps' in that directory to" \
"run these through (pdf)latex."
changes:
mkdir -p ${BUILDDIR}/changes ${BUILDDIR}/doctrees
$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) ${BUILDDIR}/changes
@echo
@echo "The overview file is in ${BUILDDIR}/changes."
linkcheck:
mkdir -p ${BUILDDIR}/linkcheck ${BUILDDIR}/doctrees
$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) ${BUILDDIR}/linkcheck
@echo
@echo "Link check complete; look for any errors in the above output " \
"or in ${BUILDDIR}/linkcheck/output.txt."