Commit 820d3594 authored by LE GAC Renaud's avatar LE GAC Renaud
Browse files

Series of bug fixed.

parent b6274284
......@@ -88,6 +88,6 @@ def userModelConsistency():
if oldkey in row.data:
data[newkey] = row.data[oldkey]
db(query).update(data=data)
db(db.history.id == row.id).update(data=data)
return T('%s entries modified in the history table.') % len(rows)
\ No newline at end of file
......@@ -2,31 +2,33 @@
The fitler conditions is defined in the ``General`` tab.
The ``Conditions`` are used to select a sub-sample of the history records. It
is based on the smart_query_ available in the Web2py_ framework. The query
is written in the natural language, but it is limited to field of the
history table. Fields of the foreign tables, virtual fields or keys of the
The ``Conditions`` are used to select a sub-sample of the history records. It
is based on the smart_query_ available in the Web2py_ framework. The query
is written in the natural language, but it is limited to field of the
history table. Fields of the foreign tables, virtual fields or keys of the
``history.data`` dictionary can not be used.
The ``changelog`` event introduced earlier has the ``id`` equal to 7. To
The ``changelog`` event introduced earlier has the ``id`` equal to 7. To
select history related changelog events, enter::
history.id_events = 7
The following operators are understood:
* ``&``, ``and``
* ``|``, ``or``
* ``~``
* ``~``
* ``==``, ``=``, ``equal to``, ``equal``, ``equals``, ``is``
* ``<``, ``less than``
* ``>``, ``greater than``
* ``<=``, ``=<``, ``less or equal than``, ``equal or less than``,
* ``<=``, ``=<``, ``less or equal than``, ``equal or less than``,
``less or equal``, ``equal or less``
* ``>=``, ``=>``, ``greater or equal than``, ``equal or greater than``,
* ``>=``, ``=>``, ``greater or equal than``, ``equal or greater than``,
``greater or equal``, ``equal or greater``
* ``<>``, ``not equal to``, ``not equal``
* ``starts with``
* ``ends with``
* ``contains``
* ``in``
* ``not in``
......@@ -54,9 +54,10 @@ In order to create a new event definition:
Figure 1
4. Enter the event name in the first field.
5. Enter the python dictionary structure in the last field.
Key, value pair can be ``Add``, ``Modify`` or ``Delete`` using the
4. Enter the event name in the ``event`` entry.
5. Enter the python dictionary structure in the ``model`` field.
Add the first key by right clicking on ``property`` label. Later on,
Key can be ``Add``, ``Modify`` or ``Delete`` using the
contextual menu.
.. warning::
......
......@@ -10,8 +10,7 @@
fieldsModifier = dbui.FieldsModifier('events')
fieldsModifier.configure_field('data',
headers=[T('Property'), T('Type')],
modifyKeys=True,
height=150)
modifyKeys=True)
#-------------------------------------------------------------------------------
#
......
......@@ -126,13 +126,14 @@ Ext.define('MyApp.form.plugin.UserModelConsistency', {
"use strict";
var me = this,
current;
current,
msg = response.responseText;
me.setMaskViewport(false);
// inform the user of what happened
if (response.responseText) {
Ext.Msg.alert(me.textInfo, response.responseText);
if (msg && msg !== "None") {
Ext.Msg.alert(me.textInfo, msg);
}
// refresh the content of the history store
......
......@@ -35,20 +35,20 @@
</ul>
<ul>
<li class="dbui-p">
<a href="/{{=request.application}}/static/plugin_dbui/docs/epydoc/index.html" target="_blank">
plugin_dbui python API
<a href="https://marprod.in2p3.fr/plugin_dbui_book" target="_blank">
plugin_dbui reference manual
</a>
</li>
<li class="dbui-p">
<a href="/{{=request.application}}/static/plugin_dbui/docs/jsduck/index.html" target="_blank">
plugin_dbui javascript API
<a href="/{{=request.application}}/static/plugin_dbui/docs/epydoc/index.html" target="_blank">
plugin_dbui python API
</a>
</li>
<li class="dbui-p">
<a href="https://marprod.in2p3.fr/plugin_dbui_book" target="_blank">
plugin_dbui reference manual
<a href="/{{=request.application}}/static/plugin_dbui/docs/jsduck/index.html" target="_blank">
plugin_dbui javascript API
</a>
</li>
</ul>
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment