Commit 61d2f3cc authored by Klaus Wölfel's avatar Klaus Wölfel Committed by Kirill Smelkov

Merge branch 'master' into 'master'

erp5_officejs: propagate widget_theme option to listbox

Allows to use listbox with different widget themes. This option was already present in html part. Now the options is used on rendering.

See merge request !37
parents 7d40af9c dfae763f
...@@ -221,6 +221,7 @@ ...@@ -221,6 +221,7 @@
})\n })\n
.push(function (result_list) {\n .push(function (result_list) {\n
content += listbox_widget_table({\n content += listbox_widget_table({\n
widget_theme : option_dict.widget_theme,\n
search: option_dict.search,\n search: option_dict.search,\n
column_list: result_list[1],\n column_list: result_list[1],\n
row_list: result_list[0]\n row_list: result_list[0]\n
...@@ -383,7 +384,7 @@ ...@@ -383,7 +384,7 @@
</item> </item>
<item> <item>
<key> <string>actor</string> </key> <key> <string>actor</string> </key>
<value> <string>cedric.le.ninivin</string> </value> <value> <string>zope</string> </value>
</item> </item>
<item> <item>
<key> <string>comment</string> </key> <key> <string>comment</string> </key>
...@@ -397,7 +398,7 @@ ...@@ -397,7 +398,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>945.13615.27432.39287</string> </value> <value> <string>948.5700.26625.14643</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -415,7 +416,7 @@ ...@@ -415,7 +416,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1440436885.27</float> <float>1451303858.2</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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