Odoo GTK Client (MOVED TO GITHUB)

Merge lp:~alecu/openobject-client/django-tracebacks into lp:openobject-client

django-tracebacks
Merge into trunk

Proposed by Alejandro J. Cura on 2009-11-09

Status:	Superseded
Proposed branch:	lp:~alecu/openobject-client/django-tracebacks
Merge into:	lp:openobject-client
Diff against target:	173 lines (+105/-3) 3 files modified bin/common/common.py (+48/-2) bin/tiny_socket.py (+7/-1) bin/win_error.glade (+50/-0)
To merge this branch:	bzr merge lp:~alecu/openobject-client/django-tracebacks
Related bugs:	Link a bug report
Related blueprints:	Django-like detailed tracebacks for OpenERP (Undefined)

Reviewer	Date Requested	Status
Christophe CHAUVET (community)		Approve on 2009-11-09
Fabien (Open ERP)	2009-11-09	Pending
Review via email: mp+14654@code.launchpad.net

This proposal has been superseded by a proposal from 2009-11-10.

Revision history for this message

Alejandro J. Cura (alecu) wrote on 2009-11-09:

PyWebkit support is optional; if not installed it shows a link to open the error in a browser.

Revision history for this message

Christophe CHAUVET (christophe-chauvet) wrote on 2009-11-09:

It's a great feature, but not for 5.0 branch, only bugfix in the stable branch

But if you made a patch for Trunk, i can test it :)

There is already a code (in openobject forum) to add new widget (webbrowser and sourceview)

http://www.openobject.com/forum/topic5676.html?highlight=webkit

Regards,

review: Disapprove

Revision history for this message

Alejandro J. Cura (alecu) wrote on 2009-11-09:

> Hi
>
> It's a great feature, but not for 5.0 branch, only bugfix in the stable branch
>
> But if you made a patch for Trunk, i can test it :)

Hi,

I think that I made my patch against Trunk, to be included in future OpenObject versions.
Can you please tell what did you find wrong?

thanks,
--
alecu

Revision history for this message

Christophe CHAUVET (christophe-chauvet) wrote on 2009-11-09:

Nothing wrong, but cannot merge to the stable branch (only bugfix)

Regards,

Revision history for this message

Alejandro J. Cura (alecu) wrote on 2009-11-09:

On Mon, Nov 9, 2009 at 15:46, Christophe Chauvet -
http://www.syleam.fr/ <email address hidden> wrote:
> Nothing wrong, but cannot merge to the stable branch (only bugfix)

Ok, perfect.
Would you mind telling what is the branch that I should propose to
merge my patch?

thanks!
--
alecu

Revision history for this message

Christophe CHAUVET (christophe-chauvet) wrote on 2009-11-09:

Sorry, but ot's the good branch

Regards,

review: Approve

Revision history for this message

Husen Daudi (husendaudi) wrote on 2009-11-10:

Hello,

Great work, I have tested your code by merging client and server.
Error window is mode user friendly and well formated.
But we are getting whole html file as a traceback in client prompt.
In client terminal it prints long traceback and which looks dirty.
Is there any way to prevent that traceback?

Thanks,
HDA

lp:~alecu/openobject-client/django-tracebacks updated on 2009-11-10

1013. By Alejandro J. Cura <email address hidden> on 2009-11-10: [MERGE] merge from trunk
1014. By Alejandro J. Cura <email address hidden> on 2009-11-10: do not show the html in the console

Unmerged revisions

1014. By Alejandro J. Cura <email address hidden> on 2009-11-10: do not show the html in the console
1013. By Alejandro J. Cura <email address hidden> on 2009-11-10: [MERGE] merge from trunk
1012. By Alejandro J. Cura <email address hidden> on 2009-11-03: webkit was not the default
1011. By Alejandro J. Cura <email address hidden> on 2009-11-02: if the traceback is an html, show it using webkit

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

Subscribers

People subscribed via source and target branches

to all changes:

Alejandro J. Cura

Arif

Bharat Devnani (Open ERP)

Christophe CHAUVET

Damir Tušek

Federico Manuel Echeverri Choux

Husen Daudi

Krisztian Eyssen

Larry Horsley

Manfred Rockel

OpenBMS JSC

OpenERP Findis

Ravi Gadhia (OpenERP)

Rifakat Husen (OpenERP)

Riken Bhorania (OpenERP)

Sebastien LANGE - http://www.Syleam.fr

Sunil http://techreceptives.com

XeBa

Yogesh (SerpentCS)

fitrah ahmad

giudalo

gpa(OpenERP)

 === modified file 'bin/common/common.py'
 --- bin/common/common.py	2009-10-20 10:55:28 +0000
 +++ bin/common/common.py	2009-11-10 19:55:21 +0000
@@ -21,6 +21,13 @@
  import gtk
  from gtk import glade
++try:
++    import webkit
++except ImportError:
++    webkit = False
++import codecs
++import tempfile
++
  import gobject
  from cgi import escape
  import tools
@@ -327,13 +334,23 @@
      win.destroy()
      return True
++def parse_details(details):
++    if not details.strip().startswith("<!DOCTYPE HTML"):
++        return details, None
++    else:
++        from xml.etree import ElementTree
++        element = ElementTree.fromstring(details)
++        textdetails = element.find("body/pre").text
++        return textdetails, details
++
  def error(title, message, details='', parent=None, disconnected_mode=False):
      """
      Show an error dialog with the support request or the maintenance
      """
      log = logging.getLogger('common.message')
--    details = get_client_environment() + details
--    log.error('Message %s: %s' % (str(message),details))
++    client_env = get_client_environment()
++    details, html_details = parse_details(details)
++    log.error('Message %s: %s%s' % (str(message),client_env,details))
      show_message = True
@@ -420,6 +437,33 @@
      details_buffer = gtk.TextBuffer()
      details_buffer.set_text(details)
      xmlGlade.get_widget('details_explanation').set_buffer(details_buffer)
++    temp_filename = None
++    if html_details is None:
++        # older server
++        xmlGlade.get_widget('notebook').remove_page(3)
++        xmlGlade.get_widget('htmldetails_linkbutton').hide()
++    elif not webkit:
++        # webkit not installed, let's show a link
++        xmlGlade.get_widget('notebook').remove_page(3)
++        temp_file, temp_filename = tempfile.mkstemp(prefix="openerp-error",suffix=".html")
++        codecs.open(temp_filename,"wb",encoding="utf-8").write(html_details)
++        temp_uri = "file://" + os.path.normpath(temp_filename)
++        xmlGlade.get_widget('htmldetails_linkbutton').set_uri(temp_uri)
++    else:
++        # full support
++        win.set_type_hint(gtk.gdk.WINDOW_TYPE_HINT_NORMAL)
++        xmlGlade.get_widget('notebook').remove_page(2)
++        sw = xmlGlade.get_widget('scrolledwindow4')
++        browser = webkit.WebView()
++
++        def set_scroll_adjustments_cb(view, hadjustment, vadjustment):
++            sw.props.hadjustment = hadjustment
++            sw.props.vadjustment = vadjustment
++
++        browser.connect("set-scroll-adjustments", set_scroll_adjustments_cb)
++        sw.add(browser)
++        browser.show()
++        browser.load_string(html_details, "text/html", "iso-8859-15", "error:")
      if show_message:
          xmlGlade.get_widget('maintenance_explanation').set_markup(maintenance_contract_message)
@@ -450,6 +494,8 @@
      response = win.run()
      parent.present()
      win.destroy()
++    if temp_filename is not None:
++        os.remove(temp_filename)
      return True
  def message(msg, title=None, type=gtk.MESSAGE_INFO, parent=None):
 === modified file 'bin/tiny_socket.py'
 --- bin/tiny_socket.py	2009-10-20 10:55:28 +0000
 +++ bin/tiny_socket.py	2009-11-10 19:55:20 +0000
@@ -40,7 +40,13 @@
      def __init__(self, faultCode, faultString):
          self.faultCode = faultCode
          self.faultString = faultString
--        self.args = (faultCode, faultString)
++        self.args = (faultCode, self.stripHtml(faultString))
++
++    def stripHtml(self, description):
++        if description.startswith("<!DOCTYPE HTML"):
++            part1 = description.split('<pre class="textdetails">\n')[1]
++            description = part1.split('</pre>')[0]
++        return description
  class mysocket:
      def __init__(self, sock=None):
 === modified file 'bin/win_error.glade'
 --- bin/win_error.glade	2008-12-31 13:34:48 +0000
 +++ bin/win_error.glade	2009-11-10 19:55:21 +0000
@@ -358,6 +358,24 @@
                          <property name="padding">5</property>
                        </packing>
                      </child>
++                    <child>
++                      <widget class="GtkLinkButton" id="htmldetails_linkbutton">
++                        <property name="visible">True</property>
++                        <property name="can_focus">True</property>
++                        <property name="receives_default">True</property>
++                        <property name="has_tooltip">True</property>
++                        <property name="label" translatable="yes">Click here to see the full stacktrace</property>
++                        <property name="relief">GTK_RELIEF_NONE</property>
++                        <property name="xalign">0</property>
++                        <property name="response_id">0</property>
++                        <property name="uri"></property>
++                      </widget>
++                      <packing>
++                        <property name="expand">False</property>
++                        <property name="fill">False</property>
++                        <property name="position">6</property>
++                      </packing>
++                    </child>
                    </widget>
                    <packing>
                      <property name="position">2</property>
@@ -376,6 +394,38 @@
                      <property name="tab_fill">False</property>
                    </packing>
                  </child>
++                <child>
++                  <widget class="GtkVBox" id="details">
++                    <property name="visible">True</property>
++                    <child>
++                      <widget class="GtkScrolledWindow" id="scrolledwindow4">
++                        <property name="visible">True</property>
++                        <property name="can_focus">True</property>
++                        <property name="hscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++                        <property name="vscrollbar_policy">GTK_POLICY_AUTOMATIC</property>
++                      </widget>
++                      <packing>
++                        <property name="padding">5</property>
++                      </packing>
++                    </child>
++                  </widget>
++                  <packing>
++                    <property name="position">3</property>
++                  </packing>
++                </child>
++                <child>
++                  <widget class="GtkLabel" id="label3">
++                    <property name="visible">True</property>
++                    <property name="label" translatable="yes">&lt;i&gt;_Details&lt;/i&gt;</property>
++                    <property name="use_markup">True</property>
++                    <property name="use_underline">True</property>
++                  </widget>
++                  <packing>
++                    <property name="type">tab</property>
++                    <property name="position">3</property>
++                    <property name="tab_fill">False</property>
++                  </packing>
++                </child>
                </widget>
                <packing>
                  <property name="position">2</property>

Odoo GTK Client (MOVED TO GITHUB)

Merge lp:~alecu/openobject-client/django-tracebacks into lp:openobject-client

Commit message

Description of the change

Unmerged revisions

Preview Diff

Subscribers