Commits · a9a99ab7e3873047bbf8904fecf47d19a6d841ea · nexedi / erp5

24 Dec, 2010 24 commits

Stick behaviour of acquisition_mask_value parameter · a9a99ab7

Nicolas Delaby authored Dec 24, 2010

of PropertySheets.

mask_value == True, means local value take precedence over
acquisition lookups.

mask_value == False, means local value is displayed only
if no relation is setted up OR if distant value is null (depends of Accessor type).
Otherwise an acquired value is displayed over local_value.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41761 20353a03-c40f-0410-a6d1-a30d3c3de9de

a9a99ab7

Make Contribution Tool accept non-conformant %-escaped URL (or unescaped URL) · 4111f81c

Julien Muchembled authored Dec 24, 2010

This fixes TestWebCrawler.test_02_crawlWebSite

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41759 20353a03-c40f-0410-a6d1-a30d3c3de9de

4111f81c

runUnitTest: add tests/Z2.log access log · 642f146d

Julien Muchembled authored Dec 24, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41758 20353a03-c40f-0410-a6d1-a30d3c3de9de

642f146d

Revert [41642] ("InvaliUrl Exception is only available from urlnorm version 1.0.1") · 88abfb38

Julien Muchembled authored Dec 24, 2010

InvalidUrl exception already exists in version 1.0

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41757 20353a03-c40f-0410-a6d1-a30d3c3de9de

88abfb38

Removing Property Sheet, because it has been moved to ERP5PropertySheetLegacy. · 64c4b04d
Lucas Carvalho authored Dec 24, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41754 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
64c4b04d
Moved ERP5Configurator/PropertySheet to ERP5PropertySheetLegacy. · 09a3310c
Lucas Carvalho authored Dec 24, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41753 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
09a3310c

Implements interface in all Configurator Item. · 8a0f0884

Lucas Carvalho authored Dec 24, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41752 20353a03-c40f-0410-a6d1-a30d3c3de9de

8a0f0884

It is obsolete to consider that DMS will be in inconsistent state · 6fa04ed1

Nicolas Delaby authored Dec 24, 2010

If 2 documents exists with same reference, version, language but different
portal_types as long as only one is published in same time.

The user has to take a decision regarding which document to display.
Thats's why the test check that document stays in 'draft' state.
Otherwise side effects might happens on published document like
a Web Page is replaced by File (which display nothing) automatically.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41751 20353a03-c40f-0410-a6d1-a30d3c3de9de

6fa04ed1

do not call setter in getter, because it is unexpected behaviour. · ccc09207
Kazuhiko Shiozaki authored Dec 24, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41750 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
ccc09207
Do not try to display more languages than the one configured on WebSite level · 5163d16b
Nicolas Delaby authored Dec 24, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41749 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
5163d16b

add a backward compatibility code. · 3cf6d59a

Kazuhiko Shiozaki authored Dec 24, 2010

getFilename() should return existing source_reference value for old documents.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41748 20353a03-c40f-0410-a6d1-a30d3c3de9de

3cf6d59a

Cleanup white spaces · daadc076

Nicolas Delaby authored Dec 24, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41747 20353a03-c40f-0410-a6d1-a30d3c3de9de

daadc076

Add memcached to supervisor_programs · e57341bc

Arnaud Fontaine authored Dec 24, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41746 20353a03-c40f-0410-a6d1-a30d3c3de9de

e57341bc

unused import · ed224032

Nicolas Dumazet authored Dec 24, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41745 20353a03-c40f-0410-a6d1-a30d3c3de9de

ed224032

move block into lock: if several threads fiddle with erp5.accessor_holder · 8651971e

Nicolas Dumazet authored Dec 24, 2010

at the same time, we could lose with some AttributeErrors


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41744 20353a03-c40f-0410-a6d1-a30d3c3de9de

8651971e

this code should only apply to filesystem constraints, if const is a dict · bda69450
Nicolas Dumazet authored Dec 24, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41743 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
bda69450

wrong file was committed in r41741, sorry. · 12bc6b98

Nicolas Dumazet authored Dec 24, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41742 20353a03-c40f-0410-a6d1-a30d3c3de9de

12bc6b98

fix typo in log message · f3a03935

Nicolas Dumazet authored Dec 24, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41741 20353a03-c40f-0410-a6d1-a30d3c3de9de

f3a03935

missing 's' · 4053649e

Nicolas Dumazet authored Dec 24, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41740 20353a03-c40f-0410-a6d1-a30d3c3de9de

4053649e

coding style/cleanup only · 044311fd

Nicolas Dumazet authored Dec 24, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41739 20353a03-c40f-0410-a6d1-a30d3c3de9de

044311fd

invert comparison to lose one level of indentation · e7be2a3d
Nicolas Dumazet authored Dec 24, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41738 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
e7be2a3d
type_definition is a dictionary, a has_key lookup is faster than getting the key list · 0a9b2d80
Nicolas Dumazet authored Dec 24, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41737 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
0a9b2d80
Updated the sphinx url. The file still the same, so we do not need to change the md5sum. · d4669a5c
Lucas Carvalho authored Dec 24, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41736 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
d4669a5c

ignore non-filesystem propertysheets · 25bb93d0

Nicolas Dumazet authored Dec 24, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41735 20353a03-c40f-0410-a6d1-a30d3c3de9de

25bb93d0

23 Dec, 2010 16 commits

I've forgot to change it after renaming the class name. · bd472340
Lucas Carvalho authored Dec 23, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41733 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
bd472340

erp5_egov: some cleanup · d16400cc

Julien Muchembled authored Dec 23, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41732 20353a03-c40f-0410-a6d1-a30d3c3de9de

d16400cc

Postpone @expectedFailure in test_safeHTML_impossible_conversion · 16ce485d

Julien Muchembled authored Dec 23, 2010

This shows that it is currently impossible to edit a Web Page with invalid HTML.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41730 20353a03-c40f-0410-a6d1-a30d3c3de9de

16ce485d

Fix test_20_reStructuredText · 06736d76

Julien Muchembled authored Dec 23, 2010

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41729 20353a03-c40f-0410-a6d1-a30d3c3de9de

06736d76

safe_html: reescape entities, otherwise scrubHTML produces invalid HTML · 9e61edf0
Julien Muchembled authored Dec 23, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41727 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
9e61edf0

PortalTransforms: merge upstream 2.0 · b255c894

Julien Muchembled authored Dec 23, 2010

This fixes test_20_reStructuredText partially.

Conflicts:
	Products/PortalTransforms/TransformEngine.py
	Products/PortalTransforms/libtransforms/commandtransform.py
	Products/PortalTransforms/transforms/safe_html.py
	Products/PortalTransforms/utils.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41726 20353a03-c40f-0410-a6d1-a30d3c3de9de

b255c894

PortalTransforms: merge upstream revision 10366 (17/01/09) · 4adafd42

Julien Muchembled authored Dec 23, 2010

Conflicts:
	Products/PortalTransforms/Extensions/Install.py
	Products/PortalTransforms/HISTORY.txt
	Products/PortalTransforms/Transform.py
	Products/PortalTransforms/TransformEngine.py
	Products/PortalTransforms/chain.py
	Products/PortalTransforms/configure.zcml
	Products/PortalTransforms/data.py
	Products/PortalTransforms/interfaces.py
	Products/PortalTransforms/libtransforms/commandtransform.py
	Products/PortalTransforms/libtransforms/piltransform.py
	Products/PortalTransforms/libtransforms/retransform.py
	Products/PortalTransforms/tests/test_engine.py
	Products/PortalTransforms/tests/test_transforms.py
	Products/PortalTransforms/transforms/broken.py
	Products/PortalTransforms/transforms/html_body.py
	Products/PortalTransforms/transforms/identity.py
	Products/PortalTransforms/transforms/image_to_html.py
	Products/PortalTransforms/transforms/lynx_dump.py
	Products/PortalTransforms/transforms/markdown_to_html.py
	Products/PortalTransforms/transforms/pdf_to_html.py
	Products/PortalTransforms/transforms/pdf_to_text.py
	Products/PortalTransforms/transforms/python.py
	Products/PortalTransforms/transforms/rest.py
	Products/PortalTransforms/transforms/rtf_to_html.py
	Products/PortalTransforms/transforms/rtf_to_xml.py
	Products/PortalTransforms/transforms/safe_html.py
	Products/PortalTransforms/transforms/st.py
	Products/PortalTransforms/transforms/text_pre_to_html.py
	Products/PortalTransforms/transforms/text_to_html.py
	Products/PortalTransforms/transforms/textile_to_html.py
	Products/PortalTransforms/transforms/word_to_html.py
	Products/PortalTransforms/unsafe_transforms/command.py
	Products/PortalTransforms/unsafe_transforms/xml.py
	Products/PortalTransforms/utils.py
	Products/PortalTransforms/version.txt

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41725 20353a03-c40f-0410-a6d1-a30d3c3de9de

4adafd42

PortalTransforms: merge upstream 1.6.0-a1 · 50392b74

Julien Muchembled authored Dec 23, 2010

Conflicts:
	transforms/safe_html.py

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41724 20353a03-c40f-0410-a6d1-a30d3c3de9de

50392b74

PortalTransforms: merge upstream 1.4.2-final · 01b1b23a

Julien Muchembled authored Dec 23, 2010

Drop [6704] ("Make header level and report level configurable per-instance")

Conflicts:
	HISTORY.txt
	transforms/html_to_text.py
	transforms/rest.py
	transforms/safe_html.py
	version.txt

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41723 20353a03-c40f-0410-a6d1-a30d3c3de9de

01b1b23a

safe_html: fix repairing with BeautifulSoup (+ some refactoring) · f6a8f1d5
Julien Muchembled authored Dec 23, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41722 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
f6a8f1d5

add a ToDo comment. · 4b5b7cb2

Kazuhiko Shiozaki authored Dec 23, 2010


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41721 20353a03-c40f-0410-a6d1-a30d3c3de9de

4b5b7cb2

we can just ignore portal_type non-matching case, instead of raising an exception. · c4644181
Kazuhiko Shiozaki authored Dec 23, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41719 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
c4644181
Use getDestinationPortalType instead of getTitle on contribution registry. · 8e33a6e0
Grégory Wisniewski authored Dec 23, 2010
```
git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41718 20353a03-c40f-0410-a6d1-a30d3c3de9de
```
8e33a6e0

2010-12-23 lucas · 45411f6f

Lucas Carvalho authored Dec 23, 2010

* Renamed the testStandardConfigurationWorkflow to testLiveStandardConfigurationWorkflow.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41717 20353a03-c40f-0410-a6d1-a30d3c3de9de

45411f6f

If portal_type and container are explicitely passed by user. · bba54e07

Nicolas Delaby authored Dec 23, 2010

We can take a shortcut.
portal_contribution.newContent(portal_type, container) will be an 
alias of container.newContent(portal_type) with starting of Metadata Discovery
process.

Done by JPS


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41716 20353a03-c40f-0410-a6d1-a30d3c3de9de

bba54e07

2010-12-23 Kazuhiko · 0b4dcfeb

Kazuhiko Shiozaki authored Dec 23, 2010

* use my_filename instead of my_source_reference in File_view and Image_view.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@41715 20353a03-c40f-0410-a6d1-a30d3c3de9de

0b4dcfeb