Browse Source

[FIX] gurneyalex remarks

pull/450/head
David Béal 10 years ago
committed by David Beal
parent
commit
97788c8b11
  1. 11
      secure_uninstall/module.py
  2. 10
      secure_uninstall/wizard_view.xml

11
secure_uninstall/module.py

@ -28,11 +28,14 @@ class Module(orm.Model):
def button_uninstall(self, cr, uid, ids, context=None): def button_uninstall(self, cr, uid, ids, context=None):
if 'uninstall_authorized' in context: if 'uninstall_authorized' in context:
del context['uninstall_authorized']
if not context:
context = {}
ctx = context.copy()
del ctx['uninstall_authorized']
super(Module, self).button_uninstall( super(Module, self).button_uninstall(
cr, uid, ids, context=context)
cr, uid, ids, context=ctx)
return self._button_immediate_function( return self._button_immediate_function(
cr, uid, ids, self.button_uninstall, context=context)
cr, uid, ids, self.button_uninstall, context=ctx)
else: else:
_, view_id = self.pool['ir.model.data'].get_object_reference( _, view_id = self.pool['ir.model.data'].get_object_reference(
cr, uid, 'secure_uninstall', 'view_uninstall_wizard_form') cr, uid, 'secure_uninstall', 'view_uninstall_wizard_form')
@ -69,7 +72,7 @@ class UninstallCheckWizard(orm.TransientModel):
raise orm.except_orm( raise orm.except_orm(
"Password Error", "Password Error",
"Issue\n_____\nProvided password '%s' doesn't match with " "Issue\n_____\nProvided password '%s' doesn't match with "
"'admin_passwd' comes from your "
"'admin_passwd' found in the "
"Odoo server configuration file." "Odoo server configuration file."
"\n\nResolution\n__________\n" "\n\nResolution\n__________\n"
"Please check your password and retry or cancel" "Please check your password and retry or cancel"

10
secure_uninstall/wizard_view.xml

@ -9,7 +9,8 @@
<field name="arch" type="xml"> <field name="arch" type="xml">
<form string="Check" version="7.0"> <form string="Check" version="7.0">
<p class="oe_inline oe_grey"> <p class="oe_inline oe_grey">
Uninstall module process remove all data managed by the module.
Uninstall module process remove all data managed by the module.<br/>
Some columns can be dropped and there is no way to recover that except restoring a database backup
</p> </p>
<label string="If you want uninstall module, write required password." <label string="If you want uninstall module, write required password."
colspan="4" /> colspan="4" />
@ -17,8 +18,11 @@ Uninstall module process remove all data managed by the module.
<field name="password" password="True"/> <field name="password" password="True"/>
<span/> <span/>
</group> </group>
<button icon="gtk-ok" name="check_password" string="Apply" type="object"/>
<button icon="gtk-cancel" special="cancel" string="Cancel"/>
<footer>
<button name="check_password" string="Apply" type="object"
class="oe_highlight"/>
<button special="cancel" string="Cancel" class="oe_link"/>
</footer>
</form> </form>
</field> </field>
</record> </record>

Loading…
Cancel
Save