← Back to branch summary

~openerp-dev/openerp-web/trunk-customfilter-jir

« back to all changes in this revision

Viewing changes to addons/web/static/src/xml/base.xml

  • Committer: Vidhin Mehta
  • Date: 2013-09-02 08:57:36 UTC
  • mfrom: (3747.2.76 openerp-web)
  • Revision ID: vme@tinyerp.com-20130902085736-rle0km7c5kxxi31o
[MERGE]Trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
addons/web/static/src/xml/base.xml
459
459
        <tr>
460
460
            <td class="oe_leftbar" valign="top">
461
461
                <t t-set="debug" t-value="__debug__ ? '&amp;debug' : ''"/>
462
 
                <a class="oe_logo" t-attf-href="/?ts=#{Date.now()}#{debug}">
 
462
                <a class="oe_logo" t-attf-href="/?#{debug}">
463
463
                    <span class="oe_logo_edit">Edit Company data</span>
464
464
                    <img t-att-src='widget.session.url("/web/binary/company_logo")'/>
465
465
                </a>
654
654
                            <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t>
655
655
                            <input type="hidden" name="model" t-att-value="widget.dataset and widget.dataset.model"/>
656
656
                            <input type="hidden" name="id" t-att-value="widget.model_id"/>
657
 
                            <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
 
657
                            <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/>
658
658
                            <span>Add...</span>
659
659
                        </t>
660
660
                    </li>
684
684
<tr t-name="TreeView.rows"
685
685
        t-foreach="records" t-as="record"
686
686
        t-att-id="'treerow_' + record.id"
687
 
        t-att-data-id="record.id" t-att-data-level="level + 1">
 
687
        t-att-data-id="record.id" t-att-data-level="level + 1"
 
688
        t-att-data-parent-id="parent_id">
688
689
    <t t-set="children" t-value="record[children_field]"/>
689
690
    <t t-set="class" t-value="children and children.length ? 'treeview-tr' : 'treeview-td'"/>
690
691
    <t t-set="rank" t-value="'oe-treeview-first'"/>
1320
1321
    <div t-attf-class="oe_hidden_input_file #{fileupload_class or ''}" t-att-style="fileupload_style">
1321
1322
        <form class="oe_form_binary_form" t-att-target="fileupload_id"
1322
1323
            method="post" enctype="multipart/form-data" t-att-action="fileupload_action || '/web/binary/upload'">
1323
 
            <input type="hidden" name="session_id" value=""/>
 
1324
            <input type="hidden" name="session_id" value="" t-if="widget.session.override_session"/>
1324
1325
            <input type="hidden" name="callback" t-att-value="fileupload_id"/>
1325
1326
            <t t-raw="__content__"/>
1326
1327
            <input type="file" class="oe_form_binary_file" name="ufile" t-if="widget.widget!='image'"/>
1372
1373
                <t t-set="fileupload_action" t-translation="off">/web/binary/upload_attachment</t>
1373
1374
                <input type="hidden" name="model" t-att-value="widget.view.model"/>
1374
1375
                <input type="hidden" name="id" value="0"/>
1375
 
                <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
 
1376
                <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/>
1376
1377
            </t>
1377
1378
        </div>
1378
1379
    </div>
1744
1745
 
1745
1746
            <label for="export_format">Export Formats</label>
1746
1747
            <select id="export_format" name="export_format"></select>
1747
 
 
1748
 
            <label for="export_selection_only">Only export selection:</label>
1749
 
            <input type="checkbox" id="export_selection_only"/>
1750
1748
        </td>
1751
1749
    </tr>
1752
1750
 
1835
1833
<t t-name="ImportDataView">
1836
1834
<form name="import_data" id="import_data" action="" method="post" enctype="multipart/form-data"
1837
1835
        class="oe_import oe_import_no_result">
1838
 
    <input type="hidden" name="session_id" t-att-value="widget.session.session_id"/>
 
1836
    <input type="hidden" name="session_id" t-att-value="widget.session.session_id" t-if="widget.session.override_session"/>
1839
1837
    <h2 class="separator horizontal">1. Import a .CSV file</h2>
1840
1838
    <p>Select a .CSV file to import. If you need a sample of file to import,
1841
1839
       you should use the export tool with the "Import Compatible" option.