diff --git a/golem_activity_queue/models/golem_activity_queue.py b/golem_activity_queue/models/golem_activity_queue.py
index aa19c65..4b085a2 100644
--- a/golem_activity_queue/models/golem_activity_queue.py
+++ b/golem_activity_queue/models/golem_activity_queue.py
@@ -20,32 +20,6 @@
from odoo import models, fields, api, _
-class YesNoQueuePopUp(models.TransientModel):
- """GOLEM Resource wizard"""
- _name = "golem.queuepopup"
-
-
- #yes_no = fields.Char(default='Do you want to proceed?')
-
- @api.multi
- def queueYes(self):
- print "########################################################"
- return {
- 'name' : _('Do you want to add your registration to the queue?'),
- 'type' : 'ir.actions.act_window',
- 'res_model' : 'golem.activity.queue',
- 'view_mode': 'form',
- 'view_type': 'form',
- 'target': 'new',
- }
-
- @api.multi
- def queueNo(self):
- pass # don't do anything
-
-
-
-
class GolemActivityQueue(models.Model):
""" GOLEM Activity Queue """
_name = 'golem.activity.queue'
diff --git a/golem_activity_queue/models/golem_member.py b/golem_activity_queue/models/golem_member.py
index 60047ca..dba1311 100644
--- a/golem_activity_queue/models/golem_member.py
+++ b/golem_activity_queue/models/golem_member.py
@@ -41,11 +41,15 @@ class GolemMember(models.Model):
}
}
+ @api.multi
def queue_register(self):
+ self.ensure_one()
+ member_id = self[0]
return {
'name' : _('Choose the activity to register in'),
'type' : 'ir.actions.act_window',
'res_model' : 'golem.activity.queue.choose.wizard',
'view_mode': 'form',
+ 'context' : {'default_member_id' : member_id.id},
'target': 'new',
}
diff --git a/golem_activity_queue/views/golem_activity_queue_views.xml b/golem_activity_queue/views/golem_activity_queue_views.xml
index d107ee7..fe893a1 100644
--- a/golem_activity_queue/views/golem_activity_queue_views.xml
+++ b/golem_activity_queue/views/golem_activity_queue_views.xml
@@ -21,7 +21,7 @@ along with this program. If not, see .
-
+
queue.form
golem.activity.queue
@@ -61,7 +61,7 @@ along with this program. If not, see .
golem.activity.queue
-
+
diff --git a/golem_activity_queue/views/golem_activity_views.xml b/golem_activity_queue/views/golem_activity_views.xml
index 3c9b663..e3a84b2 100644
--- a/golem_activity_queue/views/golem_activity_views.xml
+++ b/golem_activity_queue/views/golem_activity_views.xml
@@ -55,18 +55,5 @@ along with this program. If not, see .
-
- queuepopup.form
- golem.queuepopup
- form
-
-
-
-
diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose.py b/golem_activity_queue/wizard/golem_activity_queue_choose.py
index 9adbda6..382ab30 100644
--- a/golem_activity_queue/wizard/golem_activity_queue_choose.py
+++ b/golem_activity_queue/wizard/golem_activity_queue_choose.py
@@ -25,6 +25,8 @@ class GolemActivityQueueChooseWizard(models.TransientModel):
_name = "golem.activity.queue.choose.wizard"
activity_id = fields.Many2one("golem.activity")
+ member_id = fields.Many2one("golem.member")
+
def ChooseActivity(self):
@@ -35,7 +37,9 @@ class GolemActivityQueueChooseWizard(models.TransientModel):
'type' : 'ir.actions.act_window',
'res_model' : 'golem.activity.queue',
'view_mode': 'tree',#
- 'context' :{'default_activity_id' : activityQueue.activity_id.id},
+ 'context' :{'default_activity_id' : activityQueue.activity_id.id,
+ 'default_member_id' : activityQueue.member_id.id
+ },
'domain' : [('activity_id', '=',activityQueue.activity_id.id )],# activity_id.name)],#"('activity_id', '=', True)"
'flags': {'action_buttons': True},
'target': 'new',
diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
index e2882d2..d99a56f 100644
--- a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
+++ b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml
@@ -27,6 +27,7 @@ along with this program. If not, see .