Merge lp:~openerp-dev/openobject-addons/trunk-pad-project-defaultvalue-tta into lp:openobject-addons

[SnippetBucket.com]

Hello,

Improvement with etherpad.

Fixed following issues.

# Fixd icon issue when etherpad content load with page view.

# project task create new task with blank etherpad[No welcome message].

Thanks,
Tejas - TTA

[lp:~openerp-dev/openobject-addons/trunk-pad-project-defaultvalue-tta]

7721. By SnippetBucket.com on 2012-10-09

Merged with latest.

7722. By SnippetBucket.com on 2012-10-10

Merge with latest.

7723. By SnippetBucket.com on 2012-10-11

[Fix] context issue for pad_project.

7724. By SnippetBucket.com on 2012-10-11

Merged with latest.

7725. By SnippetBucket.com on 2012-10-12

Merged with latest.

7726. By SnippetBucket.com on 2012-10-12

[IMP] resolve create blank pad issue.

7727. By SnippetBucket.com on 2012-10-12

[FIX] resolved padId error.

7728. By SnippetBucket.com on 2012-10-12

[FIX] etherpad have limitation on url size, so minimized url.

Unmerged revisions

7728. By SnippetBucket.com on 2012-10-12

[FIX] etherpad have limitation on url size, so minimized url.

7727. By SnippetBucket.com on 2012-10-12

[FIX] resolved padId error.

7726. By SnippetBucket.com on 2012-10-12

[IMP] resolve create blank pad issue.

7725. By SnippetBucket.com on 2012-10-12

Merged with latest.

7724. By SnippetBucket.com on 2012-10-11

Merged with latest.

7723. By SnippetBucket.com on 2012-10-11

[Fix] context issue for pad_project.

7722. By SnippetBucket.com on 2012-10-10

Merge with latest.

7721. By SnippetBucket.com on 2012-10-09

Merged with latest.

7720. By SnippetBucket.com on 2012-10-05

[IMP] page view: pad content load inside iframe.

7719. By SnippetBucket.com on 2012-10-05

[IMP] pad_project: Create a blank etherpad on new record creation.

=== modified file 'pad/pad.py'
--- pad/pad.py	2012-09-20 12:06:16 +0000
+++ pad/pad.py	2012-10-12 12:24:22 +0000
@@ -29,12 +29,12 @@
         s = string.ascii_uppercase + string.digits
         salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(10)])
         #path
-        path = '%s-%s-%s' % (cr.dbname.replace('_','-'), self._name, salt)
+        path = '%s-%s-%s' % (cr.dbname.replace('_','-')[:10], self._name, salt)
         # contruct the url
         url = '%s/p/%s' % (pad["server"], path)
 
         #if create with content
-        if "field_name" in context and "model" in context and "object_id" in context:
+        if path and "field_name" in context and "model" in context and "object_id" in context:
             myPad = EtherpadLiteClient( pad["key"], pad["server"]+'/api')
             myPad.createPad(path)
 
@@ -49,7 +49,11 @@
                     myPad.setText(path, html2plaintext(record[real_field]))
                     #Etherpad for html not functional
                     #myPad.setHTML(path, record[real_field])
-
+        elif path and "field_name" in context and "model" in context and "field_value" in context:
+            myPad = EtherpadLiteClient( pad["key"], pad["server"]+'/api')
+            myPad.createPad(path)
+            myPad.setText(path, context.get("field_value"))
+            
         return {
             "server": pad["server"],
             "path": path,

=== modified file 'pad/static/src/js/pad.js'
--- pad/static/src/js/pad.js	2012-09-25 13:55:57 +0000
+++ pad/static/src/js/pad.js	2012-10-12 12:24:22 +0000
@@ -10,11 +10,12 @@
             _super.apply(self,[val]);
 
             if (val === false || val === "") {
-                self.field_manager.dataset.call('pad_generate_url',{context:{
+                var context = _.extend({}, this.node.attrs.context, {
                         model: self.field_manager.model,
                         field_name: self.name,
                         object_id: self.field_manager.datarecord.id
-                    }}).then(function(data) {
+                    });
+                self.field_manager.dataset.call('pad_generate_url',{context:context}).then(function(data) {
                     if(data&&data.url){
                         _super.apply(self,[data.url]);
                         self.renderElement();
@@ -38,7 +39,10 @@
                 }else{
                     this.content = '<div class="oe_pad_loading">... Loading pad ...</div>';
                     $.get(value+'/export/html').success(function(data){
-                        self.$('.oe_pad_content').html('<div class="oe_pad_readonly">'+data+'<div>');
+                        var iframe = self.$('.oe_pad_content');
+                        iframe.contents().find('html').html(data);
+                        var iframeheight = iframe.contents().find('html')[0].offsetHeight;
+                        iframe[0].style.height = iframeheight + "px";                        
                     }).error(function(){
                         self.$('.oe_pad_content').text('Unable to load pad');
                     });

=== modified file 'pad/static/src/xml/pad.xml'
--- pad/static/src/xml/pad.xml	2012-09-24 13:46:00 +0000
+++ pad/static/src/xml/pad.xml	2012-10-12 12:24:22 +0000
@@ -16,8 +16,7 @@
         <t t-if="widget.configured">
             <t t-if="widget.get('effective_readonly')">
                 <div class="oe_form_field_text oe_pad oe_configured">
-                    <div class="oe_pad_content etherpad_readonly">
-                    </div>
+                    <iframe src="about:blank" class="oe_pad_content etherpad_readonly" width="100%" height="100%" frameborder="0" scrolling="no"></iframe>
                 </div>
             </t>
 

=== modified file 'pad_project/project_task.xml'
--- pad_project/project_task.xml	2012-08-09 06:05:16 +0000
+++ pad_project/project_task.xml	2012-10-12 12:24:22 +0000
@@ -6,7 +6,7 @@
             <field name="inherit_id" ref="project.view_task_form2"/>
             <field name="arch" type="xml">
                 <field name="description" position="replace">
-                    <field name="description_pad" attrs="{'readonly':[('state','=','done')]}" widget="pad"/>
+                    <field name="description_pad" attrs="{'readonly':[('state','=','done')]}" widget="pad" context="{'field_name': 'description_pad', 'field_value': ''}"/>
                 </field>
             </field>
         </record>