slapos_erp5:

* new slapos_panel skin folder
* project needed when create person/compute node

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSAuthenticationPolicy.py

@@ -99,7 +99,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
     self.assertTrue(login.isLoginBlocked())
 
   def test_block_ERP5Login_without_password_on_person(self):
-    person = self.makePerson(user=0)
+    person = self.makePerson(self.addProject(), user=0)
     person.edit(
       first_name="SOMENAME",
       last_name="LASTNAME"
@@ -109,7 +109,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
       login_portal_type="ERP5 Login")
 
   def test_block_CertificateLogin_without_password_on_person(self):
-    person = self.makePerson(user=0)
+    person = self.makePerson(self.addProject(), user=0)
     person.edit(
       first_name="SOMENAME",
       last_name="LASTNAME"
@@ -121,7 +121,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
 
   def test_block_CertificateLogin_without_password_on_compute_node(self):
     self._test_login_donot_block(
-      document=self._makeComputeNode()[0],
+      document=self._makeComputeNode(self.addProject())[0],
       login_portal_type="Certificate Login")
   
   def test_block_CertificateLogin_without_password_on_software_instance(self):
@@ -130,7 +130,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
       login_portal_type="Certificate Login")
 
   def test_block_GoogleLogin_on_person(self):
-    person = self.makePerson(user=0)
+    person = self.makePerson(self.addProject(), user=0)
     person.edit(
       first_name="SOMENAME",
       last_name="LASTNAME"
@@ -141,7 +141,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
     )
   
   def test_block_FacebookLogin_on_person(self):
-    person = self.makePerson(user=0)
+    person = self.makePerson(self.addProject(), user=0)
     person.edit(
       first_name="SOMENAME",
       last_name="LASTNAME"
@@ -203,7 +203,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
     self.assertFalse(login.isPasswordExpired())
 
   def test_expire_ERP5Login_without_password_on_person(self):
-    person = self.makePerson(user=0)
+    person = self.makePerson(self.addProject(), user=0)
     person.edit(
       first_name="SOMENAME",
       last_name="LASTNAME"
@@ -212,8 +212,22 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
       document=person,
       login_portal_type="ERP5 Login")
 
+<<<<<<< HEAD
+=======
+  def test_expire_ERP5Login_without_password_on_compute_node(self):
+    self._test_expire_when_passoword_is_set(
+      document=self._makeComputeNode(self.addProject())[0],
+      login_portal_type="ERP5 Login"
+    )
+  
+  def test_expire_ERP5Login_without_password_on_software_instance(self):
+    self._test_expire_when_passoword_is_set(
+      document=self._makeDummySoftwareInstance(),
+      login_portal_type="ERP5 Login")
+
+>>>>>>> df93206e7 (slapos_erp5: project needed when create person/compute node)
   def test_expire_CertificateLogin_without_password_on_person(self):
-    person = self.makePerson(user=0)
+    person = self.makePerson(self.addProject(), user=0)
     person.edit(
       first_name="SOMENAME",
       last_name="LASTNAME"
@@ -225,7 +239,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
 
   def test_expire_CertificateLogin_without_password_on_compute_node(self):
     self._test_dont_expire_when_password_isnt_set(
-      document=self._makeComputeNode()[0],
+      document=self._makeComputeNode(self.addProject())[0],
       login_portal_type="Certificate Login")
   
   def test_expire_CertificateLogin_without_password_on_software_instance(self):
@@ -234,7 +248,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
       login_portal_type="Certificate Login")
 
   def test_expire_GoogleLogin_on_person(self):
-    person = self.makePerson(user=0)
+    person = self.makePerson(self.addProject(), user=0)
     person.edit(
       first_name="SOMENAME",
       last_name="LASTNAME"
@@ -245,7 +259,7 @@ class TestSlapOSAuthenticationPolicyL(SlapOSTestCaseMixin):
     )
   
   def test_expire_FacebookLogin_on_person(self):
-    person = self.makePerson(user=0)
+    person = self.makePerson(self.addProject(), user=0)
     person.edit(
       first_name="SOMENAME",
       last_name="LASTNAME"

master/bt5/slapos_erp5/TestTemplateItem/portal_components/test.erp5.testSlapOSERP5SkinSelection.py

@@ -86,9 +86,7 @@ erp5_gadget
 erp5_glossary
 erp5_graph_editor"""
 
-common_folder_list = """erp5_jquery_sheet_editor
-erp5_json_editor
-erp5_json_type
+common_folder_list = """erp5_json_type
 erp5_monaco_editor
 erp5_multimedia
 erp5_notebook
@@ -198,10 +196,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -250,9 +250,11 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -288,9 +290,11 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -327,10 +331,12 @@ erp5_ingestion
 erp5_integration
 erp5_invoicing
 erp5_jquery
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -366,14 +372,14 @@ erp5_integration
 erp5_invoicing
 erp5_jquery
 erp5_jquery_sheet_editor
-erp5_json_editor
 erp5_json_type
 erp5_km_widget_library
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
-""" % {'common_folder_list' : '\n'.join(common_folder_list.split('\n')[3:]),
+slapos_panel
+""" % {'common_folder_list' : '\n'.join(common_folder_list.split('\n')[1:]),
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
        'slapos_folder_list': slapos_folder_list
@@ -406,9 +412,11 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -442,10 +450,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -479,9 +489,11 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -515,9 +527,11 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -552,9 +566,11 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -589,10 +605,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -627,10 +645,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -666,9 +686,11 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -704,10 +726,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -741,10 +765,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -776,10 +802,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -811,10 +839,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -846,10 +876,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -898,10 +930,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -933,10 +967,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -968,10 +1004,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -1003,10 +1041,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -1038,10 +1078,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,
@@ -1076,10 +1118,12 @@ erp5_immobilisation
 erp5_ingestion
 erp5_integration
 erp5_invoicing
+erp5_jquery_sheet_editor
 %(common_folder_list)s
 erp5_xhtml_style
 external_method
 slapos_disaster_recovery
+slapos_panel
 """ % {'common_folder_list' : common_folder_list,
        'common2_folder_list' : common2_folder_list,
        'common3_folder_list' : common3_folder_list,