# HG changeset patch
# User Sandrine Ribeau <sandrine.ribeau@logilab.fr>
# Date 1238601192 25200
# Node ID 3a5d622f166fc787ec8daef73857c76a7d9c33ac
# Parent ef2715330b92f68b70b7acfd9793159b5e26ee00# Parent 0d12d4371d11b87d525131242915a12ef2d3dacd
merge
diff -r ef2715330b92 -r 3a5d622f166f doc/book/en/B0040-migration.en.txt
--- a/doc/book/en/B0040-migration.en.txt Wed Apr 01 08:41:26 2009 -0700
+++ b/doc/book/en/B0040-migration.en.txt Wed Apr 01 08:53:12 2009 -0700
@@ -44,8 +44,8 @@
(schema and data migration for example).
Again in the directory `migration`, the file `depends.map` allows to indicate
-that to migrate to a particular model version, you always have to first migrate
-to a particular `CubicWeb` version. This file can contain comments (lines
+that for the migration to a particular model version, you always have to first
+migrate to a particular `CubicWeb` version. This file can contain comments (lines
starting by `#`) and a dependancy is listed as follows: ::
<model version n° X.Y.Z> : <cubicweb version n° X.Y.Z>
@@ -60,12 +60,12 @@
Base context
------------
-The following identifiers are pre-defined in the migration scripts:
+The following identifiers are pre-defined in migration scripts:
* `config`, instance configuration
* `interactive_mode`, boolean indicating that the script is executed in
- an intercative mode or not
+ an interactive mode or not
* `appltemplversion`, application model version of the instance
@@ -73,7 +73,7 @@
* `cubicwebversion`, installed cubicweb version
-* `confirm(question)`, function interrogating the user and returning true
+* `confirm(question)`, function asking the user and returning true
if the user answers yes, false otherwise (always returns true in
non-interactive mode)
@@ -98,7 +98,7 @@
Schema migration
----------------
-The following functions for schema migration are available in the `repository`
+The following functions for schema migration are available in `repository`
scripts:
* `add_attribute(etype, attrname, attrtype=None, commit=True)`, adds a new
@@ -148,7 +148,7 @@
or even relations definitions).
* `change_relation_props(subjtype, rtype, objtype, commit=True, **kwargs)`, changes
- properties of a relation definition by using the nammed parameters of the properties
+ properties of a relation definition by using the named parameters of the properties
to change.
* `set_widget(etype, rtype, widget, commit=True)`, changes the widget used for the
@@ -159,19 +159,19 @@
Data migration
--------------
-The following functions for data migration are available in the `repository` scripts:
+The following functions for data migration are available in `repository` scripts:
* `rql(rql, kwargs=None, cachekey=None, ask_confirm=True)`, executes an arbitrary RQL
query, either to interrogate or update. A result set object is returned.
* `add_entity(etype, *args, **kwargs)`, adds a nes entity type of the given
- type. The attributes and relations values are specified using the nammed and
+ type. The attribute and relation values are specified using the named and
positionned parameters.
Workflow creation
-----------------
-The following functions for workflow creation are available in the `repository`
+The following functions for workflow creation are available in `repository`
scripts:
* `add_state(name, stateof, initial=False, commit=False, **kwargs)`, adds a new state
@@ -185,10 +185,10 @@
Configuration migration
-----------------------
-The following functions for configuration migration are available in all the
+The following functions for configuration migration are available in all
scripts:
-* `option_renamed(oldname, newname)`, indicates that an option has been renammed
+* `option_renamed(oldname, newname)`, indicates that an option has been renamed
* `option_group_change(option, oldgroup, newgroup)`, indicates that an option does not
belong anymore to the same group.
@@ -202,7 +202,7 @@
--------------------------
Those functions are only used for low level operations that could not be
accomplished otherwise or to repair damaged databases during interactive
-session. They are available in the `repository` scripts:
+session. They are available in `repository` scripts:
* `sqlexec(sql, args=None, ask_confirm=True)`, executes an arbitrary SQL query
* `add_entity_type_table(etype, commit=True)`
diff -r ef2715330b92 -r 3a5d622f166f doc/book/en/C000-administration.en.txt
--- a/doc/book/en/C000-administration.en.txt Wed Apr 01 08:41:26 2009 -0700
+++ b/doc/book/en/C000-administration.en.txt Wed Apr 01 08:53:12 2009 -0700
@@ -15,4 +15,4 @@
C020-site-config.en.txt
C030-instance-config.en.txt
C040-rql.en.txt
- C041-rql-tutorial.en.txt
+
diff -r ef2715330b92 -r 3a5d622f166f doc/book/en/C011-installation.en.txt
diff -r ef2715330b92 -r 3a5d622f166f doc/book/en/D000-annex.en.txt
--- a/doc/book/en/D000-annex.en.txt Wed Apr 01 08:41:26 2009 -0700
+++ b/doc/book/en/D000-annex.en.txt Wed Apr 01 08:53:12 2009 -0700
@@ -1,9 +1,9 @@
.. -*- coding: utf-8 -*-
-=================
-Part IV - Annexes
-=================
+====================
+Part IV - Appendixes
+====================
The following chapters are reference material.
diff -r ef2715330b92 -r 3a5d622f166f doc/book/en/D030-architecture.en.txt
--- a/doc/book/en/D030-architecture.en.txt Wed Apr 01 08:41:26 2009 -0700
+++ b/doc/book/en/D030-architecture.en.txt Wed Apr 01 08:53:12 2009 -0700
@@ -1,8 +1,8 @@
.. -*- coding: utf-8 -*-
-Architecture du serveur
------------------------
+Server Architecture
+-------------------
.. image:: images/server-class-diagram.png
diff -r ef2715330b92 -r 3a5d622f166f doc/book/en/D070-cookbook.en.txt
--- a/doc/book/en/D070-cookbook.en.txt Wed Apr 01 08:41:26 2009 -0700
+++ b/doc/book/en/D070-cookbook.en.txt Wed Apr 01 08:53:12 2009 -0700
@@ -10,7 +10,7 @@
* How to import LDAP users in `CubicWeb`?
Here is a very usefull script which enables you to import LDAP users
- into your `CubicWeb` application by runing the following: ::
+ into your `CubicWeb` application by running the following: ::
import os
diff -r ef2715330b92 -r 3a5d622f166f interfaces.py
--- a/interfaces.py Wed Apr 01 08:41:26 2009 -0700
+++ b/interfaces.py Wed Apr 01 08:53:12 2009 -0700
@@ -246,12 +246,26 @@
"""return content entity"""
def isioc_container(self):
- """return container entity"""
+ """return container entity"""
+
+ def isioc_type(self):
+ """return container type (post, BlogPost, MailMessage)"""
+
+ def isioc_replies(self):
+ """return replies items"""
+
+ def isioc_topics(self):
+ """return topics items"""
class ISiocContainer(Interface):
"""interface for entities (which are container
in sioc specification) with sioc views"""
def isioc_type(self):
- """return container type (forum, weblog, mailinglist)"""
+ """return container type (forum, Weblog, MailingList)"""
+
+ def isioc_items(self):
+ """return contained items"""
+
+
diff -r ef2715330b92 -r 3a5d622f166f web/views/baseviews.py
--- a/web/views/baseviews.py Wed Apr 01 08:41:26 2009 -0700
+++ b/web/views/baseviews.py Wed Apr 01 08:53:12 2009 -0700
@@ -673,12 +673,8 @@
content_type = 'text/xml'
http_cache_manager = MaxAgeHTTPCacheManager
cache_max_age = 60*60*2 # stay in http cache for 2 hours by default
-
- def cell_call(self, row, col):
- self.wview('rssitem', self.rset, row=row, col=col)
-
- def call(self):
- """display a list of entities by calling their <item_vid> view"""
+
+ def _open(self):
req = self.req
self.w(u'<?xml version="1.0" encoding="%s"?>\n' % req.encoding)
self.w(u'''<rss version="2.0"
@@ -691,14 +687,25 @@
params = req.form.copy()
params.pop('vid', None)
self.w(u' <link>%s</link>\n' % html_escape(self.build_url(**params)))
+
+ def _close(self):
+ self.w(u' </channel>\n')
+ self.w(u'</rss>')
+
+ def call(self):
+ """display a list of entities by calling their <item_vid> view"""
+ self._open()
for i in xrange(self.rset.rowcount):
self.cell_call(i, 0)
- self.w(u' </channel>\n')
- self.w(u'</rss>')
+ self._close()
+
+ def cell_call(self, row, col):
+ self.wview('rssitem', self.rset, row=row, col=col)
class RssItemView(EntityView):
id = 'rssitem'
date_format = '%%Y-%%m-%%dT%%H:%%M%+03i:00' % (timezone / 3600)
+ add_div_section = False
def cell_call(self, row, col):
entity = self.complete_entity(row, col)