From 18957c4568210b8d1af218fe84e52b1e059f7e34 Mon Sep 17 00:00:00 2001
From: Fabien BOURGEOIS <fabien@yaltik.com>
Date: Wed, 26 Sep 2018 11:44:24 +0200
Subject: [PATCH] [IMP]GOLEM Activity Registration State : small enhancements

* Reload client to reflect changes after unlink registration ;
* Do no show buttons until registration has been saved.
---
 golem_activity_registration_state/__manifest__.py        | 2 +-
 .../models/golem_activity_registration.py                | 5 +++--
 .../views/golem_activity_registration_views.xml          | 9 +++++----
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/golem_activity_registration_state/__manifest__.py b/golem_activity_registration_state/__manifest__.py
index 87d50aa..c8bc7bf 100644
--- a/golem_activity_registration_state/__manifest__.py
+++ b/golem_activity_registration_state/__manifest__.py
@@ -19,7 +19,7 @@
     'name': 'GOLEM Activity Session Member Registrations States',
     'summary': 'GOLEM Activities Session Member Registration states',
     'description': 'GOLEM Activities Session Member Registration states',
-    'version': '10.0.2.2.0',
+    'version': '10.0.2.2.1',
     'category': 'GOLEM',
     'author': 'Fabien Bourgeois',
     'license': 'AGPL-3',
diff --git a/golem_activity_registration_state/models/golem_activity_registration.py b/golem_activity_registration_state/models/golem_activity_registration.py
index fde5a1d..2b20d5d 100644
--- a/golem_activity_registration_state/models/golem_activity_registration.py
+++ b/golem_activity_registration_state/models/golem_activity_registration.py
@@ -18,7 +18,7 @@
 """ GOLEM Activity Registration State """
 
 from odoo import models, fields, api, _
-from odoo.exceptions import UserError
+from odoo.exceptions import UserError, ValidationError
 
 class GolemMember(models.Model):
     """ GOLEM Member adaptations """
@@ -89,9 +89,10 @@ class GolemActivityRegistration(models.Model):
     def state_remove(self):
         """ Remove registrations, only if canceled """
         if self.filtered(lambda r: r.state != 'canceled'):
-            uerr = _('You can not confirm a canceled registration.')
+            uerr = _('You can not remove a uncanceled registration.')
             raise UserError(uerr)
         self.unlink()
+        return {'type': 'ir.actions.client', 'tag': 'reload'}
 
     @api.multi
     def write(self, values):
diff --git a/golem_activity_registration_state/views/golem_activity_registration_views.xml b/golem_activity_registration_state/views/golem_activity_registration_views.xml
index e7305ed..694ef92 100644
--- a/golem_activity_registration_state/views/golem_activity_registration_views.xml
+++ b/golem_activity_registration_state/views/golem_activity_registration_views.xml
@@ -45,20 +45,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
           <attribute name="delete">0</attribute>
         </tree>
         <tree position="inside">
+          <field name="id" invisible="1" />
           <field name="state" readonly="1" />
           <button type="object" name="state_draft" string="Reset to draft"
-            icon="fa-arrow-up" attrs="{'invisible': [('state', '=', 'draft')]}"
+            icon="fa-arrow-up" attrs="{'invisible': ['|', ('id', '=', False), ('state', '=', 'draft')]}"
             invisible="not context.get('action_show', 1)" />
           <button type="object" name="state_confirm" string="Confirm"
-            icon="fa-check" attrs="{'invisible': [('state', '!=', 'draft')]}"
+            icon="fa-check" attrs="{'invisible': ['|', ('id', '=', False), ('state', '!=', 'draft')]}"
             invisible="not context.get('action_show', 1)" />
           <button type="object" name="state_cancel" string="Cancel"
-            icon="fa-ban" attrs="{'invisible': [('state', '=', 'canceled')]}"
+            icon="fa-ban" attrs="{'invisible': ['|', ('id', '=', False), ('state', '=', 'canceled')]}"
             invisible="not context.get('action_show', 1)" />
           <button type="object" name="state_remove" string="Remove"
             icon="fa-trash"
             confirm="Are you sure you want to remove this subscription ?"
-            attrs="{'invisible': [('state', '!=', 'canceled')]}"
+            attrs="{'invisible': ['|', ('id', '=', False), ('state', '!=', 'canceled')]}"
             invisible="not context.get('action_show', 1)" />
         </tree>
       </field>