Merge lp:~openerp-dev/openerp-web/trunk-database-manager-template-msh into lp:openerp-web
- trunk-database-manager-template-msh
- Merge into trunk
Proposed by
Mohammed Shekha(Open ERP)
Status: | Merged |
---|---|
Merged at revision: | 4009 |
Proposed branch: | lp:~openerp-dev/openerp-web/trunk-database-manager-template-msh |
Merge into: | lp:openerp-web |
Diff against target: |
166 lines (+81/-68) 2 files modified
addons/web/controllers/main.py (+2/-68) addons/web/views/database_manager.html (+79/-0) |
To merge this branch: | bzr merge lp:~openerp-dev/openerp-web/trunk-database-manager-template-msh |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Fabien Meghazi (OpenERP) | Pending | ||
Review via email: mp+218093@code.launchpad.net |
Commit message
Description of the change
Hello,
Improved the database manager, instead of calling html_template created separate html file which is rendered using jinja2(once edi and pos are able to work on render_
Thanks.
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'addons/web/controllers/main.py' |
2 | --- addons/web/controllers/main.py 2014-05-01 21:04:36 +0000 |
3 | +++ addons/web/controllers/main.py 2014-05-02 14:24:14 +0000 |
4 | @@ -745,75 +745,9 @@ |
5 | def manager(self, **kw): |
6 | # TODO: migrate the webclient's database manager to server side views |
7 | request.session.logout() |
8 | - css = """ |
9 | - <link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/> |
10 | - <link href="/web/static/lib/cleditor/jquery.cleditor.css" rel="stylesheet"/> |
11 | - <link href="/web/static/lib/jquery.textext/jquery.textext.css" rel="stylesheet"/> |
12 | - <link href="/web/static/lib/select2/select2.css" rel="stylesheet"/> |
13 | - <link href="/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css" rel="stylesheet"/> |
14 | - <link href="/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css" rel="stylesheet"/> |
15 | - <link href="/web/static/lib/jquery.ui.notify/css/ui.notify.css" rel="stylesheet"/> |
16 | - <link href="/web/static/lib/bootstrap/css/bootstrap.css" rel="stylesheet"/> |
17 | - <link href="/web/static/src/css/base.css" rel="stylesheet"/> |
18 | - <link href="/web/static/src/css/data_export.css" rel="stylesheet"/> |
19 | - <link href="/base/static/src/css/modules.css" rel="stylesheet"/>""" |
20 | - js = """ |
21 | - <script src="/web/static/lib/es5-shim/es5-shim.min.js" type="text/javascript"></script> |
22 | - <script src="/web/static/lib/underscore/underscore.js" type="text/javascript"></script> |
23 | - <script src="/web/static/lib/underscore.string/lib/underscore.string.js" type="text/javascript"></script> |
24 | - <script src="/web/static/lib/datejs/globalization/en-US.js" type="text/javascript"></script> |
25 | - <script src="/web/static/lib/spinjs/spin.js" type="text/javascript"></script> |
26 | - <script src="/web/static/lib/jquery/jquery.js" type="text/javascript"></script> |
27 | - <script src="/web/static/lib/jquery.blockUI/jquery.blockUI.js" type="text/javascript"></script> |
28 | - <script src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js" type="text/javascript"></script> |
29 | - <script src="/web/static/lib/jquery.placeholder/jquery.placeholder.js" type="text/javascript"></script> |
30 | - <script src="/web/static/lib/jquery.timeago/jquery.timeago.js" type="text/javascript"></script> |
31 | - <script src="/web/static/lib/jquery.form/jquery.form.js" type="text/javascript"></script> |
32 | - <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js" type="text/javascript"></script> |
33 | - <script src="/web/static/lib/datejs/core.js" type="text/javascript"></script> |
34 | - <script src="/web/static/lib/datejs/parser.js" type="text/javascript"></script> |
35 | - <script src="/web/static/lib/datejs/sugarpak.js" type="text/javascript"></script> |
36 | - <script src="/web/static/lib/datejs/extras.js" type="text/javascript"></script> |
37 | - <script src="/web/static/lib/jquery.validate/jquery.validate.js" type="text/javascript"></script> |
38 | - <script src="/web/static/lib/jquery.autosize/jquery.autosize.js" type="text/javascript"></script> |
39 | - <script src="/web/static/lib/jquery.scrollTo/jquery.scrollTo-min.js" type="text/javascript"></script> |
40 | - <script src="/web/static/lib/cleditor/jquery.cleditor.js" type="text/javascript"></script> |
41 | - <script src="/web/static/lib/jquery.textext/jquery.textext.js" type="text/javascript"></script> |
42 | - <script src="/web/static/lib/select2/select2.js" type="text/javascript"></script> |
43 | - <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js" type="text/javascript"></script> |
44 | - <script src="/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js" type="text/javascript"></script> |
45 | - <script src="/web/static/lib/jquery.ui.notify/js/jquery.notify.js" type="text/javascript"></script> |
46 | - <script src="/web/static/lib/bootstrap/js/bootstrap.js" type="text/javascript"></script> |
47 | - <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script> |
48 | - <script src="/web/static/lib/qweb/qweb2.js" type="text/javascript"></script> |
49 | - <script src="/web/static/src/js/openerpframework.js" type="text/javascript"></script> |
50 | - <script src="/web/static/lib/py.js/lib/py.js" type="text/javascript"></script> |
51 | - <script src="/web/static/src/js/boot.js" type="text/javascript"></script> |
52 | - <script src="/web/static/src/js/testing.js" type="text/javascript"></script> |
53 | - <script src="/web/static/src/js/pyeval.js" type="text/javascript"></script> |
54 | - <script src="/web/static/src/js/core.js" type="text/javascript"></script> |
55 | - <script src="/web/static/src/js/formats.js" type="text/javascript"></script> |
56 | - <script src="/web/static/src/js/chrome.js" type="text/javascript"></script> |
57 | - <script src="/web/static/src/js/views.js" type="text/javascript"></script> |
58 | - <script src="/web/static/src/js/data.js" type="text/javascript"></script> |
59 | - <script src="/web/static/src/js/data_export.js" type="text/javascript"></script> |
60 | - <script src="/web/static/src/js/search.js" type="text/javascript"></script> |
61 | - <script src="/web/static/src/js/view_list.js" type="text/javascript"></script> |
62 | - <script src="/web/static/src/js/view_form.js" type="text/javascript"></script> |
63 | - <script src="/web/static/src/js/view_list_editable.js" type="text/javascript"></script> |
64 | - <script src="/web/static/src/js/view_tree.js" type="text/javascript"></script> |
65 | - <script src="/base/static/src/js/apps.js" type="text/javascript"></script>""" |
66 | - |
67 | - r = html_template % { |
68 | - 'js': js, |
69 | - 'css': css, |
70 | + return env.get_template("database_manager.html").render({ |
71 | 'modules': simplejson.dumps(module_boot()), |
72 | - 'init': """ |
73 | - var wc = new s.web.WebClient(null, { action: 'database_manager' }); |
74 | - wc.appendTo($(document.body)); |
75 | - """ |
76 | - } |
77 | - return r |
78 | + }) |
79 | |
80 | @http.route('/web/database/get_list', type='json', auth="none") |
81 | def get_list(self): |
82 | |
83 | === added file 'addons/web/views/database_manager.html' |
84 | --- addons/web/views/database_manager.html 1970-01-01 00:00:00 +0000 |
85 | +++ addons/web/views/database_manager.html 2014-05-02 14:24:14 +0000 |
86 | @@ -0,0 +1,79 @@ |
87 | +<!DOCTYPE html> |
88 | +<html style="height: 100%"> |
89 | + <head> |
90 | + <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1"/> |
91 | + <meta http-equiv="content-type" content="text/html; charset=utf-8" /> |
92 | + <title>OpenERP</title> |
93 | + <link rel="shortcut icon" href="/web/static/src/img/favicon.ico" type="image/x-icon"/> |
94 | + <link rel="stylesheet" href="/web/static/src/css/full.css" /> |
95 | + <script src="/web/static/lib/es5-shim/es5-shim.min.js" type="text/javascript"></script> |
96 | + <script src="/web/static/lib/underscore/underscore.js" type="text/javascript"></script> |
97 | + <script src="/web/static/lib/underscore.string/lib/underscore.string.js" type="text/javascript"></script> |
98 | + <script src="/web/static/lib/datejs/globalization/en-US.js" type="text/javascript"></script> |
99 | + <script src="/web/static/lib/spinjs/spin.js" type="text/javascript"></script> |
100 | + <script src="/web/static/lib/jquery/jquery.js" type="text/javascript"></script> |
101 | + <script src="/web/static/lib/jquery.blockUI/jquery.blockUI.js" type="text/javascript"></script> |
102 | + <script src="/web/static/lib/jquery.hotkeys/jquery.hotkeys.js" type="text/javascript"></script> |
103 | + <script src="/web/static/lib/jquery.placeholder/jquery.placeholder.js" type="text/javascript"></script> |
104 | + <script src="/web/static/lib/jquery.timeago/jquery.timeago.js" type="text/javascript"></script> |
105 | + <script src="/web/static/lib/jquery.form/jquery.form.js" type="text/javascript"></script> |
106 | + <script src="/web/static/lib/jquery.ba-bbq/jquery.ba-bbq.js" type="text/javascript"></script> |
107 | + <script src="/web/static/lib/datejs/core.js" type="text/javascript"></script> |
108 | + <script src="/web/static/lib/datejs/parser.js" type="text/javascript"></script> |
109 | + <script src="/web/static/lib/datejs/sugarpak.js" type="text/javascript"></script> |
110 | + <script src="/web/static/lib/datejs/extras.js" type="text/javascript"></script> |
111 | + <script src="/web/static/lib/jquery.validate/jquery.validate.js" type="text/javascript"></script> |
112 | + <script src="/web/static/lib/jquery.autosize/jquery.autosize.js" type="text/javascript"></script> |
113 | + <script src="/web/static/lib/jquery.scrollTo/jquery.scrollTo-min.js" type="text/javascript"></script> |
114 | + <script src="/web/static/lib/cleditor/jquery.cleditor.js" type="text/javascript"></script> |
115 | + <script src="/web/static/lib/jquery.textext/jquery.textext.js" type="text/javascript"></script> |
116 | + <script src="/web/static/lib/select2/select2.js" type="text/javascript"></script> |
117 | + <script src="/web/static/lib/jquery.ui/js/jquery-ui-1.9.1.custom.js" type="text/javascript"></script> |
118 | + <script src="/web/static/lib/jquery.ui.timepicker/js/jquery-ui-timepicker-addon.js" type="text/javascript"></script> |
119 | + <script src="/web/static/lib/jquery.ui.notify/js/jquery.notify.js" type="text/javascript"></script> |
120 | + <script src="/web/static/lib/bootstrap/js/bootstrap.js" type="text/javascript"></script> |
121 | + <script src="/web/static/lib/backbone/backbone.js" type="text/javascript"></script> |
122 | + <script src="/web/static/lib/qweb/qweb2.js" type="text/javascript"></script> |
123 | + <script src="/web/static/src/js/openerpframework.js" type="text/javascript"></script> |
124 | + <script src="/web/static/lib/py.js/lib/py.js" type="text/javascript"></script> |
125 | + <script src="/web/static/src/js/boot.js" type="text/javascript"></script> |
126 | + <script src="/web/static/src/js/testing.js" type="text/javascript"></script> |
127 | + <script src="/web/static/src/js/pyeval.js" type="text/javascript"></script> |
128 | + <script src="/web/static/src/js/core.js" type="text/javascript"></script> |
129 | + <script src="/web/static/src/js/formats.js" type="text/javascript"></script> |
130 | + <script src="/web/static/src/js/chrome.js" type="text/javascript"></script> |
131 | + <script src="/web/static/src/js/views.js" type="text/javascript"></script> |
132 | + <script src="/web/static/src/js/data.js" type="text/javascript"></script> |
133 | + <script src="/web/static/src/js/data_export.js" type="text/javascript"></script> |
134 | + <script src="/web/static/src/js/search.js" type="text/javascript"></script> |
135 | + <script src="/web/static/src/js/view_list.js" type="text/javascript"></script> |
136 | + <script src="/web/static/src/js/view_form.js" type="text/javascript"></script> |
137 | + <script src="/web/static/src/js/view_list_editable.js" type="text/javascript"></script> |
138 | + <script src="/web/static/src/js/view_tree.js" type="text/javascript"></script> |
139 | + <script src="/base/static/src/js/apps.js" type="text/javascript"></script> |
140 | + <link href="/web/static/lib/fontawesome/css/font-awesome.css" rel="stylesheet"/> |
141 | + <link href="/web/static/lib/cleditor/jquery.cleditor.css" rel="stylesheet"/> |
142 | + <link href="/web/static/lib/jquery.textext/jquery.textext.css" rel="stylesheet"/> |
143 | + <link href="/web/static/lib/select2/select2.css" rel="stylesheet"/> |
144 | + <link href="/web/static/lib/jquery.ui.bootstrap/css/custom-theme/jquery-ui-1.9.0.custom.css" rel="stylesheet"/> |
145 | + <link href="/web/static/lib/jquery.ui.timepicker/css/jquery-ui-timepicker-addon.css" rel="stylesheet"/> |
146 | + <link href="/web/static/lib/jquery.ui.notify/css/ui.notify.css" rel="stylesheet"/> |
147 | + <link href="/web/static/lib/bootstrap/css/bootstrap.css" rel="stylesheet"/> |
148 | + <link href="/web/static/src/css/base.css" rel="stylesheet"/> |
149 | + <link href="/web/static/src/css/data_export.css" rel="stylesheet"/> |
150 | + <link href="/base/static/src/css/modules.css" rel="stylesheet"/> |
151 | + <script type="text/javascript"> |
152 | + $(function() { |
153 | + var s = new openerp.init({{ modules|safe }}); |
154 | + var wc = new s.web.WebClient(null, { action: 'database_manager' }); |
155 | + wc.appendTo($(document.body)); |
156 | + }); |
157 | + </script> |
158 | + </head> |
159 | + <body> |
160 | + <!--[if lte IE 8]> |
161 | + <script src="//ajax.googleapis.com/ajax/libs/chrome-frame/1/CFInstall.min.js"></script> |
162 | + <script>CFInstall.check({mode: "overlay"});</script> |
163 | + <![endif]--> |
164 | + </body> |
165 | +</html> |
166 | \ No newline at end of file |