pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

in project widget='etherpad' added

Browse Source 
bzr revid: tta@openerp.com-20120420133743-2o5d0spxwfxin0yo
This commit is contained in:
Tejas Tank
2012-04-20 19:07:43 +05:30
parent fa035be71d
commit ccb2731a49
2 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+1 -1
View File
@@ -262,7 +262,7 @@
<button name="%(action_project_task_reevaluate)d" string="Reevaluate" type="action" colspan="1" target="new" states="open,pending" icon="gtk-edit"/>
</group>
<field colspan="4" name="description" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
<field colspan="4" name="description" widget="etherpad" nolabel="1" attrs="{'readonly':[('state','=','done')]}"/>
<field colspan="4" name="work_ids" nolabel="1" attrs="{'readonly':[('state','in',['done','draft'])]}">
<tree string="Task Work" editable="top">
<field name="name" />
addons/web_etherpad/static/src/js/web_etherpad.js
+3 -4
View File
@@ -63,10 +63,9 @@ openerp.web_etherpad = function (instance) {
{
var self = this;
if(show_value.split('\n')[0] != '')
$.get(show_value.split('\n')[0]+'/export/html', function(data) {
console.log(data);
self.$element.html(data);
});
$.get(show_value.split('\n')[0]+'/export/html')
.success(function(data) { self.$element.html(data); })
.error(function() { self.$element.text('Unable to load pad'); });
else
self.$element.text(show_value);
}