diff --git a/CHANGES.txt b/CHANGES.txt index 16e9eca1eefa1d630fe9b57244a1b5f428b9050f..0646779aaf29a183a38378e310e67df7e8cdae2e 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -1,6 +1,12 @@ Changes ======= +0.28.9 (2012-09-18) +------------------- + + * slapgrid: Don't process not updated partitions (regression introduced in + 0.28.7). [Cedric de Saint Martin] + 0.28.8 (2012-09-18) ------------------- diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_getRequestDialogJS.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_getRequestDialogJS.xml index e37561a8e77ee7621a39a5d9e9c8ad1b95f4e9c5..3db0f997ee0a42c92422393d1232dbd8f3963199 100644 --- a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_getRequestDialogJS.xml +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_getRequestDialogJS.xml @@ -56,17 +56,53 @@ tool = context.getPortalObject().portal_vifib_rest_api\n return """\n <script>\n $(document).ready(function () {\n - var current_context = $(".allocable_to_check"),\n - checkallocable;\n + var context = $(".allocable_to_check"),\n + checkallocable,\n + timer,\n + xhr,\n + key, i,\n + sla_key_list;\n \n - checkallocable = function (context) {\n - $.vifiballocable({\n + sla_key_list = [\n + \'cpu_core\',\n + \'cpu_frequency\',\n + \'cpu_type\',\n + \'local_area_network_type\',\n + \'memory_size\',\n + \'memory_type\',\n + \'storage_capacity\',\n + \'storage_interface\',\n + \'storage_redundancy\',\n + \'computer_guid\',\n + ];\n +\n + checkallocable = function () {\n + var context = $(".allocable_to_check"),\n + sla = {}, val;\n +\n + if (timer !== undefined) {\n + clearTimeout(timer);\n + }\n + if (xhr !== undefined) {\n + xhr.abort();\n + }\n +\n + for (i=0; i<sla_key_list.length; i+=1) {\n + key = sla_key_list[i];\n + val = $(\'[name="field_your_\' + key + \'"]\').val();\n + if (val) {\n + sla[key] = val;\n + }\n + }\n + \n + context.text("checking...");\n + xhr = $.vifiballocable({\n context: context,\n url: \'%s/v1/instance/request\', \n slave: false, \n software_release: context.attr("data-url"), \n software_type: "default", \n - sla: {},\n + sla: sla,\n success: function(data) {\n if (data.result === true) {\n $(this).text("There is space!");\n @@ -78,14 +114,18 @@ $(document).ready(function () {\n $(this).text("Unable to check if there is space");\n }, \n complete: function () {\n - var context = $(this);\n - setTimeout(function() {\n - checkallocable(context);\n + timer = setTimeout(function() {\n + checkallocable();\n }, 60000);\n },\n });\n };\n - checkallocable(current_context);\n + for (i=0; i<sla_key_list.length; i+=1) {\n + key = sla_key_list[i];\n + $(\'[name="field_your_\' + key + \'"]\').change(checkallocable);\n + }\n +\n + checkallocable();\n });\n \n \n diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml index 3403d82c11603bf5d2cd88c686e9bda8fffec3d5..f556ffa445096c1446e21ac4079828b6e0d7bb32 100644 --- a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_requestFromDialog.xml @@ -50,11 +50,26 @@ </item> <item> <key> <string>_body</string> </key> - <value> <string>portal = context.getPortalObject()\n + <value> <string encoding="cdata"><![CDATA[ + +portal = context.getPortalObject()\n \n if not service_title:\n service_title = "Vifib KVM %i" % portal.portal_ids.generateNewId(id_group=("vifib", "kvm"), default=1),\n \n +hosting_subscription = portal.portal_catalog.getResultValue(\n + portal_type=\'Hosting Subscription\',\n + validation_state="validated",\n + select_expression=\'title\',\n + title={\'query\': service_title, \'key\': \'ExactMatch\'}\n + )\n +\n +if hosting_subscription is not None:\n + return context.Base_redirect(dialog_id,\n + keep_items={\'portal_status_message\':context.Base_translateString(\n + "You already have service named ${service_title}. Please choose different unique name.", mapping={\'service_title\': service_title})})\n +\n +\n url = context.getUrlString()\n \n person = portal.ERP5Site_getAuthenticatedMemberPersonValue()\n @@ -70,15 +85,40 @@ request_kw.update(\n state="started",\n )\n \n +sla_xml = ""\n +\n +for sla_category_id, sla_category in [\n + (\'cpu_core\', cpu_core),\n + (\'cpu_frequency\', cpu_frequency),\n + (\'cpu_type\', cpu_type),\n + (\'local_area_network_type\', local_area_network_type),\n + (\'memory_size\', memory_size),\n + (\'memory_type\', memory_type),\n + (\'storage_capacity\', storage_capacity),\n + (\'storage_interface\', storage_interface),\n + (\'storage_redundancy\', storage_redundancy),\n + (\'computer_guid\', computer_guid),\n +]:\n + if sla_category:\n + sla_xml += \'<parameter id="%s">%s</parameter>\' % (sla_category_id, sla_category)\n +\n +if sla_xml:\n + request_kw[\'sla_xml\'] = """<?xml version=\'1.0\' encoding=\'utf-8\'?>\n +<instance>\n +%s\n +</instance>""" % sla_xml\n +\n person.requestSoftwareInstance(**request_kw)\n \n message = context.Base_translateString("Your instance is under creation. Please wait few minutes for partitions to appear.")\n return context.REQUEST.get(\'request_hosting_subscription\').Base_redirect(keep_items={\'portal_status_message\': message})\n -</string> </value> + + +]]></string> </value> </item> <item> <key> <string>_params</string> </key> - <value> <string>service_title=None, instance_xml=None</string> </value> + <value> <string>dialog_id, service_title, instance_xml, computer_guid=\'\', cpu_core=\'\', cpu_frequency=\'\', cpu_type=\'\', local_area_network_type=\'\', memory_size=\'\', memory_type=\'\', storage_capacity=\'\', storage_interface=\'\', storage_redundancy=\'\', **kw</string> </value> </item> <item> <key> <string>id</string> </key> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog.xml index 703b0b43fafa88e5a3f9343ba56146205fdcf438..5c877495ef59ab635852312fa0403d2d5d07d4ff 100644 --- a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog.xml +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog.xml @@ -98,6 +98,16 @@ <string>your_ad</string> <string>your_instance_xml</string> <string>your_description</string> + <string>your_computer_guid</string> + <string>your_cpu_core</string> + <string>your_cpu_frequency</string> + <string>your_cpu_type</string> + <string>your_local_area_network_type</string> + <string>your_memory_size</string> + <string>your_memory_type</string> + <string>your_storage_capacity</string> + <string>your_storage_interface</string> + <string>your_storage_redundancy</string> <string>your_monitoring_status</string> <string>your_monitoring_status_js</string> </list> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_computer_guid.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_computer_guid.xml new file mode 100644 index 0000000000000000000000000000000000000000..ad0f7bc1686925306c2e144a97f70d2ad0a7365c --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_computer_guid.xml @@ -0,0 +1,277 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ListField" module="Products.Formulator.StandardFields"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>id</string> </key> + <value> <string>your_computer_guid</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + <item> + <key> <string>required_not_found</string> </key> + <value> <string>Input is required but no input given.</string> </value> + </item> + <item> + <key> <string>unknown_selection</string> </key> + <value> <string>You selected an item that was not in the list.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>alternate_name</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>css_class</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>default</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>description</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>editable</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>enabled</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>external_validator</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>extra_item</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>first_item</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>hidden</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>required</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>size</string> </key> + <value> <int>1</int> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Computer</string> </value> + </item> + <item> + <key> <string>unicode</string> </key> + <value> <int>0</int> </value> + </item> + <item> + <key> <string>whitespace_preserve</string> </key> + <value> <int>0</int> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: [(\'\', \'\')] + [( \'%s (%s)\' % (q.getTitle(), q.getReference()), q.getReference()) for q in here.WebSection_getUserComputerList(portal_type=\'Computer\')]</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_core.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_core.xml new file mode 100644 index 0000000000000000000000000000000000000000..1a4390d6dd0b14897595d12a6858e51ae7b96ebc --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_core.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_cpu_core</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>CPU Core</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_frequency.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_frequency.xml new file mode 100644 index 0000000000000000000000000000000000000000..8ed0c2657e64e1eaae162c26b4e57562ba7e932f --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_frequency.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_cpu_frequency</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>CPU Frequency</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_type.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_type.xml new file mode 100644 index 0000000000000000000000000000000000000000..d3094f3b7817ad79dd4a9f50c326ac0eab619220 --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_cpu_type.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_cpu_type</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>CPU Type</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_local_area_network_type.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_local_area_network_type.xml new file mode 100644 index 0000000000000000000000000000000000000000..9577736803befefcb16ed221485d6ce5859d50e6 --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_local_area_network_type.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_local_area_network_type</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>LAN Type</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_size.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_size.xml new file mode 100644 index 0000000000000000000000000000000000000000..75f47d38ee657bd00dae803ecd0b44b78ce1870c --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_size.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_memory_size</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Memory Size</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_type.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_type.xml new file mode 100644 index 0000000000000000000000000000000000000000..90f2f7cf7a9d686177e65dfe4ff808860187ee24 --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_memory_type.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_memory_type</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Memory Type</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_monitoring_status.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_monitoring_status.xml index 0bff4483f3a999862ae4418553135a7244897099..a5ec61a693b3f149111c63ee367fe394c8cfad94 100644 --- a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_monitoring_status.xml +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_monitoring_status.xml @@ -215,7 +215,7 @@ </item> <item> <key> <string>css_class</string> </key> - <value> <string>nolabel alignr</string> </value> + <value> <string>nolabel alignr error</string> </value> </item> <item> <key> <string>default</string> </key> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_capacity.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_capacity.xml new file mode 100644 index 0000000000000000000000000000000000000000..f76010991be5f413dac53bdd96f64f2891cb444c --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_capacity.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_storage_capacity</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Storage Capacity</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_interface.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_interface.xml new file mode 100644 index 0000000000000000000000000000000000000000..9fb31a686484d40b87f20a783aa60c6b43305cd4 --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_interface.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_storage_interface</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Storage Interface</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_redundancy.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_redundancy.xml new file mode 100644 index 0000000000000000000000000000000000000000..4b2843375aa9fc23da31b79ded4f2db9520f1cf0 --- /dev/null +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/SoftwareRelease_viewRequestDialog/your_storage_redundancy.xml @@ -0,0 +1,126 @@ +<?xml version="1.0"?> +<ZopeData> + <record id="1" aka="AAAAAAAAAAE="> + <pickle> + <global name="ProxyField" module="Products.ERP5Form.ProxyField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>delegated_list</string> </key> + <value> + <list> + <string>items</string> + <string>title</string> + </list> + </value> + </item> + <item> + <key> <string>id</string> </key> + <value> <string>your_storage_redundancy</string> </value> + </item> + <item> + <key> <string>message_values</string> </key> + <value> + <dictionary> + <item> + <key> <string>external_validator_failed</string> </key> + <value> <string>The input failed the external validator.</string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>overrides</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>tales</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string></string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string></string> </value> + </item> + </dictionary> + </value> + </item> + <item> + <key> <string>values</string> </key> + <value> + <dictionary> + <item> + <key> <string>field_id</string> </key> + <value> <string>my_category</string> </value> + </item> + <item> + <key> <string>form_id</string> </key> + <value> <string>Base_viewFieldLibrary</string> </value> + </item> + <item> + <key> <string>items</string> </key> + <value> + <list/> + </value> + </item> + <item> + <key> <string>target</string> </key> + <value> <string>Click to edit the target</string> </value> + </item> + <item> + <key> <string>title</string> </key> + <value> <string>Storage Redundancy</string> </value> + </item> + </dictionary> + </value> + </item> + </dictionary> + </pickle> + </record> + <record id="2" aka="AAAAAAAAAAI="> + <pickle> + <global name="TALESMethod" module="Products.Formulator.TALESField"/> + </pickle> + <pickle> + <dictionary> + <item> + <key> <string>_text</string> </key> + <value> <string>python: getattr(here.portal_categories[field.getId().replace(\'your_\', \'\', 1)], preferences.getPreference(\'preferred_category_child_item_list_method_id\', \'getCategoryChildCompactLogicalPathItemList\'))(local_sort_id=(\'int_index\', \'translated_title\'), checked_permission=\'View\')</string> </value> + </item> + </dictionary> + </pickle> + </record> +</ZopeData> diff --git a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_addSelectedSoftwareReleaseToShoppingCart.xml b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_addSelectedSoftwareReleaseToShoppingCart.xml index 4687d558cd8171df6e514d822c9d57d71f600fbb..486f291e084bac01fecafb7d47f750a3bdc5cda1 100644 --- a/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_addSelectedSoftwareReleaseToShoppingCart.xml +++ b/master/bt5/vifib_web/SkinTemplateItem/portal_skins/vifib_hosting/WebSection_addSelectedSoftwareReleaseToShoppingCart.xml @@ -65,8 +65,10 @@ else:\n if kw.has_key(\'came_from\'):\n #we override the context to redirect the user to the next web section\n context = portal.restrictedTraverse(kw[\'came_from\'])\n - \n -context.WebSection_viewNextStep()\n +\n +software_release = portal.portal_catalog.getResultValue(uid=uids[0])\n +return software_release.Base_redirect(\'SoftwareRelease_viewRequestDialog\')\n +# context.WebSection_viewNextStep()\n </string> </value> </item> <item> diff --git a/master/bt5/vifib_web/bt/revision b/master/bt5/vifib_web/bt/revision index a21cae3648eecf716e8348f3690c25e6285f754d..ee2b8364542e6512c6ff1d906cfa3787731f3ec2 100644 --- a/master/bt5/vifib_web/bt/revision +++ b/master/bt5/vifib_web/bt/revision @@ -1 +1 @@ -454 \ No newline at end of file +456 \ No newline at end of file diff --git a/setup.py b/setup.py index a84f59e1c1fe65058b930ff42a74229e931fb460..c6a44e65dfdebd6ab20bd903c149495fceecd7e5 100644 --- a/setup.py +++ b/setup.py @@ -1,7 +1,7 @@ from setuptools import setup, find_packages import glob import os -version = '0.28.9-dev' +version = '0.28.10-dev' name = 'slapos.core' long_description = open("README.txt").read() + "\n" + \ open("CHANGES.txt").read() + "\n" diff --git a/slapos/format.py b/slapos/format.py index 81acd49477931c128e05e206cbc3340184467e91..d567533d05fbcb441106475875fdfd326dfb92c9 100644 --- a/slapos/format.py +++ b/slapos/format.py @@ -472,7 +472,7 @@ class User(object): try: pwd.getpwnam(self.name) except KeyError: - user_parameter_list.append('--system') + user_parameter_list.append('-r') callAndRead(['useradd'] + user_parameter_list) else: callAndRead(['usermod'] + user_parameter_list) diff --git a/slapos/tests/slapformat.py b/slapos/tests/slapformat.py index 16a47e729e6b34147869f0ea3d103870067fef67..a755aa18f219218daa9650d2ee0ed66b6eec13db 100644 --- a/slapos/tests/slapformat.py +++ b/slapos/tests/slapformat.py @@ -225,7 +225,7 @@ class TestComputer(SlapformatMixin): self.assertEqual([ 'ip addr list bridge', 'groupadd slapsoft', - 'useradd -d /software_root -g slapsoft -s /bin/false slapsoft --system' + 'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -r' ], self.fakeCallAndRead.external_command_list) @@ -259,7 +259,7 @@ class TestComputer(SlapformatMixin): self.assertEqual([ 'ip addr list bridge', 'groupadd slapsoft', - 'useradd -d /software_root -g slapsoft -s /bin/false slapsoft --system' + 'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -r' ], self.fakeCallAndRead.external_command_list) @@ -309,9 +309,9 @@ class TestComputer(SlapformatMixin): self.assertEqual([ 'ip addr list bridge', 'groupadd slapsoft', - 'useradd -d /software_root -g slapsoft -s /bin/false slapsoft --system', + 'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -r', 'groupadd testuser', - 'useradd -d /instance_root/partition -g testuser -s /bin/false -G slapsoft testuser --system', + 'useradd -d /instance_root/partition -g testuser -s /bin/false -G slapsoft testuser -r', 'tunctl -t tap -u testuser', 'ip link set tap up', 'brctl show', @@ -391,9 +391,9 @@ class TestComputer(SlapformatMixin): self.assertEqual([ # 'ip addr list bridge', 'groupadd slapsoft', - 'useradd -d /software_root -g slapsoft -s /bin/false slapsoft --system', + 'useradd -d /software_root -g slapsoft -s /bin/false slapsoft -r', 'groupadd testuser', - 'useradd -d /instance_root/partition -g testuser -s /bin/false -G slapsoft testuser --system', + 'useradd -d /instance_root/partition -g testuser -s /bin/false -G slapsoft testuser -r', # 'ip addr add ip/255.255.255.255 dev bridge', # 'ip addr list bridge', # 'ip addr add ip/ffff:ffff:ffff:ffff:: dev bridge', @@ -469,7 +469,7 @@ class TestUser(SlapformatMixin): self.assertEqual([ 'groupadd doesnotexistsyet', 'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/false '\ - 'doesnotexistsyet --system' + 'doesnotexistsyet -r' ], self.fakeCallAndRead.external_command_list) @@ -482,7 +482,7 @@ class TestUser(SlapformatMixin): self.assertEqual([ 'groupadd doesnotexistsyet', 'useradd -d /doesnotexistsyet -g doesnotexistsyet -s /bin/false -G '\ - 'additionalgroup1,additionalgroup2 doesnotexistsyet --system' + 'additionalgroup1,additionalgroup2 doesnotexistsyet -r' ], self.fakeCallAndRead.external_command_list) @@ -494,7 +494,7 @@ class TestUser(SlapformatMixin): user.create() self.assertEqual([ - 'useradd -d /testuser -g testuser -s /bin/false testuser --system' + 'useradd -d /testuser -g testuser -s /bin/false testuser -r' ], self.fakeCallAndRead.external_command_list)