pulled

bzr revid: tta@openerp.com-20120612130835-5ae47in00u8uz9dy

addons/pad/etherpad.py

@@ -38,7 +38,6 @@ class EtherpadLiteClient:
         try:
             opener = urllib2.build_opener()
             request = urllib2.Request(url=url, data=data)
-            print params
             response = opener.open(request, timeout=self.TIMEOUT)
             result = response.read()
             response.close()

addons/pad/pad.py

@@ -11,7 +11,7 @@ class pad_common(osv.osv_memory):
     _name = 'pad.common'
     
     def pad_generate_url(self, cr, uid, model, context=None):
-        pad_url_template = self.pool.get('res.users').browse(cr,uid,[uid])[0].company_id.pad_url_template
+        pad_url_template = self._pad_url_template(cr, uid, context)
         s = string.ascii_uppercase + string.digits
         salt = ''.join([s[random.randint(0, len(s) - 1)] for i in range(8)])
         template_vars = {
@@ -20,11 +20,11 @@ class pad_common(osv.osv_memory):
             'salt' : salt,
         }
         url = pad_url_template % template_vars
-        api_key =  self._pad_api_key(cr, uid)
+        api_key =  self._pad_api_key(cr, uid, context)
         if api_key:
-            api_url = url[0:url.find("p/")] + "api"
-            pad_id = url[url.find("p/")+2:]
-            pad_author = self._pad_user_name(cr,uid)
+            urls = url.split('/')
+            api_url = '/'.join(urls[:3]) + "/api"
+            pad_id = urls[-1]            
             ep_client = EtherpadLiteClient(api_key, api_url)
             try:
                 ep_client.createPad(pad_id," ")
@@ -36,20 +36,18 @@ class pad_common(osv.osv_memory):
                 raise osv.except_osv(_('Configuration Error !'),_("Etherpad Have Wrong Pad URL Template."))
         return url
 
-    def _pad_api_key(self, cr, uid, ids=None, name=None, arg=None , context=None):
-        if not ids:
-            return self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id.etherpad_api_key
-        res = {}
-        for id in ids:
-            res[id] = self.pool.get('res.users').browse(cr,uid,[uid],context)[0].company_id.etherpad_api_key            
-        return res
+    def _pad_api_key(self, cr, uid, context=None):
+        return self.pool.get('res.users').browse(cr,uid, uid, context).company_id.etherpad_api_key
+        
+    def _pad_url_template(self, cr, uid, context=None):
+        return self.pool.get('res.users').browse(cr,uid, uid, context).company_id.pad_url_template
 
-    def _pad_user_name(self, cr, uid, ids=None, name = None, arg = None, context=None):
-        if not ids:
-            return self.pool.get('res.users').browse(cr,uid,[uid],context=context)[0].name
+
+    def _pad_user_name(self, cr, uid, ids=None, name = None, arg = None, context=None):        
         res = {}
+        user = self.pool.get('res.users')
         for id in ids:
-            res[id] = self.pool.get('res.users').browse(cr,uid,[uid],context=context)[0].name
+            res[id] = user.browse(cr,uid, uid,context=context).name
         return res        
     
     def copy(self, cr, uid, id, default=None, context=None):
@@ -62,12 +60,12 @@ class pad_common(osv.osv_memory):
                     
     _columns = {
         'pad_url': fields.char('Full Screen', size=512),
-        'pad_username': fields.function(_pad_user_name, string='Picked', type='char',size=64),
+        'pad_username': fields.function(_pad_user_name, string='User Name', type='char',size=64),
         
     }
     _defaults = {
-        'pad_url': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, self._name),
-        'pad_username': lambda self, cr, uid, context: self._pad_user_name(cr,uid),
+        'pad_url': lambda self, cr, uid, context: self.pad_generate_url(cr, uid, self._name, context),
+        'pad_username': lambda self, cr, uid, context: self.pool.get('res.users').browse(cr, uid, uid, context).name,
     }
     
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

addons/pad/static/src/css/etherpad.css

@@ -24,7 +24,7 @@
 }
 .etherpad_default{  
     width: 100%;
-    height: 350px;
+    height: 450px;
 }
 .etherpad_body{
     overflow:hidden;
@@ -32,7 +32,7 @@
 
 .etherpad_readonly{
     width: 97.2%;
-    height: 350px;
+    height: 450px;
     padding:7px 7px 10px 10px;    
     overflow:auto;    
 }

addons/pad/static/src/js/pad.js

@@ -19,8 +19,7 @@ instance.web.form.FieldEtherpad = instance.web.form.AbstractField.extend(_.exten
         },
         render_value: function() {            
             var show_value = instance.web.format_value(this.get('value'), this, '');                        
-            if (!this.get("effective_readonly")) {
-                console.log("this is sthis...",this); 
+            if (!this.get("effective_readonly")) {                
                 var pad_username = "noNamed" ;
                 if(this.view.datarecord.hasOwnProperty("pad_username"))
                     pad_username = this.view.datarecord.pad_username;