[Merge] Merged from openerp-web.

bzr revid: jra@tinyerp.com-20120202112015-9f102yl1a9dukq6b

1 files changed, 56 insertions, 28 deletions

diff --git a/addons/web/static/src/xml/base.xml b/addons/web/static/src/xml/base.xml
index 26ed45c8f24..972656dfa17 100644
--- a/addons/web/static/src/xml/base.xml
+++ b/addons/web/static/src/xml/base.xml
@@ -120,6 +120,8 @@
                             <option t-att-value="db"><t t-esc="db"/></option>
                         </t>
                     </select>
+                    <input t-if="!db_list" name="drop_db" class="required"
+                           type="text" autofocus="autofocus"/>
                 </td>
             </tr>
             <tr>
@@ -152,6 +154,8 @@
                             <option t-att-value="db"><t t-esc="db"/></option>
                         </t>
                     </select>
+                    <input t-if="!db_list" name="drop_db" class="required"
+                           type="text" autofocus="autofocus"/>
                 </td>
             </tr>
             <tr>
@@ -471,17 +475,39 @@
 </t>
 <t t-name="ViewManagerDebug">
     <option value="">Debug View#<t t-esc="view.fields_view.view_id"/></option>
-    <option value="fvg">Fields View Get</option>
+    <option t-if="_.indexOf(['form', 'page'], view_manager.active_view) gt -1" value="perm_read" data-views="form,page">View Log (perm_read)</option>
     <option value="fields">View Fields</option>
+    <option value="fvg">Fields View Get</option>
     <t t-if="view_manager.session.uid === 1">
         <option value="manage_views">Manage Views</option>
         <option value="edit" data-model="ir.ui.view" t-att-data-id="view.fields_view.view_id">Edit <t t-esc="_.str.capitalize(view.fields_view.type)"/>View</option>
         <option t-if="view_manager.searchview" value="edit" data-model="ir.ui.view" t-att-data-id="view_manager.searchview.view_id">Edit SearchView</option>
         <option t-if="view_manager.action" value="edit" t-att-data-model="view_manager.action.type" t-att-data-id="view_manager.action.id">Edit Action</option>
-        <option value="customize_object">Customize Object</option>
         <option value="edit_workflow">Edit Workflow</option>
+        <option value="customize_object">Customize Object</option>
     </t>
 </t>
+<t t-name="ViewManagerDebugViewLog">
+    <div class="oe_debug_view_log">
+        <label>ID:</label>
+        <span><t t-esc="perm.id"/></span>
+
+        <label>XML ID:</label>
+        <span><t t-esc="perm.xmlid"/></span>
+
+        <label>Creation User:</label>
+        <span><t t-esc="format(perm.create_uid, { 'type' : 'many2one' }, '/')"/></span>
+
+        <label>Creation Date:</label>
+        <span><t t-esc="format(perm.create_date, { 'type' : 'datetime' }, '/')"/></span>
+
+        <label>Latest Modification by:</label>
+        <span><t t-esc="format(perm.write_uid, { 'type' : 'many2one' }, '/')"/></span>
+
+        <label>Latest Modification Date:</label>
+        <span><t t-esc="format(perm.write_date, { 'type' : 'datetime' }, '/')"/></span>
+    </div>
+</t>
 <t t-extend="ViewManager" t-name="One2Many.viewmanager">
     <t t-jquery="span.oe_view_title_text" t-operation="replace"/>
 
@@ -654,10 +680,9 @@
 
     <t t-jquery="td.oe-actions">
         this.removeAttr('t-if');
-        var $title = $(document.createElement('h3')).addClass('oe_view_title');
-        $title.append($(document.createElement('t')).attr(
-            't-esc', 'fields_view.arch.attrs.string'));
-        this.prepend($title);
+    </t>
+    <t t-jquery="td.oe-actions" t-operation="prepend">
+        <h3 class="oe_view_title"><t t-esc="fields_view.arch.attrs.string"/></h3>
     </t>
 </t>
 <th t-name="Listview.navigation.button" t-if="!no_leaf and options.pager !== false"
@@ -682,7 +707,9 @@
         </td>
     </t>
     <th t-if="options.selectable" class="oe-record-selector" width="1">
-        <input t-att-type="options.radio? 'radio': 'checkbox'" name ="radiogroup" t-att-checked="options.select_view_id == record.get('id')? true: null"/>
+        <t t-set="checked" t-value="options.select_view_id == record.get('id') ? 'checked' : null"/>
+        <input t-if="options.radio" type="radio" name="radiogroup" t-att-checked="checked"/>
+        <input t-if="!options.radio" type="checkbox" name="radiogroup" t-att-checked="checked"/>
     </th>
     <th t-if="options.isClarkGable" class="oe-record-edit-link" width="1">
         <img src="/web/static/src/img/pencil.gif" width="12" height="12" class="oe-record-edit-link-img"/>
@@ -747,7 +774,7 @@
                 <input type="file" class="oe-binary-file" name="ufile" title="Add attachment"
                     t-att-onclick="view.datarecord.id ? null : 'alert(\'No record selected ! You can only attach to existing record.\'); return false;'"/>
             </form>
-            <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"> </iframe>
+            <iframe t-attf-id="#{element_id}_iframe" t-attf-name="#{element_id}_iframe" style="display: none"/>
         </div>
     </div>
     <br style="clear: both"/>
@@ -1084,7 +1111,7 @@
                 <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
                 <b>Uploading ...</b>
             </div>
-            <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"> </iframe>
+            <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
         </td>
     </tr>
     </table>
@@ -1134,7 +1161,7 @@
         <td class="oe-binary-progress" style="display: none" nowrap="true">
             <img t-att-src='_s + "/web/static/src/img/throbber.gif"' width="16" height="16"/>
             <b>Uploading ...</b>
-            <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"> </iframe>
+            <iframe t-att-id="widget.iframe" t-att-name="widget.iframe" style="display: none"/>
         </td>
     </tr>
     </table>
@@ -1189,7 +1216,7 @@
     </form>
 </t>
 <t t-name="SearchView.managed-filters">
-    <option class="oe-filters-title">Filters</option>
+    <option class="oe-filters-title" value="">Filters</option>
     <optgroup label="-- Filters --">
         <t t-foreach="filters" t-as="filter">
             <option t-attf-value="get:#{filter_index}"><t t-esc="filter.name"/></option>
@@ -1287,7 +1314,8 @@
             <t t-foreach="attrs.selection" t-as="option">
                 <t t-set="selected" t-value="defaults[attrs.name] === option[0]"/>
                 <option t-if="selected"
-                        t-att-value="option_index" selected="selected">
+                        t-attf-selected="selected"
+                        t-att-value="option_index">
                     <t t-esc="option[1]"/>
                 </option>
                 <option t-if="!selected" t-att-value="option_index">
@@ -1329,7 +1357,7 @@
     </t>
 </t>
 <t t-name="SearchView.extended_search.group">
-    <div t-att-id="element_id" class="searchview_extended_group">
+    <div t-att-id="widget.element_id" class="searchview_extended_group">
         <select class="searchview_extended_group_choice">
             <option value="any">Any of the following conditions must match</option>
             <option value="all">All the following conditions must match</option>
@@ -1345,11 +1373,11 @@
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition">
-    <div t-att-id="element_id">
+    <div t-att-id="widget.element_id">
         <select class="searchview_extended_prop_field">
-            <t t-foreach="attrs.fields" t-as="field">
+            <t t-foreach="widget.attrs.fields" t-as="field">
                 <option t-if="typeof field.store === 'undefined' || field.store || field.fnct_search"
-                        t-att="{'selected': field === attrs.selected ? 'selected' : null}"
+                        t-att="{'selected': field === widget.attrs.selected ? 'selected' : null}"
                         t-att-value="field.name">
                     <t t-esc="field.string"/>
                 </option>
@@ -1362,41 +1390,41 @@
     </div>
 </t>
 <t t-name="SearchView.extended_search.proposition.char">
-    <input t-att-id="element_id" class="field_char"/>
+    <input t-att-id="widget.element_id" class="field_char"/>
 </t>
 <t t-name="SearchView.extended_search.proposition.empty">
-    <span t-att-id="element_id"></span>
+    <span t-att-id="widget.element_id"></span>
 </t>
 <t t-name="SearchView.extended_search.proposition.integer">
-    <input type="number" t-att-id="element_id" class="field_integer" step="1"/>
+    <input type="number" t-att-id="widget.element_id" class="field_integer" step="1"/>
 </t>
 <t t-name="SearchView.extended_search.proposition.float">
-    <input type="number" t-att-id="element_id" class="field_float" step="0.01"/>
+    <input type="number" t-att-id="widget.element_id" class="field_float" step="0.01"/>
 </t>
 <t t-name="SearchView.extended_search.proposition.boolean">
 </t>
 <t t-name="SearchView.extended_search.proposition.selection">
-    <select t-att-id="element_id">
-        <t t-foreach="field.selection" t-as="element">
+    <select t-att-id="widget.element_id">
+        <t t-foreach="widget.field.selection" t-as="element">
         <option t-att-value="element[0]"><t t-esc="element[1]"/></option>
         </t>
     </select>
 </t>
 <t t-name="SelectCreatePopup">
-    <div t-att-id="element_id">
+    <div t-att-id="widget.element_id">
         <table style="width:100%">
             <tr style="width:100%">
                 <td style="width:100%">
-                    <div t-att-id="element_id + '_search'" style="width:100%"></div>
+                    <div t-att-id="widget.element_id + '_search'" style="width:100%"></div>
                 </td>
             </tr>
             <tr style="width:100%">
                 <td style="width:100%">
-                    <div t-att-id="element_id + '_view_list'" style="width:100%"></div>
+                    <div t-att-id="widget.element_id + '_view_list'" style="width:100%"></div>
                 </td>
             </tr>
         </table>
-        <div t-att-id="element_id + '_view_form'" style="width:100%"></div>
+        <div t-att-id="widget.element_id + '_view_form'" style="width:100%"></div>
     </div>
 </t>
 <t t-name="SelectCreatePopup.search.buttons">
@@ -1414,8 +1442,8 @@
     <button type="button" class="oe_button oe_selectcreatepopup-form-close">Cancel</button>
 </t>
 <t t-name="FormOpenPopup">
-    <div t-att-id="element_id">
-        <div t-att-id="element_id + '_view_form'" style="width:100%"></div>
+    <div t-att-id="widget.element_id">
+        <div t-att-id="widget.element_id + '_view_form'" style="width:100%"></div>
     </div>
 </t>
 <t t-name="FormOpenPopup.form.buttons">