From a7173cdb224e214ab0ff986ed74f5597d6c108d0 Mon Sep 17 00:00:00 2001 From: Fabien BOURGEOIS Date: Tue, 6 Mar 2018 07:31:41 +0100 Subject: [PATCH] [QUA][TYPO]GOLEM Activity Queue : little typos / quality enhancements --- golem_activity_queue/__manifest__.py | 10 +++++----- golem_activity_queue/models/__init__.py | 4 +--- golem_activity_queue/models/golem_activity.py | 2 ++ .../models/golem_activity_queue.py | 2 +- golem_activity_queue/models/golem_member.py | 2 ++ .../security/ir.model.access.csv | 4 ++-- .../static/description/icon.png | Bin 11087 -> 1503 bytes .../tests/test_golem_activity.py | 3 ++- .../tests/test_golem_activity_queue.py | 4 ++-- .../tests/test_golem_member.py | 3 +-- .../views/golem_activity_queue_views.xml | 7 +++++++ .../views/golem_activity_views.xml | 4 ++++ .../views/golem_member_views.xml | 3 +++ golem_activity_queue/wizard/__init__.py | 3 +-- ...golem_activity_automated_queue_activate.py | 2 +- ...ctivity_automated_queue_activate_views.xml | 1 - .../wizard/golem_activity_queue_choose.py | 4 ++-- .../golem_activity_queue_choose_views.xml | 2 ++ 18 files changed, 38 insertions(+), 22 deletions(-) diff --git a/golem_activity_queue/__manifest__.py b/golem_activity_queue/__manifest__.py index 03e8f7d..cd8eb35 100644 --- a/golem_activity_queue/__manifest__.py +++ b/golem_activity_queue/__manifest__.py @@ -17,10 +17,10 @@ # along with this program. If not, see . { - 'name': 'GOLEM activities queue', - 'summary': 'GOLEM activities queue', - 'description': ''' GOLEM resources management ''', - 'version': '10.0.2.1.0', + 'name': 'GOLEM activity queues', + 'summary': 'GOLEM activity queues', + 'description': ''' GOLEM activity queue management ''', + 'version': '10.0.1.0.0', 'category': 'GOLEM', 'author': 'Youssef El Ouahby, Fabien Bourgeois', 'license': 'AGPL-3', @@ -34,5 +34,5 @@ 'views/golem_member_views.xml', 'wizard/golem_activity_queue_choose_views.xml', 'wizard/golem_activity_automated_queue_activate_views.xml' - ] + ] } diff --git a/golem_activity_queue/models/__init__.py b/golem_activity_queue/models/__init__.py index 0ed9ff9..e5a38ed 100644 --- a/golem_activity_queue/models/__init__.py +++ b/golem_activity_queue/models/__init__.py @@ -16,6 +16,4 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from . import golem_activity_queue -from . import golem_activity -from . import golem_member +from . import golem_activity_queue, golem_activity, golem_member diff --git a/golem_activity_queue/models/golem_activity.py b/golem_activity_queue/models/golem_activity.py index 5036c1e..75a423e 100644 --- a/golem_activity_queue/models/golem_activity.py +++ b/golem_activity_queue/models/golem_activity.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +""" GOLEM Activity adaptations """ + from odoo import models, fields, api, _ from odoo.exceptions import ValidationError diff --git a/golem_activity_queue/models/golem_activity_queue.py b/golem_activity_queue/models/golem_activity_queue.py index 2591d56..e7aded5 100644 --- a/golem_activity_queue/models/golem_activity_queue.py +++ b/golem_activity_queue/models/golem_activity_queue.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM activities related models """ +""" GOLEM Activity Queue """ from odoo import models, fields, api, _ from odoo.exceptions import ValidationError diff --git a/golem_activity_queue/models/golem_member.py b/golem_activity_queue/models/golem_member.py index 31695d8..fa33aff 100644 --- a/golem_activity_queue/models/golem_member.py +++ b/golem_activity_queue/models/golem_member.py @@ -16,6 +16,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . +""" GOLEM Member adaptations """ + from odoo import models, fields, api, _ class GolemMember(models.Model): diff --git a/golem_activity_queue/security/ir.model.access.csv b/golem_activity_queue/security/ir.model.access.csv index 55c78a8..ed23a5f 100644 --- a/golem_activity_queue/security/ir.model.access.csv +++ b/golem_activity_queue/security/ir.model.access.csv @@ -1,3 +1,3 @@ id,name,model_id:id,group_id:id,perm_read,perm_write,perm_create,perm_unlink -access_golem_activity_queue_user,Access GOLEM Activity Queue User,model_golem_activity_queue,golem_base.group_golem_user,1,1,1,1 -access_golem_activity_queue_manager,Access GOLEM Activity Queue Manager,model_golem_activity_queue,golem_base.group_golem_manager,1,1,1,1 +golem_activity_queue_user_rule,GOLEM Activity Queue User Rule,model_golem_activity_queue,golem_base.group_golem_user,1,1,1,1 +golem_activity_queue_manager_rule,GOLEM Activity Queue Manager Rule,model_golem_activity_queue,golem_base.group_golem_manager,1,1,1,1 diff --git a/golem_activity_queue/static/description/icon.png b/golem_activity_queue/static/description/icon.png index 87f67b4eeb365ad128c01c25066a455d2f878aae..794751abdc538104df0d21e035ba916583d0f08b 100644 GIT binary patch delta 1485 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. +""" GOLEM Activity testing """ + from odoo.tests.common import TransactionCase -from odoo.models import ValidationError class TestGolemActivity(TransactionCase): diff --git a/golem_activity_queue/tests/test_golem_activity_queue.py b/golem_activity_queue/tests/test_golem_activity_queue.py index a32734e..f1ccf36 100644 --- a/golem_activity_queue/tests/test_golem_activity_queue.py +++ b/golem_activity_queue/tests/test_golem_activity_queue.py @@ -73,5 +73,5 @@ class TestGolemActivityQueue(TransactionCase): self.assertEqual(activity.activity_registration_ids[0].member_id, member1) #inscription du meme membre sur l'attente du meme activié: interdit with self.assertRaises(ValidationError): - activity_queue = self.activity_queue.create({'activity_id': activity.id, - 'member_id': member1.id}) + self.activity_queue.create({'activity_id': activity.id, + 'member_id': member1.id}) diff --git a/golem_activity_queue/tests/test_golem_member.py b/golem_activity_queue/tests/test_golem_member.py index f7a20b9..a923d16 100644 --- a/golem_activity_queue/tests/test_golem_member.py +++ b/golem_activity_queue/tests/test_golem_member.py @@ -16,8 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM member testing """ - +""" GOLEM Member testing """ from odoo.tests.common import TransactionCase # from psycopg2 import IntegrityError diff --git a/golem_activity_queue/views/golem_activity_queue_views.xml b/golem_activity_queue/views/golem_activity_queue_views.xml index 8caecc8..2a04f79 100644 --- a/golem_activity_queue/views/golem_activity_queue_views.xml +++ b/golem_activity_queue/views/golem_activity_queue_views.xml @@ -16,8 +16,10 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> + + queue.form @@ -34,6 +36,7 @@ along with this program. If not, see . + queue.search @@ -60,6 +63,7 @@ along with this program. If not, see . + queue.tree @@ -80,6 +84,7 @@ along with this program. If not, see . + GOLEM Activity Queue List @@ -87,10 +92,12 @@ along with this program. If not, see . tree,search {'search_default_season_default': True} + + diff --git a/golem_activity_queue/views/golem_activity_views.xml b/golem_activity_queue/views/golem_activity_views.xml index 5f03397..39487b4 100644 --- a/golem_activity_queue/views/golem_activity_views.xml +++ b/golem_activity_queue/views/golem_activity_views.xml @@ -16,8 +16,11 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> + + + Add the queue registration items to activity form @@ -79,5 +82,6 @@ along with this program. If not, see . + diff --git a/golem_activity_queue/views/golem_member_views.xml b/golem_activity_queue/views/golem_member_views.xml index 7f0ee85..b95e45d 100644 --- a/golem_activity_queue/views/golem_member_views.xml +++ b/golem_activity_queue/views/golem_member_views.xml @@ -16,8 +16,10 @@ GNU Affero General Public License for more details. You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> + + @@ -50,5 +52,6 @@ along with this program. If not, see . + diff --git a/golem_activity_queue/wizard/__init__.py b/golem_activity_queue/wizard/__init__.py index c877b5e..03d4907 100644 --- a/golem_activity_queue/wizard/__init__.py +++ b/golem_activity_queue/wizard/__init__.py @@ -16,5 +16,4 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -from . import golem_activity_queue_choose -from . import golem_activity_automated_queue_activate +from . import golem_activity_queue_choose, golem_activity_automated_queue_activate diff --git a/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py b/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py index b4f9111..c283ea8 100644 --- a/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py +++ b/golem_activity_queue/wizard/golem_activity_automated_queue_activate.py @@ -16,7 +16,7 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM Resources management """ +""" GOLEM Activity Automated Queue """ from odoo import models, fields diff --git a/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml b/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml index 2874a8e..de6a38d 100644 --- a/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml +++ b/golem_activity_queue/wizard/golem_activity_automated_queue_activate_views.xml @@ -44,6 +44,5 @@ along with this program. If not, see . - diff --git a/golem_activity_queue/wizard/golem_activity_queue_choose.py b/golem_activity_queue/wizard/golem_activity_queue_choose.py index c30aacb..515ea77 100644 --- a/golem_activity_queue/wizard/golem_activity_queue_choose.py +++ b/golem_activity_queue/wizard/golem_activity_queue_choose.py @@ -16,12 +16,12 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see . -""" GOLEM Resources management """ +""" GOLEM Activity Queue Choice """ from odoo import models, fields class GolemActivityQueueChooseWizard(models.TransientModel): - """GOLEM Resource wizard : rchoose activity queue to register in """ + """ GOLEM Activity Queue Choice """ _name = "golem.activity.queue.choose.wizard" activity_id = fields.Many2one("golem.activity") 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 c2acf37..b4ba674 100644 --- a/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml +++ b/golem_activity_queue/wizard/golem_activity_queue_choose_views.xml @@ -18,6 +18,7 @@ along with this program. If not, see . --> + GOLEM Activity Queue Choose Wizard Form @@ -38,5 +39,6 @@ along with this program. If not, see . +