Skip to content

S
slapos.core
Commit 560385d5 authored by Cédric de Saint Martin's avatar Cédric de Saint Martin
Browse files
Options

Merge branch 'master' into slaprename

parents 676a2985 411c2f1d
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 12735 additions and 2184 deletions
.gitignore
View file @ 560385d5
...@@ -9,3 +9,5 @@ ...@@ -9,3 +9,5 @@
/parts/ /parts/
/slapos.core.egg-info/ /slapos.core.egg-info/
/master/bt5/bt5list /master/bt5/bt5list
/master/Products
/master/product/__init__.py
CHANGES.txt
View file @ 560385d5
Changes Changes
======= =======
0.26 (Unreleased) 0.28.2 (2012-08-17)
-------------------
* Resolved path problem in register [Cédric Le Ninivin]
0.28.1 (2012-08-17)
-------------------
* Resolved critical naming conflict
0.28 (2012-08-17)
----------------- -----------------
* No change yet. * Introduce "slapos node register" command, that will register computer to
SlapOS Master (vifib.net by default) for you. [Cédric Le Ninivin]
* Set .timestamp in partitions ONLY after slapgrid thinks it's okay (promises,
...). [Cedric de Saint Martin]
* slapgrid-ur: when destroying (not reporting), only care about instances to
destroy, completely ignore others. [Cedric de Saint Martin]
0.27 (2012-08-08)
-----------------
* slapformat: Raise correct error when no IPv6 is available on selected
interface. [Cedric de Saint Martin]
* slapgrid: Introduce --only_sr and --only_cp.
- only_sr filter and force the run of a single SR, and uses url_md5
(folder_id)
- only_cp filter which computer patition, will be runned. it can be a
list, splited by comman (slappartX,slappartY ...) [Rafael Monnerat]
* slapgrid: Cleanup unused option (--usage-report-periodicity). [Cedric de
Saint Martin]
* slapgrid: --develop will work also for Computer Partitions. [Cedric de Saint
Martin]
* slaplib: setConnectionDict won't call Master if parameters haven't changed.
[Cedric de Saint Martin]
0.26.2 (2012-07-09)
-------------------
* Define UTF-8 encoding in SlapOS Node codebase, as defined in PEP-263.
0.26.1 (2012-07-06)
-------------------
* slapgrid-sr: Add --develop option to make it ignore .completed files.
* SLAP library: it is now possible to fetch whole dict of connection
parameters.
* SLAP library: it is now possible to fetch single instance parameter.
* SLAP library: change Computer and ComputerPartition behavior to have proper
caching of computer partition parameters.
0.26 (2012-07-05)
-----------------
* slapformat: no_bridge option becomes 'not create_tap'.
create_tap is true by default. So a bridge is used and tap will be created by
default. [Cedric de Saint Martin]
* Add delay for slapformat. [Cedric Le Ninivin]
* If no software_type is given, use default one (i.e fix "error 500" when
requesting new instance). [Cedric de Saint Martin]
* slapgrid: promise based software release, new api to fetch full computer
information from server. [Yingjie Xu]
* slapproxy: new api to mock full computer information [Yingjie Xu]
* slapgrid: minor fix randomise delay feature. [Yingjie Xu]
* slapgrid: optimise slapgrid-cp, run buildout only if there is an update
on server side. [Yingjie Xu]
* libslap: Allow accessing ServerError. [Vincent Pelletier]
0.25 (2012-05-16) 0.25 (2012-05-16)
----------------- -----------------
......
bootstrap.py 0 → 100644
View file @ 560385d5
This diff is collapsed.
documentation/source/rest.rst
View file @ 560385d5
SlapOS Master REST API (v1) SlapOS Master REST API (v1)
*************************** ***************************
Introduction
------------
This is so called REST interface to Vifib which uses HTTP protocol.
API_BASE
++++++++
``"API_BASE"`` is server side path of the interface. In case of Vifib.net it
is...
Authentication Authentication
-------------- --------------
...@@ -11,30 +22,82 @@ As API is going to be used in environments which support TLS communication ...@@ -11,30 +22,82 @@ As API is going to be used in environments which support TLS communication
channel, but do not, or support is cumbersome, support X509 keys OAuth-2 will channel, but do not, or support is cumbersome, support X509 keys OAuth-2 will
be proposed by library. be proposed by library.
Token based authentication Internal authentication
++++++++++++++++++++++++++ +++++++++++++++++++++++
**Note**: This authentication mechanism will change. Avoid implementation for now.
In case if client of API does not fulfill X509 authentication it has a chance In case if client of API does not fulfill X509 authentication it has a chance
to use token based authentication (after obtaining proper token). to use token based authentication (after obtaining proper token).
Client application HAVE TO use ``"Authorization"`` header, even if OAuth-2 Client application HAVE TO use ``"Authorization"`` header, even if OAuth-2
allows other ways (like hvaing token in GET parameter or as form one). allows other ways (like having token in GET parameter or as form one).
They were not implemented as begin fragile from security point of view. They were not implemented as begin fragile from security point of view.
Example of using Bearer token:: Example of using Bearer token::
GET /api/v1/instance/{instance_id} HTTP/1.1 GET /API_BASE/instance/{instance_id} HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Authorization: Bearer 7Fjfp0ZBr1KtDRbnfVdmIw Authorization: Bearer 7Fjfp0ZBr1KtDRbnfVdmIw
External authentication
+++++++++++++++++++++++
It is possible to use Facebook and Google as Authorization Server with Oauth 2.0
access tokens. Client shall fetch `access_token` as described in:
* https://developers.facebook.com/docs/authentication/client-side/ (Facebook)
* https://developers.google.com/accounts/docs/OAuth2Login (Google)
Such token shall be passed in `Authorization` header, in case of Facebook::
GET /API_BASE/instance/{instance_id} HTTP/1.1
Host: example.com
Accept: application/json
Authorization: Facebook retrieved_access_token
and in case of Google::
GET /API_BASE/instance/{instance_id} HTTP/1.1
Host: example.com
Accept: application/json
Authorization: Google retrieved_access_token
The client is responsible for having its own application ID and
configure it that user basic information and email will be available after
using `access_token`, for example by fetching token after query like::
https://www.facebook.com/dialog/oauth?client_id=FB_ID&response_type=token&redirect_uri=APP_URL&scope=email
While passing access token Vifib.net server will contact proper Authorization
Server (Google or Facebook) and use proper user profile. In case of first time
usage of the service the user will be automatically created, so application
shall be prepared to support HTTP ``"202 Accepted"`` code, as described in `Response status code`_.
Facebook notes
~~~~~~~~~~~~~~
While requesting Facebook access token it is required to set ``scope`` value
to ``email``.
Vifib.net will use those data to create users.
Google notes
~~~~~~~~~~~~
While requesting Google access token it is required to set ``scope`` value
to ``https://www.googleapis.com/auth/userinfo.profile https://www.googleapis.com/auth/userinfo.email``.
Vifib.net will use those data to create users.
Exchange format Exchange format
--------------- ---------------
SlapOS master will support both XML and JSON formats for input and output. SlapOS master will support both XML and JSON formats for input and output.
The Accept header is required and responsible for format selection.
Response status code Response status code
-------------------- --------------------
...@@ -59,6 +122,17 @@ applied.. ...@@ -59,6 +122,17 @@ applied..
``OPTIONS`` requests will return ``"204 No Content"`` response with headers ``OPTIONS`` requests will return ``"204 No Content"`` response with headers
informing about possible method usage. informing about possible method usage.
``"202 Accepted"`` with json response with status can be returned in order to
indicate that request was correct, but some asynchronous opertions are disallow
to finish it, for example user being in creation process::
HTTP/1.1 202 Accepted
Content-Type: application/json; charset=utf-8
{
"status": "User under creation."
}
Common Error Responses Common Error Responses
++++++++++++++++++++++ ++++++++++++++++++++++
...@@ -99,97 +173,6 @@ Request to non existing resource made. ...@@ -99,97 +173,6 @@ Request to non existing resource made.
~~~~~~~~~~~~~~~~~~~~~~~~~ ~~~~~~~~~~~~~~~~~~~~~~~~~
Unexpected error. Unexpected error.
Introsepcation Methods
**********************
Fetching list of access urls
----------------------------
Explain acccess points in dictionary.
Client is expected to ask about connection points before doing any request.
In case if required mapping is defined on client side, but server does not
expose this information, it means, that such capability is not available on
server side and should not be used.
In case if client does not support exposed mapping it is allowed to ignore
them.
Client shall be aware that one API can be spanned across many servers and that
all urls are given as abolute ones.
Endpoint to invoke required action is in ``url`` object, where values in
``{}`` shall be replaced with corresponding access urls. For example
``instance_url`` shall be replaced with obtained URL of instance (by request
or list).
``method`` is required method on URL.
All required parameters, if any, are in ``required`` object.
All optional understandable parameters, if any, are in ``optional`` object.
In case if access point requires authentication, then ``authentication`` will be set to ``true``.
`Request`::
GET / HTTP/1.1
Host: example.com
Accept: application/json
`No Expected Request Body`
Extract of possible response::
HTTP/1.1 200 OK
Content-Type: application/json; charset=utf-8
{
"instance_bang": {
"authentication": true,
"url": "{instance_url}/bang",
"method": "POST",
"required": {
"log": "unicode"
},
"optional": {}
},
"instance_list": {
"authentication": true,
"url": "http://three.example.com/instance",
"method": "GET",
"required": {},
"optional": {}
},
"register_computer": {
"authentication": true,
"url": "http://two.example.com/computer",
"method": "POST",
"required": {
"title": "unicode"
},
},
"request_instance": {
"authentication": true,
"url": "http://one.example.com/instance",
"method": "POST",
"required": {
"status": "unicode",
"slave": "bool",
"title": "unicode",
"software_release": "unicode",
"software_type": "unicode",
"parameter": "object",
"sla": "object"
},
"optional": {}
}
}
All documentation here will refer to named access points except otherwise
stated. The access point will appear in ``[]`` after method name.
Instance Methods Instance Methods
**************** ****************
...@@ -200,7 +183,7 @@ Ask for list of instances. ...@@ -200,7 +183,7 @@ Ask for list of instances.
`Request`:: `Request`::
GET [instance_list] HTTP/1.1 GET /API_BASE/instance HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
...@@ -228,7 +211,7 @@ Request a new instantiation of a software. ...@@ -228,7 +211,7 @@ Request a new instantiation of a software.
`Request`:: `Request`::
POST [request_instance] HTTP/1.1 POST /API_BASE/instance HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Content-Type: application/json; charset=utf-8 Content-Type: application/json; charset=utf-8
...@@ -293,7 +276,7 @@ Request all instance information. ...@@ -293,7 +276,7 @@ Request all instance information.
`Request`:: `Request`::
GET [instance_info] HTTP/1.1 GET /API_BASE/<instance_path> HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
...@@ -346,7 +329,7 @@ Request the instance certificates. ...@@ -346,7 +329,7 @@ Request the instance certificates.
`Request`:: `Request`::
GET [instance_certificate] HTTP/1.1 GET /API_BASE/<instance_path>/certificate HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
...@@ -378,7 +361,7 @@ Trigger the re-instantiation of all partitions in the instance tree ...@@ -378,7 +361,7 @@ Trigger the re-instantiation of all partitions in the instance tree
`Request`:: `Request`::
POST [instance_bang] HTTP/1.1 POST /API_BASE/<instance_path>/bang HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Content-Type: application/json; charset=utf-8 Content-Type: application/json; charset=utf-8
...@@ -404,7 +387,7 @@ Modify the instance information and status. ...@@ -404,7 +387,7 @@ Modify the instance information and status.
`Request`:: `Request`::
PUT [instance_edit] HTTP/1.1 PUT /API_BASE/<instance_path> HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Content-Type: application/json; charset=utf-8 Content-Type: application/json; charset=utf-8
...@@ -455,7 +438,7 @@ Add a new computer in the system. ...@@ -455,7 +438,7 @@ Add a new computer in the system.
`Request`:: `Request`::
POST [register_computer] HTTP/1.1 POST /API_BASE/computer HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Content-Type: application/json; charset=utf-8 Content-Type: application/json; charset=utf-8
...@@ -489,7 +472,7 @@ Get the status of a computer ...@@ -489,7 +472,7 @@ Get the status of a computer
`Request`:: `Request`::
GET [computer_info] HTTP/1.1 GET /API_BASE/<computer_path> HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
...@@ -535,7 +518,7 @@ Modify computer information in the system ...@@ -535,7 +518,7 @@ Modify computer information in the system
`Request`:: `Request`::
PUT [computer_edit] HTTP/1.1 PUT /API_BASE/<computer_path> HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Content-Type: application/json; charset=utf-8 Content-Type: application/json; charset=utf-8
...@@ -578,7 +561,7 @@ Request to supply a new software release on a computer ...@@ -578,7 +561,7 @@ Request to supply a new software release on a computer
`Request`:: `Request`::
POST [computer_supply] HTTP/1.1 POST /API_BASE/<computer_path>/supply HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Content-Type: application/json; charset=utf-8 Content-Type: application/json; charset=utf-8
...@@ -605,7 +588,7 @@ Request update on all partitions ...@@ -605,7 +588,7 @@ Request update on all partitions
`Request`:: `Request`::
POST [computer_bang] HTTP/1.1 POST /API_BASE/<computer_path>/bang HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Content-Type: application/json; charset=utf-8 Content-Type: application/json; charset=utf-8
...@@ -631,7 +614,7 @@ Report computer usage ...@@ -631,7 +614,7 @@ Report computer usage
`Request`:: `Request`::
POST [computer_report] HTTP/1.1 POST /API_BASE/<computer_path>/report HTTP/1.1
Host: example.com Host: example.com
Accept: application/json Accept: application/json
Content-Type: application/json; charset=utf-8 Content-Type: application/json; charset=utf-8
......
master/bt5/vifib_agent/SkinTemplateItem/portal_skins/vifib_agent/Agent_getComputerPartitionState.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n
\n
computer = portal.portal_catalog.getResultValue(\n
portal_type="Computer",\n
reference=computer_reference)\n
\n
partition = portal.portal_catalog.getResultValue(\n
portal_type="Computer Partition",\n
reference=computer_partition_reference,\n
parent_uid=computer.getUid())\n
\n
instance = portal.portal_catalog.getResultValue(\n
portal_type="Software Instance",\n
default_aggregate_uid=partition.getUid(),\n
validation_state="validated")\n
\n
if instance is None:\n
return "Destroyed"\n
else:\n
return instance.SoftwareInstance_getStatus()\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>computer_reference, computer_partition_reference</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Agent_getComputerPartitionState</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_agent/SkinTemplateItem/portal_skins/vifib_agent/Agent_getSoftwareReleaseDocumentFromReference.xml
View file @ 560385d5
...@@ -51,7 +51,7 @@ ...@@ -51,7 +51,7 @@
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n <value> <string>portal = context.getPortalObject()\n
software_release = portal.portal_catalog.getResultValue(portal_type="Software Release", reference=software_release_reference)\n software_release = portal.portal_catalog.getResultValue(portal_type="Software Release", url_string=software_release_reference)\n
return software_release\n return software_release\n
</string> </value> </string> </value>
</item> </item>
......
master/bt5/vifib_agent/bt/revision
View file @ 560385d5
3 6
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_base/PropertySheetTemplateItem/portal_property_sheets/SoftwareInstance/bang_timestamp_property.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/int</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Used to inform client to update the instance.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>bang_timestamp_property</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/Base_createOauth2User.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string encoding="cdata"><![CDATA[
from DateTime import DateTime\n
\n
if context.REQUEST.get(\'Base_createOauth2User\') is not None:\n
return\n
\n
context.REQUEST.set(\'Base_createOauth2User\', 1)\n
portal = context.getPortalObject()\n
\n
if portal.portal_activities.countMessageWithTag(tag) > 0:\n
return\n
\n
person = portal.ERP5Site_getAuthenticatedMemberPersonValue(reference)\n
if person is not None:\n
return\n
\n
activate_kw={\'tag\': tag}\n
person = portal.person_module.newContent(portal_type=\'Person\',\n
reference=reference,\n
first_name=first_name,\n
last_name=last_name,\n
default_email_coordinate_text=email,\n
activate_kw=activate_kw)\n
\n
person.validate(activate_kw=activate_kw)\n
\n
assignment_duration = portal.portal_preferences.getPreferredCredentialAssignmentDuration()\n
today = DateTime()\n
delay = today + assignment_duration\n
\n
category_list = portal.portal_preferences.getPreferredSubscriptionAssignmentCategoryList()\n
\n
assignment = person.newContent(\n
portal_type=\'Assignment\',\n
category_list=category_list,\n
start_date = today,\n
stop_date = delay,\n
activate_kw=activate_kw)\n
assignment.open(activate_kw=activate_kw)\n
\n
person.setRoleList(assignment.getRoleList())\n
]]></string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>tag, first_name, last_name, reference, email</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Base_createOauth2User</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/ComputerPartition_getAvailableSoftwareReleaseUrlStringList.xml
View file @ 560385d5
...@@ -65,7 +65,7 @@ elif slap_state == \'busy\':\n ...@@ -65,7 +65,7 @@ elif slap_state == \'busy\':\n
validation_state="validated",\n validation_state="validated",\n
default_aggregate_uid=context.getUid(),\n default_aggregate_uid=context.getUid(),\n
)\n )\n
if instance is None:\n if (instance is None) or (instance.getSlapState() != "start_requested"):\n
return []\n return []\n
else:\n else:\n
return [instance.getRootSoftwareReleaseUrl()]\n return [instance.getRootSoftwareReleaseUrl()]\n
......
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/ComputerPartition_getSoftwareType.xml
View file @ 560385d5
...@@ -55,7 +55,7 @@ ...@@ -55,7 +55,7 @@
validation_state="validated",\n validation_state="validated",\n
default_aggregate_uid=context.getUid(),\n default_aggregate_uid=context.getUid(),\n
)\n )\n
if instance is None:\n if (instance is None) or (instance.getSlapState() != "start_requested"):\n
return ""\n return ""\n
else:\n else:\n
return instance.getSourceReference()\n return instance.getSourceReference()\n
......
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/Computer_viewCurrentUsage/your_busy_computer_partition_list.xml
View file @ 560385d5
...@@ -406,7 +406,7 @@ ...@@ -406,7 +406,7 @@
<string>Image</string> <string>Image</string>
</tuple> </tuple>
<tuple> <tuple>
<string>SoftwareInstance_getStatus</string> <string>ComuterPartition_getSoftwareInstanceStatus</string>
<string>Status</string> <string>Status</string>
</tuple> </tuple>
</list> </list>
......
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/OpenSaleOrder_findPartition.xml
View file @ 560385d5
...@@ -71,6 +71,25 @@ else:\n ...@@ -71,6 +71,25 @@ else:\n
# support SLA\n # support SLA\n
if "computer_guid" in filter_kw:\n if "computer_guid" in filter_kw:\n
query_kw["parent_reference"] = filter_kw["computer_guid"]\n query_kw["parent_reference"] = filter_kw["computer_guid"]\n
if "instance_guid" in filter_kw:\n
portal = context.getPortalObject()\n
instance = portal.portal_catalog.getResultValue(portal_type="Software Instance", reference=filter_kw["instance_guid"])\n
if instance is None:\n
# XXX Other user do not have access to the instance document...\n
if filter_kw["instance_guid"] == "SOFTINST-9238":\n
# XXX Let\'s be nice with Cedric and Vincent\n
query_kw["uid"] = "2225067"\n
elif filter_kw["instance_guid"] == "SOFTINST-11031":\n
# XXX Let\'s be nice with KVM frontend\n
query_kw["uid"] = "2874296"\n
else:\n
query_kw["uid"] = "-1"\n
else:\n
partition_uid = instance.getAggregateUid(portal_type="Computer Partition")\n
if partition_uid:\n
query_kw["uid"] = partition_uid\n
else:\n
query_kw["uid"] = "-1"\n
\n \n
SQL_WINDOW_SIZE = 50\n SQL_WINDOW_SIZE = 50\n
\n \n
......
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_base/SoftwareInstanceModule_viewSoftwareInstanceList/listbox.xml
View file @ 560385d5
...@@ -86,6 +86,14 @@ ...@@ -86,6 +86,14 @@
<string>translated_portal_type</string> <string>translated_portal_type</string>
<string>Type</string> <string>Type</string>
</tuple> </tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>Validation State</string>
</tuple>
<tuple>
<string>translated_slap_state_title</string>
<string>Slap State</string>
</tuple>
<tuple> <tuple>
<string>source_reference</string> <string>source_reference</string>
<string>Software Type</string> <string>Software Type</string>
...@@ -102,10 +110,6 @@ ...@@ -102,10 +110,6 @@
<string>modification_date</string> <string>modification_date</string>
<string>Modification Date</string> <string>Modification Date</string>
</tuple> </tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>Validation State</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
...@@ -125,6 +129,14 @@ ...@@ -125,6 +129,14 @@
<string>translated_portal_type</string> <string>translated_portal_type</string>
<string>Type</string> <string>Type</string>
</tuple> </tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>Validation State</string>
</tuple>
<tuple>
<string>translated_slap_state_title</string>
<string>Slap State</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/Base_getNotCategoryRelatedList.xml
View file @ 560385d5
...@@ -99,8 +99,9 @@ base_category_uid\r\n ...@@ -99,8 +99,9 @@ base_category_uid\r\n
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
select\n select\n
catalog.uid, catalog.path from catalog\n catalog.uid, catalog.path from catalog, movement\n
where\n where\n
movement.uid = catalog.uid AND movement.quantity <> 0 AND \n
catalog.uid not in (\n catalog.uid not in (\n
select category.category_uid from category where category.base_category_uid=<dtml-var base_category_uid>)\n select category.category_uid from category where category.base_category_uid=<dtml-var base_category_uid>)\n
and (<dtml-in simulation_state_list>\n and (<dtml-in simulation_state_list>\n
......
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibInvoiceTransaction_postGeneration.xml
View file @ 560385d5
...@@ -61,7 +61,8 @@ if related_simulation_movement_path_list is None:\n ...@@ -61,7 +61,8 @@ if related_simulation_movement_path_list is None:\n
invoice = context\n invoice = context\n
\n \n
# if installed erp5_simplified_invoicing, set resource from price currency\n # if installed erp5_simplified_invoicing, set resource from price currency\n
if not invoice.Invoice_isAdvanced():\n #if not invoice.Invoice_isAdvanced():\n
if 1:\n
if not invoice.getResource():\n if not invoice.getResource():\n
invoice.setResource(invoice.getPriceCurrency())\n invoice.setResource(invoice.getPriceCurrency())\n
\n \n
......
master/bt5/vifib_base/SkinTemplateItem/portal_skins/vifib_simulation/VifibPaymentTransaction_postGeneration.xml
View file @ 560385d5
...@@ -58,8 +58,9 @@ payment_transaction = context\n ...@@ -58,8 +58,9 @@ payment_transaction = context\n
if payment_transaction.getSimulationState() == "draft":\n if payment_transaction.getSimulationState() == "draft":\n
payment_transaction.plan(comment=translateString("Initialised by Delivery Builder."))\n payment_transaction.plan(comment=translateString("Initialised by Delivery Builder."))\n
\n \n
# First set the payment transaction in the building state on the causality workflow\n if payment_transaction.getCausalityState() == "draft":\n
payment_transaction.startBuilding()\n # First set the payment transaction in the building state on the causality workflow\n
payment_transaction.startBuilding()\n
\n \n
# update casuality from movements\n # update casuality from movements\n
causality_list = payment_transaction.getCausalityList()\n causality_list = payment_transaction.getCausalityList()\n
......
master/bt5/vifib_base/bt/dependency_list
View file @ 560385d5
...@@ -2,11 +2,13 @@ erp5_accounting ...@@ -2,11 +2,13 @@ erp5_accounting
erp5_accounting_l10n_fr erp5_accounting_l10n_fr
erp5_administration erp5_administration
erp5_base erp5_base
erp5_bearer_token
erp5_commerce erp5_commerce
erp5_computer_immobilisation erp5_computer_immobilisation
erp5_content_translation erp5_content_translation
erp5_core_proxy_field_legacy erp5_core_proxy_field_legacy
erp5_credential erp5_credential
erp5_credential_oauth2
erp5_crm erp5_crm
erp5_dhtml_style erp5_dhtml_style
erp5_discount_resource erp5_discount_resource
...@@ -41,5 +43,4 @@ erp5_trade ...@@ -41,5 +43,4 @@ erp5_trade
erp5_web erp5_web
erp5_web_download_theme erp5_web_download_theme
erp5_xhtml_jquery_style erp5_xhtml_jquery_style
vifib_slapos_core vifib_slapos_core
erp5_bearer_token \ No newline at end of file
\ No newline at end of file
master/bt5/vifib_base/bt/revision
View file @ 560385d5
454 470
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_data/PathTemplateItem/acl_users/erp5_facebook_extraction.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ERP5FacebookExtractionPlugin" module="Products.ERP5Security.ERP5ExternalOauth2ExtractionPlugin"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>erp5_facebook_extraction</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/PathTemplateItem/acl_users/erp5_google_extraction.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="ERP5GoogleExtractionPlugin" module="Products.ERP5Security.ERP5ExternalOauth2ExtractionPlugin"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>erp5_google_extraction</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/PathTemplateItem/acl_users/vifib_browser_id_authentication.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="VifibBrowserIDExtractionPlugin" module="Products.Vifib.VifibCookieHashExtractionPlugin"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_browser_id_authentication</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/PathTemplateItem/acl_users/vifib_facebook_authentication.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="VifibFacebookServerExtractionPlugin" module="Products.Vifib.VifibCookieHashExtractionPlugin"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_facebook_authentication</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/PathTemplateItem/acl_users/vifib_google_authentication.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="VifibGoogleServerExtractionPlugin" module="Products.Vifib.VifibCookieHashExtractionPlugin"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_google_authentication</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/PathTemplateItem/acl_users/vifib_machine_authentication.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="VifibMachineAuthenticationPlugin" module="Products.Vifib.VifibMachineAuthenticationPlugin"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_machine_authentication</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/PathTemplateItem/acl_users/vifib_shadow.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="VifibShadowAuthenticationPlugin" module="Products.Vifib.VifibShadowAuthenticationPlugin"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>vifib_shadow</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data/bt/revision
View file @ 560385d5
102 104
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_data/bt/template_path_list
View file @ 560385d5
acl_users/erp5_facebook_extraction
acl_users/erp5_google_extraction
acl_users/vifib_browser_id_authentication
acl_users/vifib_facebook_authentication
acl_users/vifib_google_authentication
acl_users/vifib_machine_authentication
acl_users/vifib_shadow
currency_module/EUR currency_module/EUR
document_module/1 document_module/1
notification_message_module/vifib* notification_message_module/vifib*
......
master/bt5/vifib_data_simulation/PathTemplateItem/portal_deliveries/vifib_sale_invoice_builder.xml
View file @ 560385d5
...@@ -101,6 +101,10 @@ ...@@ -101,6 +101,10 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>delivery_creatable</string> </key>
<value> <int>0</int> </value>
</item>
<item> <item>
<key> <string>delivery_line_collect_order</string> </key> <key> <string>delivery_line_collect_order</string> </key>
<value> <value>
......
master/bt5/vifib_data_simulation/bt/revision
View file @ 560385d5
126 127
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_data_web/PathTemplateItem/portal_caches/browser_id_auth_token_cache_factory.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Cache Factory" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>cache_duration</string> </key>
<value> <int>3600</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>browser_id_auth_token_cache_factory</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Cache Factory</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/portal_caches/browser_id_auth_token_cache_factory/persistent_cache_plugin.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Distributed Ram Cache" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>specialise/portal_memcached/default_memcached_plugin</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>persistent_cache_plugin</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Distributed Ram Cache</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/portal_caches/facebook_server_auth_token_cache_factory.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Cache Factory" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>cache_duration</string> </key>
<value> <int>3600</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>facebook_server_auth_token_cache_factory</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Cache Factory</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/portal_caches/facebook_server_auth_token_cache_factory/persistent_cache_plugin.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Distributed Ram Cache" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>specialise/portal_memcached/default_memcached_plugin</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>persistent_cache_plugin</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Distributed Ram Cache</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/portal_caches/google_server_auth_token_cache_factory.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Cache Factory" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>cache_duration</string> </key>
<value> <int>3600</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>google_server_auth_token_cache_factory</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Cache Factory</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value>
<none/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/portal_caches/google_server_auth_token_cache_factory/persistent_cache_plugin.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Distributed Ram Cache" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>specialise/portal_memcached/default_memcached_plugin</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>persistent_cache_plugin</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Distributed Ram Cache</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/web_site_module/hosting/login_with_browser_id.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Section" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>__translation_dict</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>custom_render_method_id</string> </key>
<value> <string>WebSection_browserIdInitiateLogin</string> </value>
</item>
<item>
<key> <string>default_page_displayed</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>login_with_browser_id</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Section</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Login with Browser ID</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/web_site_module/hosting/login_with_facebook.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Section" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>__translation_dict</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>custom_render_method_id</string> </key>
<value> <string>WebSection_facebookInitiateLogin</string> </value>
</item>
<item>
<key> <string>default_page_displayed</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>login_with_facebook</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Section</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Login with facebook</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/web_site_module/hosting/login_with_facebook/facebook_callback.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Section" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>custom_render_method_id</string> </key>
<value> <string>WebSection_facebookCallbackLogin</string> </value>
</item>
<item>
<key> <string>default_page_displayed</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>facebook_callback</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Section</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Supports Facebook\'s callback</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/web_site_module/hosting/login_with_google.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Section" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>__translation_dict</string> </key>
<value>
<dictionary/>
</value>
</item>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAU=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAY=</string> </persistent>
</value>
</item>
<item>
<key> <string>custom_render_method_id</string> </key>
<value> <string>WebSection_googleInitiateLogin</string> </value>
</item>
<item>
<key> <string>default_page_displayed</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>login_with_google</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Section</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Login with Google</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="5" aka="AAAAAAAAAAU=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="6" aka="AAAAAAAAAAY=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/PathTemplateItem/web_site_module/hosting/login_with_google/google_callback.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Web Section" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Add_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Add_portal_folders_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Copy_or_Move_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Delete_objects_Permission</string> </key>
<value>
<tuple>
<string>Assignor</string>
<string>Manager</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>custom_render_method_id</string> </key>
<value> <string>WebSection_googleCallbackLogin</string> </value>
</item>
<item>
<key> <string>default_page_displayed</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>google_callback</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Web Section</string> </value>
</item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Supports Google\'s callback</string> </value>
</item>
<item>
<key> <string>visible</string> </key>
<value> <int>0</int> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_data_web/bt/revision
View file @ 560385d5
92 97
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_data_web/bt/template_path_list
View file @ 560385d5
image_module/vifib.cloud image_module/vifib.cloud
image_module/vifib.kvm image_module/vifib.kvm
image_module/vifib.rack image_module/vifib.rack
portal_caches/browser_id_auth_token_cache_factory
portal_caches/browser_id_auth_token_cache_factory/persistent_cache_plugin
portal_caches/facebook_server_auth_token_cache_factory
portal_caches/facebook_server_auth_token_cache_factory/persistent_cache_plugin
portal_caches/google_server_auth_token_cache_factory
portal_caches/google_server_auth_token_cache_factory/persistent_cache_plugin
web_page_module/vifib* web_page_module/vifib*
web_site_module/cash web_site_module/cash
web_site_module/cash/** web_site_module/cash/**
......
master/bt5/vifib_erp5/PathTemplateItem/person_module/test_updated_vifib_user/1.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Assignment" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_Access_contents_information_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_Modify_portal_content_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_View_Permission</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Auditor</string>
<string>Manager</string>
<string>Owner</string>
</tuple>
</value>
</item>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>group/company</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>1</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Assignment</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<tuple>
<global name="PersistentMapping" module="Persistence.mapping"/>
<tuple/>
</tuple>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_erp5/PortalTypePropertySheetTemplateItem/property_sheet_list.xml
View file @ 560385d5
...@@ -5,6 +5,9 @@ ...@@ -5,6 +5,9 @@
<portal_type id="Computer"> <portal_type id="Computer">
<item>VifibComputerConstraint</item> <item>VifibComputerConstraint</item>
</portal_type> </portal_type>
<portal_type id="Computer Partition">
<item>VifibComputerPartitionConstraint</item>
</portal_type>
<portal_type id="Email"> <portal_type id="Email">
<item>VifibEmailConstraint</item> <item>VifibEmailConstraint</item>
</portal_type> </portal_type>
......
master/bt5/vifib_erp5/PortalTypeRolesTemplateItem/Computer%20Partition.xml
View file @ 560385d5
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
<multi_property id='base_category'>destination_section</multi_property> <multi_property id='base_category'>destination_section</multi_property>
</role> </role>
<role id='Auditor'> <role id='Auditor'>
<property id='title'>Software Instance related by Hosting Subscription</property> <property id='title'>Software Instance group related to Computer Partition</property>
<property id='condition'>python: here.getSlapState() == "busy"</property> <property id='condition'>python: here.getSlapState() == "busy"</property>
<property id='base_category_script'>ERP5Type_getSecurityCategoryFromAggregateMovementItemByHostingSubscription</property> <property id='base_category_script'>ERP5Type_getSecurityCategoryFromAggregateRelatedSoftwareInstanceHostingSubscription</property>
<multi_property id='base_category'>aggregate</multi_property> <multi_property id='base_category'>aggregate</multi_property>
</role> </role>
</type_roles> </type_roles>
\ No newline at end of file
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibComputerPartitionConstraint.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Property Sheet" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_count</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_mt_index</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>_tree</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAQ=</string> </persistent>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>VifibComputerPartitionConstraint</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Property Sheet</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="Length" module="BTrees.Length"/>
</pickle>
<pickle> <int>0</int> </pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
<record id="4" aka="AAAAAAAAAAQ=">
<pickle>
<global name="OOBTree" module="BTrees.OOBTree"/>
</pickle>
<pickle>
<none/>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibComputerPartitionConstraint/non_busy_partition_has_no_related_instance_constraint.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Category Related Membership Arity Constraint" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>constraint_base_category</string> </key>
<value>
<tuple>
<string>default_aggregate</string>
</tuple>
</value>
</item>
<item>
<key> <string>constraint_portal_type</string> </key>
<value> <string>python: (\'Software Instance\', \'Slave Instance\')</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Computer Partition which is not busy, shall have none aggregate related instance.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>non_busy_partition_has_no_related_instance_constraint</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>max_arity</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>min_arity</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category Related Membership Arity Constraint</string> </value>
</item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value> <string>python: context.getSlapState() != \'busy\'</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPersonConstraint/property_existence_constraint.xml → master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibPersonConstraint/ongoing_invoice_constraint.xml
View file @ 560385d5
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
<ZopeData> <ZopeData>
<record id="1" aka="AAAAAAAAAAE="> <record id="1" aka="AAAAAAAAAAE=">
<pickle> <pickle>
<global name="Property Existence Constraint" module="erp5.portal_type"/> <global name="Category Related Membership Arity Constraint" module="erp5.portal_type"/>
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
...@@ -12,23 +12,6 @@ ...@@ -12,23 +12,6 @@
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>message_property_not_set</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item> <item>
<key> <string>_range_criterion</string> </key> <key> <string>_range_criterion</string> </key>
<value> <value>
...@@ -36,32 +19,42 @@ ...@@ -36,32 +19,42 @@
</value> </value>
</item> </item>
<item> <item>
<key> <string>constraint_property</string> </key> <key> <string>constraint_base_category</string> </key>
<value> <value>
<tuple> <tuple>
<string>last_name</string> <string>default_destination_section</string>
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>constraint_portal_type</string> </key>
<value> <string>python: (\'Sale Invoice Transaction\',)</string> </value>
</item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
<value> <string>Property last_name must be defined</string> </value> <value>
<none/>
</value>
</item>
<item>
<key> <string>filter_parameter</string> </key>
<value> <string>python: {\'simulation_state\': \'planned\'}</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>property_existence_constraint</string> </value> <value> <string>ongoing_invoice_constraint</string> </value>
</item> </item>
<item> <item>
<key> <string>message_no_such_property</string> </key> <key> <string>max_arity</string> </key>
<value> <string>Property last_name must be defined</string> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>message_property_not_set</string> </key> <key> <string>min_arity</string> </key>
<value> <string>Property last_name must be defined</string> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Property Existence Constraint</string> </value> <value> <string>Category Related Membership Arity Constraint</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListConstraint/no_additional_applied_rule_order_causality_constraint.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Category Related Membership Arity Constraint" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_identity_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value>
</item>
<item>
<key> <string>_range_criterion</string> </key>
<value>
<persistent> <string encoding="base64">AAAAAAAAAAM=</string> </persistent>
</value>
</item>
<item>
<key> <string>constraint_base_category</string> </key>
<value>
<tuple>
<string>causality</string>
</tuple>
</value>
</item>
<item>
<key> <string>constraint_portal_type</string> </key>
<value> <string>python: (\'Applied Rule\',)</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Sale Packing List build from Sale Order shall have no related Applied Rule.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>no_additional_applied_rule_order_causality_constraint</string> </value>
</item>
<item>
<key> <string>int_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>max_arity</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>membership_criterion_category</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>min_arity</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Category Related Membership Arity Constraint</string> </value>
</item>
<item>
<key> <string>string_index</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>test_method_id</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>test_tales_expression</string> </key>
<value> <string>python: len(context.getCausalityList()) != 0</string> </value>
</item>
</dictionary>
</pickle>
</record>
<record id="2" aka="AAAAAAAAAAI=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
<record id="3" aka="AAAAAAAAAAM=">
<pickle>
<global name="PersistentMapping" module="Persistence.mapping"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>data</string> </key>
<value>
<dictionary/>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_erp5/PropertySheetTemplateItem/portal_property_sheets/VifibSalePackingListLineConstraint/quantity_value_constraint.xml
View file @ 560385d5
...@@ -66,7 +66,7 @@ ...@@ -66,7 +66,7 @@
</item> </item>
<item> <item>
<key> <string>test_tales_expression</string> </key> <key> <string>test_tales_expression</string> </key>
<value> <string>python: context.getSimulationState() != \'cancelled\'</string> </value> <value> <string>python: context.getSimulationState() != \'cancelled\' and context.getSpecialise() != \'sale_trade_condition_module/vifib_simple_trade_condition\'</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_erp5/SkinTemplateItem/portal_skins/vifib_core/ERP5Type_getSecurityCategoryFromAggregateRelatedSoftwareInstanceHostingSubscription.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>"""This scripts set ups role of aggregate related Software Instance\n
\n
This is simple implementation, instead of generic related category with portal type,\n
which would not be configurable in Role Definition anyway."""\n
\n
category_list = []\n
\n
if obj is None:\n
return []\n
\n
software_instance_list = obj.getPortalObject().portal_catalog(\n
portal_type=\'Software Instance\',\n
default_aggregate_uid=obj.getUid(),\n
limit=2\n
)\n
\n
if len(software_instance_list) == 1:\n
hosting_subscription = software_instance_list[0].getSpecialise(portal_type=\'Hosting Subscription\')\n
for base_category in base_category_list:\n
category_list.append({base_category: hosting_subscription})\n
\n
return category_list\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>base_category_list, user_name, obj, portal_type</string> </value>
</item>
<item>
<key> <string>_proxy_roles</string> </key>
<value>
<tuple>
<string>Assignee</string>
<string>Assignor</string>
<string>Associate</string>
<string>Auditor</string>
<string>Authenticated</string>
<string>Author</string>
<string>Manager</string>
<string>Member</string>
</tuple>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ERP5Type_getSecurityCategoryFromAggregateRelatedSoftwareInstanceHostingSubscription</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_erp5/TestTemplateItem/testVifibConstraint.py
View file @ 560385d5
...@@ -304,16 +304,6 @@ class TestVifibPersonConstraint(testVifibMixin): ...@@ -304,16 +304,6 @@ class TestVifibPersonConstraint(testVifibMixin):
def getTitle(self): def getTitle(self):
return "Vifib Person Constraint checks" return "Vifib Person Constraint checks"
def test_last_name_existence(self):
person = self.portal.person_module.newContent(portal_type='Person')
consistency_message = 'Property last_name must be defined'
self.assertTrue(consistency_message in getMessageList(person))
person.setLastName(rndstr())
self.assertFalse(consistency_message in getMessageList(person))
def test_role(self): def test_role(self):
person = self.portal.person_module.newContent(portal_type='Person') person = self.portal.person_module.newContent(portal_type='Person')
consistency_message = 'One role should be defined' consistency_message = 'One role should be defined'
......
master/bt5/vifib_erp5/TestTemplateItem/testVifibModuleSecurity.py
View file @ 560385d5
...@@ -27,6 +27,7 @@ ...@@ -27,6 +27,7 @@
from VifibMixin import testVifibMixin from VifibMixin import testVifibMixin
from zExceptions import Unauthorized from zExceptions import Unauthorized
from Products.ERP5Type.tests.backportUnittest import skip
class TestVifibModuleSecurity(testVifibMixin): class TestVifibModuleSecurity(testVifibMixin):
""" """
...@@ -72,6 +73,7 @@ class TestVifibModuleSecurity(testVifibMixin): ...@@ -72,6 +73,7 @@ class TestVifibModuleSecurity(testVifibMixin):
def getTitle(self): def getTitle(self):
return "Test Vifib Module security" return "Test Vifib Module security"
@skip('Ignored for now, as security changed a lot')
def test_VifibUserCanNotAccessModules(self): def test_VifibUserCanNotAccessModules(self):
""" """
Check if member of vifib group can not access modules. Check if member of vifib group can not access modules.
......
master/bt5/vifib_erp5/WorkflowTemplateItem/portal_workflow/local_permission_vifib_interaction_workflow.xml
View file @ 560385d5
...@@ -22,6 +22,10 @@ ...@@ -22,6 +22,10 @@
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>local_permission_vifib_interaction_workflow</string> </value> <value> <string>local_permission_vifib_interaction_workflow</string> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Local Permission Vifib Interaction Workflow</string> </value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
master/bt5/vifib_erp5/WorkflowTemplateItem/portal_workflow/local_permission_vifib_interaction_workflow/interactions/SoftwareInstance_setAggregateList.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="InteractionDefinition" module="Products.ERP5.Interaction"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>actbox_category</string> </key>
<value> <string>workflow</string> </value>
</item>
<item>
<key> <string>actbox_name</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>actbox_url</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>activate_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>after_script_name</string> </key>
<value>
<list>
<string>SoftwareInstance_updateAggregateLocalRoles</string>
</list>
</value>
</item>
<item>
<key> <string>before_commit_script_name</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>guard</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>SoftwareInstance_setAggregateList</string> </value>
</item>
<item>
<key> <string>method_id</string> </key>
<value>
<list>
<string>_setAggregate.*</string>
</list>
</value>
</item>
<item>
<key> <string>once_per_transaction</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>portal_type_filter</string> </key>
<value>
<list>
<string>Software Instance</string>
</list>
</value>
</item>
<item>
<key> <string>script_name</string> </key>
<value>
<list>
<string>SoftwareInstance_updateAggregateLocalRoles</string>
</list>
</value>
</item>
<item>
<key> <string>temporary_document_disallowed</string> </key>
<value> <int>0</int> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>trigger_type</string> </key>
<value> <int>2</int> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/WorkflowTemplateItem/portal_workflow/slap_interaction_workflow/scripts/SalePackingList_reindexUnderDestructionComputerPartition.xml → master/bt5/vifib_erp5/WorkflowTemplateItem/portal_workflow/local_permission_vifib_interaction_workflow/scripts/SoftwareInstance_updateAggregateLocalRoles.xml
View file @ 560385d5
...@@ -50,20 +50,11 @@ ...@@ -50,20 +50,11 @@
</item> </item>
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.ZSQLCatalog.SQLCatalog import Query, ComplexQuery, NegatedQuery\n <value> <string>portal_type_list = [\'Computer Partition\']\n
\n software_instance = state_change[\'object\']\n
current_delivery = state_change[\'object\']\n after_tag = (software_instance.getPath(), (\'immediateReindexObject\', \'recursiveImmediateReindexObject\'))\n
portal = current_delivery.getPortalObject()\n for object_ in software_instance.getAggregateValueList(portal_type=portal_type_list):\n
\n object_.activate(after_path_and_method_id=after_tag).updateLocalRolesOnSecurityGroups()\n
destroy_service_relative_url = portal.portal_preferences.getPreferredInstanceCleanupResource()\n
\n
sale_packing_list_line_list = current_delivery.contentValues(portal_type="Sale Packing List Line")\n
for current_delivery_line in sale_packing_list_line_list:\n
if current_delivery_line.getResource() == destroy_service_relative_url:\n
\n
computer_partition = current_delivery_line.getAggregateValue(portal_type=["Computer Partition"])\n
computer_partition.activate(\n
after_path_and_method_id=(current_delivery.getPath(), (\'immediateReindexObject\', \'recursiveImmediateReindexObject\'))).reindexObject()\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
...@@ -80,7 +71,7 @@ for current_delivery_line in sale_packing_list_line_list:\n ...@@ -80,7 +71,7 @@ for current_delivery_line in sale_packing_list_line_list:\n
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>SalePackingList_reindexUnderDestructionComputerPartition</string> </value> <value> <string>SoftwareInstance_updateAggregateLocalRoles</string> </value>
</item> </item>
</dictionary> </dictionary>
</pickle> </pickle>
......
master/bt5/vifib_erp5/bt/revision
View file @ 560385d5
434 445
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_erp5/bt/template_keep_workflow_path_list
View file @ 560385d5
...@@ -12,4 +12,4 @@ open_sale_order_module/test_vifib_user_admin_open_sale_order ...@@ -12,4 +12,4 @@ open_sale_order_module/test_vifib_user_admin_open_sale_order
open_sale_order_module/test_vifib_user_developer_open_sale_order open_sale_order_module/test_vifib_user_developer_open_sale_order
service_module/vifib_discount service_module/vifib_discount
service_module/vifib_tax service_module/vifib_tax
service_module/vifib_discount service_module/vifib_discount
\ No newline at end of file
master/bt5/vifib_erp5/bt/template_path_list
View file @ 560385d5
...@@ -35,4 +35,4 @@ service_module/computer_registration/** ...@@ -35,4 +35,4 @@ service_module/computer_registration/**
service_module/vifib_discount service_module/vifib_discount
service_module/vifib_registration service_module/vifib_registration
service_module/vifib_registration/default_ssl service_module/vifib_registration/default_ssl
service_module/vifib_tax service_module/vifib_tax
\ No newline at end of file
master/bt5/vifib_erp5/bt/template_portal_type_property_sheet_list
View file @ 560385d5
Assignment | VifibAssignmentConstraint Assignment | VifibAssignmentConstraint
Computer Partition | VifibComputerPartitionConstraint
Computer | VifibComputerConstraint Computer | VifibComputerConstraint
Email | VifibEmailConstraint Email | VifibEmailConstraint
Hosting Subscription | VifibHostingSubscriptionConstraint Hosting Subscription | VifibHostingSubscriptionConstraint
......
master/bt5/vifib_erp5/bt/template_property_sheet_id_list
View file @ 560385d5
VifibAssignmentConstraint VifibAssignmentConstraint
VifibPersonConstraint VifibPersonConstraint
VifibComputerPartitionConstraint
VifibEmailConstraint VifibEmailConstraint
VifibComputerConstraint VifibComputerConstraint
VifibSoftwareProductConstraint VifibSoftwareProductConstraint
......
master/bt5/vifib_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_no_workflow_date_object_list.catalog_keys.xml
View file @ 560385d5
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<value>1</value> <value>1</value>
</item> </item>
<item key="_filter_expression_archive" type="str"> <item key="_filter_expression_archive" type="str">
<value>python: context.getPortalType() in ('Software Instance', 'Slave Instance', 'Computer')</value> <value>python: context.getPortalType() in ('Software Instance', 'Slave Instance', 'Computer', 'Computer Partition')</value>
</item> </item>
<item key="_filter_expression_cache_key_archive" type="tuple"> <item key="_filter_expression_cache_key_archive" type="tuple">
<value>portal_type</value> <value>portal_type</value>
......
master/bt5/vifib_mysql_innodb_catalog/CatalogMethodTemplateItem/portal_catalog/erp5_mysql_innodb/z_catalog_object_list.catalog_keys.xml
View file @ 560385d5
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
<value>1</value> <value>1</value>
</item> </item>
<item key="_filter_expression_archive" type="str"> <item key="_filter_expression_archive" type="str">
<value>python: context.getPortalType() not in ('Software Instance', 'Slave Instance', 'Computer')</value> <value>python: context.getPortalType() not in ('Software Instance', 'Slave Instance', 'Computer', 'Computer Partition')</value>
</item> </item>
<item key="_filter_expression_cache_key_archive" type="tuple"> <item key="_filter_expression_cache_key_archive" type="tuple">
<value>portal_type</value> <value>portal_type</value>
......
master/bt5/vifib_mysql_innodb_catalog/bt/revision
View file @ 560385d5
38 39
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_open_trade/SkinTemplateItem/portal_skins/vifib_open_trade/HostingSubscriptionModule_viewHostingSubscriptionList/listbox.xml
View file @ 560385d5
...@@ -10,6 +10,7 @@ ...@@ -10,6 +10,7 @@
<key> <string>delegated_list</string> </key> <key> <string>delegated_list</string> </key>
<value> <value>
<list> <list>
<string>all_columns</string>
<string>columns</string> <string>columns</string>
<string>selection_name</string> <string>selection_name</string>
<string>title</string> <string>title</string>
...@@ -73,6 +74,37 @@ ...@@ -73,6 +74,37 @@
<key> <string>values</string> </key> <key> <string>values</string> </key>
<value> <value>
<dictionary> <dictionary>
<item>
<key> <string>all_columns</string> </key>
<value>
<list>
<tuple>
<string>title</string>
<string>Title</string>
</tuple>
<tuple>
<string>reference</string>
<string>Reference</string>
</tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>Validation State</string>
</tuple>
<tuple>
<string>translated_slap_state_title</string>
<string>Slap State</string>
</tuple>
<tuple>
<string>creation_date</string>
<string>Creation Date</string>
</tuple>
<tuple>
<string>modification_date</string>
<string>Modification Date</string>
</tuple>
</list>
</value>
</item>
<item> <item>
<key> <string>columns</string> </key> <key> <string>columns</string> </key>
<value> <value>
...@@ -85,6 +117,14 @@ ...@@ -85,6 +117,14 @@
<string>reference</string> <string>reference</string>
<string>Reference</string> <string>Reference</string>
</tuple> </tuple>
<tuple>
<string>translated_validation_state_title</string>
<string>Validation State</string>
</tuple>
<tuple>
<string>translated_slap_state_title</string>
<string>Slap State</string>
</tuple>
</list> </list>
</value> </value>
</item> </item>
......
master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/hosting_subscription_workflow/states/archived.xml
View file @ 560385d5
...@@ -6,6 +6,10 @@ ...@@ -6,6 +6,10 @@
</pickle> </pickle>
<pickle> <pickle>
<dictionary> <dictionary>
<item>
<key> <string>description</string> </key>
<value> <string></string> </value>
</item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>archived</string> </value> <value> <string>archived</string> </value>
...@@ -16,6 +20,22 @@ ...@@ -16,6 +20,22 @@
<persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent> <persistent> <string encoding="base64">AAAAAAAAAAI=</string> </persistent>
</value> </value>
</item> </item>
<item>
<key> <string>title</string> </key>
<value> <string>Archived</string> </value>
</item>
<item>
<key> <string>transitions</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>type_list</string> </key>
<value>
<tuple/>
</value>
</item>
</dictionary> </dictionary>
</pickle> </pickle>
</record> </record>
......
master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/hosting_subscription_workflow/states/draft.xml
View file @ 560385d5
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string>Draft</string> </value>
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
......
master/bt5/vifib_open_trade/WorkflowTemplateItem/portal_workflow/hosting_subscription_workflow/states/validated.xml
View file @ 560385d5
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string></string> </value> <value> <string>Validated</string> </value>
</item> </item>
<item> <item>
<key> <string>transitions</string> </key> <key> <string>transitions</string> </key>
......
master/bt5/vifib_open_trade/bt/revision
View file @ 560385d5
178 180
\ No newline at end of file \ No newline at end of file
master/bt5/vifib_slap/PathTemplateItem/portal_alarms/garbage_collect_destroyed_root_tree.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Alarm" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>active_sense_method_id</string> </key>
<value> <string>Alarm_garbageCollectDestroyedRootTree</string> </value>
</item>
<item>
<key> <string>description</string> </key>
<value>
<none/>
</value>
</item>
<item>
<key> <string>enabled</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>garbage_collect_destroyed_root_tree</string> </value>
</item>
<item>
<key> <string>periodicity_hour</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>periodicity_hour_frequency</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>periodicity_minute</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>periodicity_month</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>periodicity_month_day</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>periodicity_start_date</string> </key>
<value>
<object>
<klass>
<global name="DateTime" module="DateTime.DateTime"/>
</klass>
<tuple>
<none/>
</tuple>
<state>
<tuple>
<float>1340727840.0</float>
<string>GMT</string>
</tuple>
</state>
</object>
</value>
</item>
<item>
<key> <string>periodicity_week</string> </key>
<value>
<tuple/>
</value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Alarm</string> </value>
</item>
<item>
<key> <string>title</string> </key>
<value> <string>Garbage Collect Destroyed Root Tree</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/PathTemplateItem/portal_alarms/vifib_cancel_destroy_partition.xml
View file @ 560385d5
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
master/bt5/vifib_slap/PathTemplateItem/portal_alarms/vifib_cancel_update_partition.xml
View file @ 560385d5
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
master/bt5/vifib_slap/PathTemplateItem/portal_alarms/vifib_check_consistency.xml
View file @ 560385d5
...@@ -252,9 +252,7 @@ ...@@ -252,9 +252,7 @@
</item> </item>
<item> <item>
<key> <string>solve_method_id</string> </key> <key> <string>solve_method_id</string> </key>
<value> <value> <string>Alarm_activateFixConsistency</string> </value>
<none/>
</value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
master/bt5/vifib_slap/PathTemplateItem/portal_alarms/vifib_clone_destroy_partition.xml
View file @ 560385d5
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>1</int> </value> <value> <int>0</int> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
master/bt5/vifib_slap/PathTemplateItem/portal_alarms/vifib_set_priority_one_message_table.xml
View file @ 560385d5
...@@ -18,7 +18,7 @@ ...@@ -18,7 +18,7 @@
</item> </item>
<item> <item>
<key> <string>enabled</string> </key> <key> <string>enabled</string> </key>
<value> <int>0</int> </value> <value> <int>1</int> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
master/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_vifib_facebook_application_id_property.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Facebook application id.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_vifib_facebook_application_id_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>preference</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'\'</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>Manage properties</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_vifib_facebook_application_secret_property.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Facebook application secret.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_vifib_facebook_application_secret_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>preference</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'\'</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>Manage properties</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_vifib_google_application_id_property.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Google application id.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_vifib_google_application_id_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>preference</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'\'</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>Manage properties</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_vifib_google_application_secret_property.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>Facebook application secret.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_vifib_google_application_secret_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>preference</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'\'</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>Manage properties</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/PropertySheetTemplateItem/portal_property_sheets/VifibSystemPreference/preferred_vifib_rest_api_login_check_property.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="Standard Property" module="erp5.portal_type"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>_local_properties</string> </key>
<value>
<tuple>
<dictionary>
<item>
<key> <string>id</string> </key>
<value> <string>mode</string> </value>
</item>
<item>
<key> <string>type</string> </key>
<value> <string>string</string> </value>
</item>
</dictionary>
</tuple>
</value>
</item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>elementary_type/string</string>
</tuple>
</value>
</item>
<item>
<key> <string>description</string> </key>
<value> <string>URL to Vifib REST API used to check external login user presence.</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>preferred_vifib_rest_api_login_check_property</string> </value>
</item>
<item>
<key> <string>mode</string> </key>
<value> <string>w</string> </value>
</item>
<item>
<key> <string>portal_type</string> </key>
<value> <string>Standard Property</string> </value>
</item>
<item>
<key> <string>preference</string> </key>
<value> <int>1</int> </value>
</item>
<item>
<key> <string>property_default</string> </key>
<value> <string>python: \'\'</string> </value>
</item>
<item>
<key> <string>write_permission</string> </key>
<value> <string>Manage properties</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_confirmOrderedSaleOrder.xml
View file @ 560385d5
...@@ -58,6 +58,7 @@ portal.portal_catalog.searchAndActivate(\n ...@@ -58,6 +58,7 @@ portal.portal_catalog.searchAndActivate(\n
default_resource_uid=portal.restrictedTraverse(setup_service).getUid(),\n default_resource_uid=portal.restrictedTraverse(setup_service).getUid(),\n
simulation_state="ordered",\n simulation_state="ordered",\n
method_id=\'SaleOrderLine_tryToAllocatePartition\',\n method_id=\'SaleOrderLine_tryToAllocatePartition\',\n
packet_size=1, # Separate calls to many transactions\n
activate_kw={\'tag\': tag}\n activate_kw={\'tag\': tag}\n
)\n )\n
\n \n
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_destroySeleniumTesterKvmInstance.xml
View file @ 560385d5
...@@ -65,6 +65,7 @@ setup_service = portal.restrictedTraverse(portal.portal_preferences.getPreferred ...@@ -65,6 +65,7 @@ setup_service = portal.restrictedTraverse(portal.portal_preferences.getPreferred
portal.portal_catalog.searchAndActivate(\n portal.portal_catalog.searchAndActivate(\n
portal_type="Hosting Subscription",\n portal_type="Hosting Subscription",\n
owner=person_reference,\n owner=person_reference,\n
validation_state="validated",\n
method_id=\'HostingSubcription_requestDestructionSeleniumTester\',\n method_id=\'HostingSubcription_requestDestructionSeleniumTester\',\n
method_kw={\'tag\': tag},\n method_kw={\'tag\': tag},\n
activate_kw={\'tag\': tag},\n activate_kw={\'tag\': tag},\n
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_garbageCollectDestroyedRootTree.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>portal = context.getPortalObject()\n
\n
portal.portal_catalog.searchAndActivate(\n
portal_type=["Slave Instance", "Software Instance"],\n
validation_state="validated",\n
specialise_validation_state="archived",\n
method_id=\'Instance_tryToGarbageCollect\',\n
activate_kw={\'tag\': tag}\n
)\n
\n
context.activate(after_tag=tag).getId()\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string>tag, fixit, params</string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Alarm_garbageCollectDestroyedRootTree</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Alarm_updatePersonOpenOrder.xml
View file @ 560385d5
...@@ -56,12 +56,12 @@ kw = {}\n ...@@ -56,12 +56,12 @@ kw = {}\n
search_kw = {}\n search_kw = {}\n
from DateTime import DateTime\n from DateTime import DateTime\n
from Products.ZSQLCatalog.SQLCatalog import Query\n from Products.ZSQLCatalog.SQLCatalog import Query\n
from Products.ERP5Type.DateUtils import getClosestDate, addToDate\n from Products.ERP5Type.DateUtils import addToDate\n
\n \n
last_active_process = context.getLastActiveProcess()\n last_active_process = context.getLastActiveProcess()\n
if last_active_process is not None and params.get(\'full\', False):\n if last_active_process is not None and not(params.get(\'full\', False)):\n
# fetch only objects modified since last alarm run\n # fetch only objects modified since last alarm run\n
kw[\'modification_date\'] = Query(modification_date=last_active_process.getStartDate(), range="min")\n kw[\'modification_date\'] = last_active_process.getStartDate()\n
search_kw[\'modification_date\'] = Query(modification_date=addToDate(last_active_process.getStartDate(), to_add={\'hour\': -1}), range="min")\n search_kw[\'modification_date\'] = Query(modification_date=addToDate(last_active_process.getStartDate(), to_add={\'hour\': -1}), range="min")\n
# register active process in order to have "windows" of last indexed objects\n # register active process in order to have "windows" of last indexed objects\n
context.newActiveProcess()\n context.newActiveProcess()\n
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Computer_updateFromDict.xml
View file @ 560385d5
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
\n \n
# Getting existing partitions\n # Getting existing partitions\n
existing_partition_dict = {}\n existing_partition_dict = {}\n
for c in context.contentValues():\n for c in context.contentValues(portal_type="Computer Partition"):\n
existing_partition_dict[c.getReference()] = c\n existing_partition_dict[c.getReference()] = c\n
\n \n
# update computer data\n # update computer data\n
...@@ -94,18 +94,31 @@ context.edit(\n ...@@ -94,18 +94,31 @@ context.edit(\n
)\n )\n
\n \n
compareAndUpdateAddressList(context, [{\'addr\': computer_dict[\'address\'], \'netmask\': computer_dict[\'netmask\']}])\n compareAndUpdateAddressList(context, [{\'addr\': computer_dict[\'address\'], \'netmask\': computer_dict[\'netmask\']}])\n
expected_partition_dict = {}\n
for send_partition in computer_dict[\'partition_list\']:\n for send_partition in computer_dict[\'partition_list\']:\n
partition = existing_partition_dict.get(send_partition[\'reference\'], None)\n partition = existing_partition_dict.get(send_partition[\'reference\'], None)\n
expected_partition_dict[send_partition[\'reference\']] = True\n
if partition is None:\n if partition is None:\n
partition = context.newContent(portal_type=\'Computer Partition\')\n partition = context.newContent(portal_type=\'Computer Partition\')\n
partition.validate()\n partition.validate()\n
partition.markFree()\n partition.markFree()\n
elif partition.getSlapState() == \'inactive\':\n elif partition.getSlapState() == \'inactive\':\n
# Reactivate partition\n # Reactivate partition\n
partition.markFree()\n partition.markFree(comment="Reactivated by slapformat")\n
\n
if partition.getValidationState() == "invalidated":\n
partition.validate(comment="Reactivated by slapformat")\n
partition.edit(reference=send_partition[\'reference\'])\n partition.edit(reference=send_partition[\'reference\'])\n
network_interface = send_partition[\'tap\'][\'name\']\n network_interface = send_partition[\'tap\'][\'name\']\n
compareAndUpdateAddressList(partition, send_partition[\'address_list\'], {\'network_interface\': network_interface})\n compareAndUpdateAddressList(partition, send_partition[\'address_list\'], {\'network_interface\': network_interface})\n
\n
# Desactivate all other partitions\n
for key, value in existing_partition_dict.items():\n
if key not in expected_partition_dict:\n
if value.getSlapState() == "free":\n
value.markInactive(comment="Desactivated by slapformat")\n
if value.getValidationState() == "validated":\n
value.invalidate(comment="Desactivated by slapformat")\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/ComuterPartition_getSoftwareInstanceStatus.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>software_instance = context.getAggregateRelatedValue(portal_type=\'Software Instance\')\n
if software_instance is not None:\n
return software_instance.SoftwareInstance_getStatus()\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>ComuterPartition_getSoftwareInstanceStatus</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/HostingSubcription_requestDestructionSeleniumTester.xml
View file @ 560385d5
...@@ -58,10 +58,21 @@ hosting_subscription = context\n ...@@ -58,10 +58,21 @@ hosting_subscription = context\n
\n \n
now = DateTime()\n now = DateTime()\n
\n \n
if hosting_subscription.getAggregateRelatedValue(portal_type=\'Sale Order Line\').getParentValue().getDestinationSectionValue().getReference() == \'seleniumtester\' and \\\n if hosting_subscription.getDestinationSectionValue().getReference() == \'seleniumtester\' and \\\n
hosting_subscription.getModificationDate() < (now - 1):\n hosting_subscription.getModificationDate() < (now - 1):\n
if hosting_subscription.SoftwareInstance_getStatus() not in [\'Destroyed\', \'Destruction in progress\']:\n \n
hosting_subscription.requestDestroy(comment=\'Requested by clenaup alarm\', activate_kw={\'tag\': tag})\n person = hosting_subscription.getDestinationSectionValue(portal_type="Person")\n
person.requestSoftwareInstance(\n
software_release=hosting_subscription.getRootSoftwareReleaseUrl(),\n
instance_xml=hosting_subscription.getTextContent(),\n
software_type=hosting_subscription.getSourceReference(),\n
sla_xml=hosting_subscription.getSlaXml(),\n
shared=hosting_subscription.getRootSlave(),\n
state="destroyed",\n
software_title=hosting_subscription.getTitle(),\n
comment=\'Requested by clenaup alarm\', \n
activate_kw={\'tag\': tag}\n
)\n
]]></string> </value> ]]></string> </value>
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Instance_tryToGarbageCollect.xml 0 → 100644
View file @ 560385d5
<?xml version="1.0"?>
<ZopeData>
<record id="1" aka="AAAAAAAAAAE=">
<pickle>
<global name="PythonScript" module="Products.PythonScripts.PythonScript"/>
</pickle>
<pickle>
<dictionary>
<item>
<key> <string>Script_magic</string> </key>
<value> <int>3</int> </value>
</item>
<item>
<key> <string>_bind_names</string> </key>
<value>
<object>
<klass>
<global name="NameAssignments" module="Shared.DC.Scripts.Bindings"/>
</klass>
<tuple/>
<state>
<dictionary>
<item>
<key> <string>_asgns</string> </key>
<value>
<dictionary>
<item>
<key> <string>name_container</string> </key>
<value> <string>container</string> </value>
</item>
<item>
<key> <string>name_context</string> </key>
<value> <string>context</string> </value>
</item>
<item>
<key> <string>name_m_self</string> </key>
<value> <string>script</string> </value>
</item>
<item>
<key> <string>name_subpath</string> </key>
<value> <string>traverse_subpath</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</state>
</object>
</value>
</item>
<item>
<key> <string>_body</string> </key>
<value> <string>instance = context\n
\n
if (instance.getSlapState() != "destroy_requested"):\n
hosting_subscription = instance.getSpecialiseValue(portal_type="Hosting Subscription")\n
if (hosting_subscription.getValidationState() == "archived"):\n
# Buildout didn\'t propagate the destruction request\n
requester = instance.getPredecessorRelatedValue()\n
if (instance.getRelativeUrl() in requester.getPredecessorList()) and \\\n
(requester.getSlapState() == "destroy_requested"):\n
# For security, only destroyed if parent is also destroyed\n
\n
if instance.getPortalType() == \'Software Instance\':\n
is_slave = False\n
elif instance.getPortalType() == \'Slave Instance\':\n
is_slave = True\n
else:\n
raise NotImplementedError, "Unknow portal type %s of %s" % \\\n
(instance.getPortalType(), instance.getRelativeUrl())\n
\n
requester.requestInstance(\n
software_release=instance.getRootSoftwareReleaseUrl(),\n
software_title=instance.getTitle(),\n
software_type=instance.getSourceReference(),\n
instance_xml=instance.getTextContent(),\n
sla_xml=instance.getSlaXml(),\n
shared=is_slave,\n
state="destroyed",\n
comment="Garbage collect %s" % instance.getRelativeUrl()\n
)\n
</string> </value>
</item>
<item>
<key> <string>_params</string> </key>
<value> <string></string> </value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>Instance_tryToGarbageCollect</string> </value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/Person_storeOpenOrderJournal.xml
View file @ 560385d5
...@@ -51,12 +51,12 @@ ...@@ -51,12 +51,12 @@
<item> <item>
<key> <string>_body</string> </key> <key> <string>_body</string> </key>
<value> <string>from Products.ZSQLCatalog.SQLCatalog import Query\n <value> <string>from Products.ZSQLCatalog.SQLCatalog import Query\n
from Products.ERP5Type.DateUtils import addToDate\n
portal = context.getPortalObject()\n portal = context.getPortalObject()\n
\n \n
kw = {}\n kw = {}\n
if modification_date is not None:\n if modification_date is not None:\n
kw[\'modification_date\'] = Query(modification_date=modification_date, range="min")\n kw[\'modification_date\'] = Query(modification_date=addToDate(modification_date, to_add={\'hour\': -1}), range="min")\n
\n
remove_hosting_list = []\n remove_hosting_list = []\n
add_kw_list = []\n add_kw_list = []\n
start_date_tuple_list = []\n start_date_tuple_list = []\n
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleInvoiceTransaction_confirmPlanned.xml
View file @ 560385d5
...@@ -53,8 +53,16 @@ ...@@ -53,8 +53,16 @@
<value> <string encoding="cdata"><![CDATA[ <value> <string encoding="cdata"><![CDATA[
isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPossible\n isTransitionPossible = context.getPortalObject().portal_workflow.isTransitionPossible\n
if context.getSimulationState() == \'planned\' and context.getStartDate() < this_month and isTransitionPossible(context, \'confirm\'):\n if context.getSimulationState() == \'planned\' and context.getStartDate() < this_month:\n
context.confirm()\n if len(context.getMovementList()) > 0:\n
if isTransitionPossible(context, \'confirm\'):\n
context.confirm(comment=\'Confirmed as ready to be accounted.\')\n
# as user will not have any invoice in planned state create new one, a bit later, in order to have current state reindexed\n
context.getDestinationValue().activate(after_path_and_method_id=(context.getPath(), (\'recursiveImmediateReindexObject\', \'immediateReindexObject\'))).fixConsistency()\n
else:\n
old_date = context.getStartDate()\n
context.setStartDate(this_month)\n
context.portal_workflow.doActionFor(context, \'edit_action\', comment=\'Moved date from %s to %s in order to move to new month.\' % (old_date, context.getStartDate()))\n
]]></string> </value> ]]></string> </value>
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SaleOrderLine_tryToAllocatePartition.xml
View file @ 560385d5
...@@ -100,9 +100,9 @@ if sale_order.getSimulationState() == \'ordered\':\n ...@@ -100,9 +100,9 @@ if sale_order.getSimulationState() == \'ordered\':\n
except ValueError:\n except ValueError:\n
# It was not possible to find free Computer Partition\n # It was not possible to find free Computer Partition\n
markHistory(sale_order, \'Not confirmed: no free Computer Partition\')\n markHistory(sale_order, \'Not confirmed: no free Computer Partition\')\n
except Unauthorized:\n except Unauthorized, e:\n
# user has bad balance\n # user has bad balance\n
markHistory(sale_order, \'Not confirmed: user has bad balance\')\n markHistory(sale_order, \'Not confirmed: %s\' % e)\n
else:\n else:\n
if computer_partition is not None:\n if computer_partition is not None:\n
try:\n try:\n
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SalePackingListLine_checkAndCloneCleanupPartition.xml
View file @ 560385d5
...@@ -94,6 +94,7 @@ if newer_newest_movement is not None:\n ...@@ -94,6 +94,7 @@ if newer_newest_movement is not None:\n
new_cleanup_delivery = cleanup_delivery.Base_createCloneDocument(batch_mode=1)\n new_cleanup_delivery = cleanup_delivery.Base_createCloneDocument(batch_mode=1)\n
new_cleanup_delivery.setStartDate(DateTime())\n new_cleanup_delivery.setStartDate(DateTime())\n
cleanup_delivery.cancel(comment=\'Cancelled as newer clone is created: %s\' % new_cleanup_delivery.getPath())\n cleanup_delivery.cancel(comment=\'Cancelled as newer clone is created: %s\' % new_cleanup_delivery.getPath())\n
new_cleanup_delivery.startBuilding()\n
new_cleanup_delivery.confirm(comment=\'Replaced too old cleanup delivery: %s\' % cleanup_delivery.getPath())\n new_cleanup_delivery.confirm(comment=\'Replaced too old cleanup delivery: %s\' % cleanup_delivery.getPath())\n
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SoftwareInstance_getDefaultImageAbsoluteUrl.xml
View file @ 560385d5
...@@ -54,7 +54,7 @@ ...@@ -54,7 +54,7 @@
delivery_line = context\n delivery_line = context\n
else:\n else:\n
delivery = context.getCausalityValue(portal_type=["Sale Order", "Sale Packing List"])\n delivery = context.getCausalityValue(portal_type=["Sale Order", "Sale Packing List"])\n
delivery_line = context.contentValues(portal_type=["Sale Order Line", "Sale Packing List Line"])[0]\n delivery_line = delivery.contentValues(portal_type=["Sale Order Line", "Sale Packing List Line"])[0]\n
\n \n
software_release = delivery_line.getAggregateValue(portal_type=\'Software Release\')\n software_release = delivery_line.getAggregateValue(portal_type=\'Software Release\')\n
if software_release is not None:\n if software_release is not None:\n
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SoftwareInstance_getStatus.xml
View file @ 560385d5
...@@ -53,6 +53,8 @@ ...@@ -53,6 +53,8 @@
<value> <string>"""Dirty script to return Software Instance state"""\n <value> <string>"""Dirty script to return Software Instance state"""\n
if context.getPortalType() == "Sale Order Line":\n if context.getPortalType() == "Sale Order Line":\n
return "Under Approval"\n return "Under Approval"\n
elif context.getPortalType() == "Hosting Subscription":\n
return context.getSlapStateTitle()\n
else:\n else:\n
state = context.getSlapState()\n state = context.getSlapState()\n
has_partition = context.getAggregate(portal_type="Computer Partition")\n has_partition = context.getAggregate(portal_type="Computer Partition")\n
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SoftwareInstance_requestDestruction.xml
View file @ 560385d5
...@@ -69,7 +69,7 @@ promise_kw = {\n ...@@ -69,7 +69,7 @@ promise_kw = {\n
}\n }\n
\n \n
if context.getPortalObject().portal_workflow.isTransitionPossible(context, \'request_destroy\'):\n if context.getPortalObject().portal_workflow.isTransitionPossible(context, \'request_destroy\'):\n
context.requestDestroy(**promise_kw)\n context.requestDestroy(comment="Garbage collected because Hosting Subscription is archived", **promise_kw)\n
</string> </value> </string> </value>
</item> </item>
<item> <item>
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SystemPreference_viewVifib.xml
View file @ 560385d5
...@@ -110,7 +110,13 @@ ...@@ -110,7 +110,13 @@
<item> <item>
<key> <string>right</string> </key> <key> <string>right</string> </key>
<value> <value>
<list/> <list>
<string>my_preferred_vifib_facebook_application_id</string>
<string>my_preferred_vifib_facebook_application_secret</string>
<string>my_preferred_vifib_rest_api_login_check</string>
<string>my_preferred_vifib_google_application_id</string>
<string>my_preferred_vifib_google_application_secret</string>
</list>
</value> </value>
</item> </item>
</dictionary> </dictionary>
......
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SystemPreference_viewVifib/my_preferred_vifib_facebook_application_id.xml 0 → 100644
View file @ 560385d5
<?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>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_preferred_vifib_facebook_application_id</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>target</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_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </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>Preferred Facebook Application Id</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SystemPreference_viewVifib/my_preferred_vifib_facebook_application_secret.xml 0 → 100644
View file @ 560385d5
<?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>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_preferred_vifib_facebook_application_secret</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>target</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_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </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>Preferred Facebook Application Secret</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/SkinTemplateItem/portal_skins/vifib_slap/SystemPreference_viewVifib/my_preferred_vifib_google_application_id.xml 0 → 100644
View file @ 560385d5
<?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>title</string>
</list>
</value>
</item>
<item>
<key> <string>id</string> </key>
<value> <string>my_preferred_vifib_google_application_id</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>target</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_string_field</string> </value>
</item>
<item>
<key> <string>form_id</string> </key>
<value> <string>Base_viewFieldLibrary</string> </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>Preferred Google Application Id</string> </value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/vifib_slap/bt/revision
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slap/bt/template_path_list
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_core/bt/revision
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api/bt/dependency_list 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api/bt/description 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api/bt/template_action_path_list 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api/bt/template_skin_id_list 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api/bt/template_tool_id_list 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api/bt/template_update_tool 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api/bt/title 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api_tool_portal_type/bt/license 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api_tool_portal_type/bt/revision 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api_tool_portal_type/bt/title 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_slapos_rest_api_tool_portal_type/bt/version 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_upgrader/bt/revision
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_upgrader/bt/template_path_list 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_web/bt/revision
View file @ 560385d5
This diff is collapsed.
master/bt5/vifib_web_ui_test/bt/revision
View file @ 560385d5
This diff is collapsed.
master/product/Vifib/Tool/SlapTool.py
View file @ 560385d5
This diff is collapsed.
master/product/Vifib/Tool/VifibRestApiTool.py 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/product/Vifib/VifibCookieHashExtractionPlugin.py 0 → 100644
View file @ 560385d5
This diff is collapsed.
master/product/Vifib/__init__.py
View file @ 560385d5
This diff is collapsed.
master/product/Vifib/tests/VifibMixin.py
View file @ 560385d5
This diff is collapsed.
master/tests/__init__.py
View file @ 560385d5
This diff is collapsed.
setup.py
View file @ 560385d5
This diff is collapsed.
slapos-client.cfg.example
View file @ 560385d5
This diff is collapsed.
slapos.cfg.example
View file @ 560385d5
This diff is collapsed.
slapos/bang.py
View file @ 560385d5
This diff is collapsed.
slapos/console.py
View file @ 560385d5
This diff is collapsed.
slapos/entry.py 0 → 100644
View file @ 560385d5
This diff is collapsed.
slapos/format.py
View file @ 560385d5
This diff is collapsed.
slapos/grid/SlapObject.py
View file @ 560385d5
This diff is collapsed.
slapos/grid/__init__.py
View file @ 560385d5
This diff is collapsed.
slapos/grid/exception.py
View file @ 560385d5
This diff is collapsed.
slapos/grid/networkcache.py
View file @ 560385d5
This diff is collapsed.
slapos/grid/slapgrid.py
View file @ 560385d5
This diff is collapsed.
slapos/grid/svcbackend.py
View file @ 560385d5
This diff is collapsed.
slapos/grid/utils.py
View file @ 560385d5
This diff is collapsed.
slapos/proxy/__init__.py
View file @ 560385d5
This diff is collapsed.
slapos/proxy/views.py
View file @ 560385d5
This diff is collapsed.
slapos/register/__init__.py 0 → 100644
View file @ 560385d5
This diff is collapsed.
slapos/register/register.py 0 → 100644
View file @ 560385d5
This diff is collapsed.
slapos/register/templates/slapos.cfg.in 0 → 100644
View file @ 560385d5
This diff is collapsed.
slapos/slap/__init__.py
View file @ 560385d5
This diff is collapsed.
slapos/slap/interface/__init__.py
View file @ 560385d5
This diff is collapsed.
slapos/slap/interface/slap.py
View file @ 560385d5
This diff is collapsed.
slapos/slap/slap.py
View file @ 560385d5
This diff is collapsed.
slapos/slap/tests/__init__.py
View file @ 560385d5
This diff is collapsed.
slapos/tests/slap.py
View file @ 560385d5
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7