diff options
| author | Roberto López López (OpenERP) <rlo@openerp.com> | 2011-12-19 11:33:46 +0100 |
|---|---|---|
| committer | Roberto López López (OpenERP) <rlo@openerp.com> | 2011-12-19 11:33:46 +0100 |
| commit | fb7d80d56f8ae08a379dc15004962776422b7459 (patch) | |
| tree | 1b3f557599193d3f75ec88310fd8cf7f68a26026 /addons/web_process/static/src | |
| parent | d8e772be5c3abadf9b66dc64a7723e3db1834e68 (diff) | |
| parent | 8f4a1ebd2421b89bb8a8db561b6e8f99a8cae474 (diff) | |
[MERGE] merge up to last branch
bzr revid: rlo@openerp.com-20111219103346-k8va78gdfudedg62
Diffstat (limited to 'addons/web_process/static/src')
| -rw-r--r-- | addons/web_process/static/src/js/process.js | 15 | ||||
| -rw-r--r-- | addons/web_process/static/src/xml/web_process.xml | 6 |
2 files changed, 11 insertions, 10 deletions
diff --git a/addons/web_process/static/src/js/process.js b/addons/web_process/static/src/js/process.js index 9bf814aa4f4..e650530a914 100644 --- a/addons/web_process/static/src/js/process.js +++ b/addons/web_process/static/src/js/process.js @@ -1,5 +1,6 @@ openerp.web_process = function (openerp) { - var QWeb = openerp.web.qweb; + var QWeb = openerp.web.qweb, + _t = openerp.web._t; openerp.web.ViewManager.include({ start: function() { this._super(); @@ -275,19 +276,17 @@ openerp.web_process = function (openerp) { var dialog = new openerp.web.Dialog(this, { width: 800, height: 600, - buttons : { - Cancel : function() { - $(this).dialog('destroy'); - }, - Save : function() { + buttons : [ + {text: _t("Cancel"), click: function() { $(this).dialog('destroy'); }}, + {text: _t("Save"), click: function() { var form_view = action_manager.inner_viewmanager.views.form.controller; form_view.do_save(function() { self.initialize_process_view(); }); $(this).dialog('destroy'); - } - } + }} + ] }).start().open(); action_manager.appendTo(dialog.$element); diff --git a/addons/web_process/static/src/xml/web_process.xml b/addons/web_process/static/src/xml/web_process.xml index a781dfe936a..62ce4bc1bce 100644 --- a/addons/web_process/static/src/xml/web_process.xml +++ b/addons/web_process/static/src/xml/web_process.xml @@ -1,7 +1,9 @@ <template> +<!-- vim:fdl=1: +--> <t t-extend="ViewManager" t-name="ViewManagerAction"> <t t-jquery=".oe-view-manager-header" t-operation="append"> - <a class="oe-process-view" title="Process View" href="javascript: void(0)"></a> + <a t-if="self.flags.display_title !== false" class="oe-process-view" title="Process View" href="javascript: void(0)"></a> </t> </t> <t t-name="ProcessView"> @@ -140,4 +142,4 @@ </tr> </table> </t> -</template>
\ No newline at end of file +</template> |