Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
slapos.core
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Carlos Ramos Carreño
slapos.core
Commits
8c536a73
Commit
8c536a73
authored
Jul 10, 2019
by
Rafael Monnerat
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
slapos_jio: Allow Computer, service and Network be transferred between Organisations
parent
f925ed8d
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
423 additions
and
30 deletions
+423
-30
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_network_view_js.js
...ule/rjs_gadget_erp5_page_slap_computer_network_view_js.js
+12
-1
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_network_view_js.xml
...le/rjs_gadget_erp5_page_slap_computer_network_view_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.js
...rjs_gadget_erp5_page_slap_hosting_subscription_view_js.js
+12
-1
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.xml
...js_gadget_erp5_page_slap_hosting_subscription_view_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_computer_js.js
..._module/rjs_gadget_erp5_page_slap_transfer_computer_js.js
+41
-3
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_computer_js.xml
...module/rjs_gadget_erp5_page_slap_transfer_computer_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_computer_network_js.js
...rjs_gadget_erp5_page_slap_transfer_computer_network_js.js
+44
-5
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_computer_network_js.xml
...js_gadget_erp5_page_slap_transfer_computer_network_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_hosting_subscription_js.js
...gadget_erp5_page_slap_transfer_hosting_subscription_js.js
+28
-4
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_hosting_subscription_js.xml
...adget_erp5_page_slap_transfer_hosting_subscription_js.xml
+2
-2
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_appcache.xml
...mplateItem/web_page_module/rjs_gadget_slapos_appcache.xml
+6
-6
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/ComputerNetwork_viewAsHateoas.xml
...s/slapos_hal_json_style/ComputerNetwork_viewAsHateoas.xml
+1
-0
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/ComputerNetwork_viewAsHateoas/my_source_section_title.xml
...ComputerNetwork_viewAsHateoas/my_source_section_title.xml
+134
-0
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/HostingSubscription_viewAsHateoas.xml
...apos_hal_json_style/HostingSubscription_viewAsHateoas.xml
+1
-0
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/HostingSubscription_viewAsHateoas/my_source_title.xml
...yle/HostingSubscription_viewAsHateoas/my_source_title.xml
+134
-0
No files found.
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_network_view_js.js
View file @
8c536a73
...
@@ -140,6 +140,17 @@
...
@@ -140,6 +140,17 @@
"
title
"
:
"
Current Project
"
,
"
title
"
:
"
Current Project
"
,
"
default
"
:
gadget
.
state
.
doc
.
source_project_title
,
"
default
"
:
gadget
.
state
.
doc
.
source_project_title
,
"
css_class
"
:
""
,
"
css_class
"
:
""
,
"
required
"
:
0
,
"
editable
"
:
0
,
"
key
"
:
""
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
},
"
my_source_section
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Current Organisation
"
,
"
default
"
:
gadget
.
state
.
doc
.
source_section_title
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
required
"
:
1
,
"
editable
"
:
0
,
"
editable
"
:
0
,
"
key
"
:
""
,
"
key
"
:
""
,
...
@@ -180,7 +191,7 @@
...
@@ -180,7 +191,7 @@
[[
"
my_title
"
],
[
"
my_reference
"
]]
[[
"
my_title
"
],
[
"
my_reference
"
]]
],
[
],
[
"
right
"
,
"
right
"
,
[[
'
my_monitoring_status
'
],
[
"
my_source_project
"
]]
[[
'
my_monitoring_status
'
],
[
"
my_source_project
"
]
,
[
"
my_source_section
"
]
]
],
[
],
[
"
bottom
"
,
"
bottom
"
,
[[
"
listbox
"
]]
[[
"
listbox
"
]]
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_computer_network_view_js.xml
View file @
8c536a73
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.
54433.31362.16861
</string>
</value>
<value>
<string>
976.
63062.57955.57890
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1562
167951.36
</float>
<float>
1562
685619.84
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.js
View file @
8c536a73
...
@@ -280,6 +280,17 @@
...
@@ -280,6 +280,17 @@
"
hidden
"
:
0
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
"
type
"
:
"
StringField
"
},
},
"
my_source
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Current Organisation
"
,
"
default
"
:
gadget
.
state
.
doc
.
source_title
,
"
css_class
"
:
""
,
"
required
"
:
0
,
"
editable
"
:
0
,
"
key
"
:
"
source_title
"
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
},
"
my_monitoring_status
"
:
{
"
my_monitoring_status
"
:
{
"
description
"
:
""
,
"
description
"
:
""
,
"
title
"
:
"
Monitoring Status
"
,
"
title
"
:
"
Monitoring Status
"
,
...
@@ -400,7 +411,7 @@
...
@@ -400,7 +411,7 @@
[[
"
my_title
"
],
[
"
my_reference
"
],
[
"
my_short_title
"
],
[
"
my_description
"
]]
[[
"
my_title
"
],
[
"
my_reference
"
],
[
"
my_short_title
"
],
[
"
my_description
"
]]
],
[
],
[
"
right
"
,
"
right
"
,
[[
"
my_slap_state_title
"
],
[
'
my_monitoring_status
'
],
[
'
my_monitor_scope
'
],
[
'
my_upgrade_scope
'
],
[
'
my_source_project
'
]]
[[
"
my_slap_state_title
"
],
[
'
my_monitoring_status
'
],
[
'
my_monitor_scope
'
],
[
'
my_upgrade_scope
'
],
[
'
my_source_project
'
]
,
[
'
my_source
'
]
]
],
[
"
center
"
,
],
[
"
center
"
,
[[
"
my_source_reference
"
],
[
"
my_url_string
"
]]
[[
"
my_source_reference
"
],
[
"
my_url_string
"
]]
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_hosting_subscription_view_js.xml
View file @
8c536a73
...
@@ -230,7 +230,7 @@
...
@@ -230,7 +230,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.535
53.17660.802
</string>
</value>
<value>
<string>
976.535
61.48622.46421
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1562
115464.51
</float>
<float>
1562
697582.58
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_computer_js.js
View file @
8c536a73
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
gadget
.
getDeclaredGadget
(
'
form_view
'
),
gadget
.
getDeclaredGadget
(
'
form_view
'
),
gadget
.
jio_get
(
options
.
jio_key
),
gadget
.
jio_get
(
options
.
jio_key
),
gadget
.
jio_allDocs
({
gadget
.
jio_allDocs
({
query
:
'
portal_type:"Organisation" AND relative_url:(
'
+
destination_list
+
'
)
'
,
query
:
'
portal_type:"Organisation" AND r
ole_title: "Host" AND r
elative_url:(
'
+
destination_list
+
'
)
'
,
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
select_list
:
[
'
reference
'
,
'
title
'
]
select_list
:
[
'
reference
'
,
'
title
'
]
}),
}),
...
@@ -84,6 +84,11 @@
...
@@ -84,6 +84,11 @@
query
:
'
portal_type:"Project" AND validation_state:"validated" AND relative_url:(
'
+
destination_project_list
+
'
)
'
,
query
:
'
portal_type:"Project" AND validation_state:"validated" AND relative_url:(
'
+
destination_project_list
+
'
)
'
,
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
select_list
:
[
'
reference
'
,
'
title
'
]
select_list
:
[
'
reference
'
,
'
title
'
]
}),
gadget
.
jio_allDocs
({
query
:
'
portal_type:"Organisation" AND role_title: "Client" AND relative_url:(
'
+
destination_list
+
'
)
'
,
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
select_list
:
[
'
reference
'
,
'
title
'
]
})
})
]);
]);
})
})
...
@@ -91,8 +96,10 @@
...
@@ -91,8 +96,10 @@
var
doc
=
result
[
1
],
var
doc
=
result
[
1
],
site_list
=
[[
""
,
""
]],
site_list
=
[[
""
,
""
]],
project_list
=
[[
""
,
""
]],
project_list
=
[[
""
,
""
]],
organisation_list
=
[[
""
,
""
]],
i
,
value
,
project_len
=
result
[
3
].
data
.
total_rows
,
i
,
value
,
project_len
=
result
[
3
].
data
.
total_rows
,
site_len
=
result
[
2
].
data
.
total_rows
;
site_len
=
result
[
2
].
data
.
total_rows
,
organisation_len
=
result
[
4
].
data
.
total_rows
;
for
(
i
=
0
;
i
<
site_len
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
site_len
;
i
+=
1
)
{
site_list
.
push
([
site_list
.
push
([
...
@@ -108,6 +115,13 @@
...
@@ -108,6 +115,13 @@
]);
]);
}
}
for
(
i
=
0
;
i
<
organisation_len
;
i
+=
1
)
{
organisation_list
.
push
([
result
[
4
].
data
.
rows
[
i
].
value
.
title
?
result
[
4
].
data
.
rows
[
i
].
value
.
title
:
result
[
4
].
data
.
rows
[
i
].
value
.
reference
,
result
[
4
].
data
.
rows
[
i
].
id
]);
}
return
result
[
0
].
render
({
return
result
[
0
].
render
({
erp5_document
:
{
erp5_document
:
{
"
_embedded
"
:
{
"
_view
"
:
{
"
_embedded
"
:
{
"
_view
"
:
{
...
@@ -179,6 +193,29 @@
...
@@ -179,6 +193,29 @@
"
hidden
"
:
0
,
"
hidden
"
:
0
,
"
type
"
:
"
ListField
"
"
type
"
:
"
ListField
"
},
},
"
my_source_section
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Current Organisation
"
,
"
default
"
:
doc
.
source_section_title
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
editable
"
:
0
,
"
key
"
:
"
source_section_title
"
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
},
"
my_destination_section
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Future Organisation
"
,
"
default
"
:
""
,
"
items
"
:
organisation_list
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
editable
"
:
1
,
"
key
"
:
"
destination_section
"
,
"
hidden
"
:
0
,
"
type
"
:
"
ListField
"
},
"
my_relative_url
"
:
{
"
my_relative_url
"
:
{
"
description
"
:
""
,
"
description
"
:
""
,
"
title
"
:
"
Parent Relative Url
"
,
"
title
"
:
"
Parent Relative Url
"
,
...
@@ -201,7 +238,8 @@
...
@@ -201,7 +238,8 @@
form_definition
:
{
form_definition
:
{
group_list
:
[[
group_list
:
[[
"
left
"
,
"
left
"
,
[[
"
my_title
"
],
[
"
my_reference
"
],
[
"
my_source
"
],
[
"
my_source_project
"
],
[
"
my_destination
"
],
[
"
my_destination_project
"
],
[
"
my_relative_url
"
]]
[[
"
my_title
"
],
[
"
my_reference
"
],
[
"
my_source_section
"
],
[
"
my_source
"
],
[
"
my_source_project
"
],
[
"
my_destination
"
],
[
"
my_destination_project
"
],
[
"
my_destination_section
"
],
[
"
my_relative_url
"
]]
]]
]]
}
}
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_computer_js.xml
View file @
8c536a73
...
@@ -273,7 +273,7 @@
...
@@ -273,7 +273,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
2.32024.53732.34406
</string>
</value>
<value>
<string>
97
6.63583.16434.8499
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -291,7 +291,7 @@
...
@@ -291,7 +291,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1562
639281.01
</float>
<float>
1562
716830.3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_computer_network_js.js
View file @
8c536a73
...
@@ -66,10 +66,13 @@
...
@@ -66,10 +66,13 @@
return
gadget
.
jio_get
(
setting
);
return
gadget
.
jio_get
(
setting
);
})
})
.
push
(
function
(
me
)
{
.
push
(
function
(
me
)
{
var
i
,
destination_project_list
=
'
"NULL",
'
;
var
i
,
destination_
list
=
'
"NULL",
'
,
destination_
project_list
=
'
"NULL",
'
;
for
(
i
in
me
.
assignment_destination_project_list
)
{
for
(
i
in
me
.
assignment_destination_project_list
)
{
destination_project_list
+=
'
"
'
+
me
.
assignment_destination_project_list
[
i
]
+
'
",
'
;
destination_project_list
+=
'
"
'
+
me
.
assignment_destination_project_list
[
i
]
+
'
",
'
;
}
}
for
(
i
in
me
.
assignment_destination_list
)
{
destination_list
+=
'
"
'
+
me
.
assignment_destination_list
[
i
]
+
'
",
'
;
}
return
RSVP
.
all
([
return
RSVP
.
all
([
gadget
.
getDeclaredGadget
(
'
form_view
'
),
gadget
.
getDeclaredGadget
(
'
form_view
'
),
gadget
.
jio_get
(
options
.
jio_key
),
gadget
.
jio_get
(
options
.
jio_key
),
...
@@ -77,14 +80,20 @@
...
@@ -77,14 +80,20 @@
query
:
'
portal_type:"Project" AND validation_state:"validated" AND relative_url:(
'
+
destination_project_list
+
'
)
'
,
query
:
'
portal_type:"Project" AND validation_state:"validated" AND relative_url:(
'
+
destination_project_list
+
'
)
'
,
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
select_list
:
[
'
reference
'
,
'
title
'
]
select_list
:
[
'
reference
'
,
'
title
'
]
})
}),
gadget
.
jio_allDocs
({
query
:
'
portal_type:"Organisation" AND role_title: "Client" AND relative_url:(
'
+
destination_list
+
'
)
'
,
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
select_list
:
[
'
reference
'
,
'
title
'
]
})
]);
]);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
var
doc
=
result
[
1
],
var
doc
=
result
[
1
],
site
_list
=
[[
""
,
""
]],
organisation
_list
=
[[
""
,
""
]],
project_list
=
[[
""
,
""
]],
project_list
=
[[
""
,
""
]],
i
,
value
,
project_len
=
result
[
2
].
data
.
total_rows
;
i
,
value
,
project_len
=
result
[
2
].
data
.
total_rows
,
organisation_len
=
result
[
3
].
data
.
total_rows
;
for
(
i
=
0
;
i
<
project_len
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
project_len
;
i
+=
1
)
{
project_list
.
push
([
project_list
.
push
([
...
@@ -93,6 +102,13 @@
...
@@ -93,6 +102,13 @@
]);
]);
}
}
for
(
i
=
0
;
i
<
organisation_len
;
i
+=
1
)
{
organisation_list
.
push
([
result
[
3
].
data
.
rows
[
i
].
value
.
title
?
result
[
3
].
data
.
rows
[
i
].
value
.
title
:
result
[
3
].
data
.
rows
[
i
].
value
.
reference
,
result
[
3
].
data
.
rows
[
i
].
id
]);
}
return
result
[
0
].
render
({
return
result
[
0
].
render
({
erp5_document
:
{
erp5_document
:
{
"
_embedded
"
:
{
"
_view
"
:
{
"
_embedded
"
:
{
"
_view
"
:
{
...
@@ -141,6 +157,29 @@
...
@@ -141,6 +157,29 @@
"
hidden
"
:
0
,
"
hidden
"
:
0
,
"
type
"
:
"
ListField
"
"
type
"
:
"
ListField
"
},
},
"
my_source_section
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Current Organisation
"
,
"
default
"
:
doc
.
source_section_title
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
editable
"
:
0
,
"
key
"
:
"
source_section_title
"
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
},
"
my_destination_section
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Future Organisation
"
,
"
default
"
:
""
,
"
items
"
:
organisation_list
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
editable
"
:
1
,
"
key
"
:
"
destination_section
"
,
"
hidden
"
:
0
,
"
type
"
:
"
ListField
"
},
"
my_relative_url
"
:
{
"
my_relative_url
"
:
{
"
description
"
:
""
,
"
description
"
:
""
,
"
title
"
:
"
Parent Relative Url
"
,
"
title
"
:
"
Parent Relative Url
"
,
...
@@ -163,7 +202,7 @@
...
@@ -163,7 +202,7 @@
form_definition
:
{
form_definition
:
{
group_list
:
[[
group_list
:
[[
"
left
"
,
"
left
"
,
[[
"
my_title
"
],
[
"
my_reference
"
],
[
"
my_source_project
"
],
[
"
my_
destination_project
"
],
[
"
my_relative_url
"
]]
[[
"
my_title
"
],
[
"
my_reference
"
],
[
"
my_source_project
"
],
[
"
my_
source_section
"
],
[
"
my_destination_project
"
],
[
"
my_destination_section
"
],
[
"
my_relative_url
"
]]
]]
]]
}
}
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_computer_network_js.xml
View file @
8c536a73
...
@@ -271,7 +271,7 @@
...
@@ -271,7 +271,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.6
2093.51594.26214
</string>
</value>
<value>
<string>
976.6
3058.9497.29047
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -289,7 +289,7 @@
...
@@ -289,7 +289,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15626
29628.15
</float>
<float>
15626
85363.87
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_hosting_subscription_js.js
View file @
8c536a73
...
@@ -76,7 +76,7 @@
...
@@ -76,7 +76,7 @@
gadget
.
getDeclaredGadget
(
'
form_view
'
),
gadget
.
getDeclaredGadget
(
'
form_view
'
),
gadget
.
jio_get
(
options
.
jio_key
),
gadget
.
jio_get
(
options
.
jio_key
),
gadget
.
jio_allDocs
({
gadget
.
jio_allDocs
({
query
:
'
portal_type:"Organisation" AND relative_url:(
'
+
destination_list
+
'
)
'
,
query
:
'
portal_type:"Organisation" AND r
ole_title: "Client" AND r
elative_url:(
'
+
destination_list
+
'
)
'
,
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
sort_on
:
[[
'
reference
'
,
'
ascending
'
]],
select_list
:
[
'
reference
'
,
'
title
'
]
select_list
:
[
'
reference
'
,
'
title
'
]
}),
}),
...
@@ -89,7 +89,7 @@
...
@@ -89,7 +89,7 @@
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
var
doc
=
result
[
1
],
var
doc
=
result
[
1
],
site
_list
=
[[
""
,
""
]],
organisation
_list
=
[[
""
,
""
]],
project_list
=
[[
""
,
""
]],
project_list
=
[[
""
,
""
]],
i
,
i
,
value
,
value
,
...
@@ -97,7 +97,7 @@
...
@@ -97,7 +97,7 @@
site_len
=
result
[
2
].
data
.
total_rows
;
site_len
=
result
[
2
].
data
.
total_rows
;
for
(
i
=
0
;
i
<
site_len
;
i
+=
1
)
{
for
(
i
=
0
;
i
<
site_len
;
i
+=
1
)
{
site
_list
.
push
([
organisation
_list
.
push
([
result
[
2
].
data
.
rows
[
i
].
value
.
title
?
result
[
2
].
data
.
rows
[
i
].
value
.
title
:
result
[
2
].
data
.
rows
[
i
].
value
.
reference
,
result
[
2
].
data
.
rows
[
i
].
value
.
title
?
result
[
2
].
data
.
rows
[
i
].
value
.
title
:
result
[
2
].
data
.
rows
[
i
].
value
.
reference
,
result
[
2
].
data
.
rows
[
i
].
id
result
[
2
].
data
.
rows
[
i
].
id
]);
]);
...
@@ -146,6 +146,29 @@
...
@@ -146,6 +146,29 @@
"
hidden
"
:
0
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
"
type
"
:
"
StringField
"
},
},
"
my_destination
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Future Organisation
"
,
"
default
"
:
""
,
"
items
"
:
organisation_list
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
editable
"
:
1
,
"
key
"
:
"
destination
"
,
"
hidden
"
:
0
,
"
type
"
:
"
ListField
"
},
"
my_source
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Current Organisation
"
,
"
default
"
:
doc
.
source_title
,
"
css_class
"
:
""
,
"
required
"
:
1
,
"
editable
"
:
0
,
"
key
"
:
"
source_title
"
,
"
hidden
"
:
0
,
"
type
"
:
"
StringField
"
},
"
my_destination_project
"
:
{
"
my_destination_project
"
:
{
"
description
"
:
"
The name of a document in ERP5
"
,
"
description
"
:
"
The name of a document in ERP5
"
,
"
title
"
:
"
Future Project
"
,
"
title
"
:
"
Future Project
"
,
...
@@ -180,7 +203,8 @@
...
@@ -180,7 +203,8 @@
form_definition
:
{
form_definition
:
{
group_list
:
[[
group_list
:
[[
"
left
"
,
"
left
"
,
[[
"
my_title
"
],
[
"
my_reference
"
],
[
"
my_source_project
"
],
[
"
my_destination_project
"
],
[
"
my_relative_url
"
]]
[[
"
my_title
"
],
[
"
my_reference
"
],
[
"
my_source_project
"
],
[
"
my_source
"
],
[
"
my_destination_project
"
],
[
"
my_destination
"
],
[
"
my_relative_url
"
]]
]]
]]
}
}
});
});
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_erp5_page_slap_transfer_hosting_subscription_js.xml
View file @
8c536a73
...
@@ -271,7 +271,7 @@
...
@@ -271,7 +271,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.
53587.16960.43827
</string>
</value>
<value>
<string>
976.
63257.63038.55210
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -289,7 +289,7 @@
...
@@ -289,7 +289,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15626
40396.08
</float>
<float>
15626
97293.25
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/PathTemplateItem/web_page_module/rjs_gadget_slapos_appcache.xml
View file @
8c536a73
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<value>
<string
encoding=
"cdata"
>
<![CDATA[
<value>
<string
encoding=
"cdata"
>
<![CDATA[
CACHE MANIFEST\n
CACHE MANIFEST\n
# generated on Fri, 9 JuL 2019 10:00:0
0
GMT+0200\n
# generated on Fri, 9 JuL 2019 10:00:0
7
GMT+0200\n
CACHE:\n
CACHE:\n
favicon.ico\n
favicon.ico\n
font-awesome/font-awesome-webfont.eot?v=4.6.3\n
font-awesome/font-awesome-webfont.eot?v=4.6.3\n
...
@@ -371,11 +371,11 @@ gadget_erp5_page_slap_ticket_list.html\n
...
@@ -371,11 +371,11 @@ gadget_erp5_page_slap_ticket_list.html\n
gadget_erp5_page_slap_ticket_list.js\n
gadget_erp5_page_slap_ticket_list.js\n
gadget_erp5_page_slap_ticket_view.js\n
gadget_erp5_page_slap_ticket_view.js\n
gadget_erp5_page_slap_transfer_computer.html\n
gadget_erp5_page_slap_transfer_computer.html\n
gadget_erp5_page_slap_transfer_computer.js\n
#
gadget_erp5_page_slap_transfer_computer.js\n
gadget_erp5_page_slap_transfer_hosting_subscription.html\n
gadget_erp5_page_slap_transfer_hosting_subscription.html\n
gadget_erp5_page_slap_transfer_hosting_subscription.js\n
#
gadget_erp5_page_slap_transfer_hosting_subscription.js\n
gadget_erp5_page_slap_transfer_computer_network.html\n
gadget_erp5_page_slap_transfer_computer_network.html\n
gadget_erp5_page_slap_transfer_computer_network.js\n
#
gadget_erp5_page_slap_transfer_computer_network.js\n
gadget_erp5_page_slap_trial_request_message.html\n
gadget_erp5_page_slap_trial_request_message.html\n
gadget_erp5_page_slap_trial_request_message.js\n
gadget_erp5_page_slap_trial_request_message.js\n
gadget_erp5_page_slap_upgrade_decision_view.html\n
gadget_erp5_page_slap_upgrade_decision_view.html\n
...
@@ -579,7 +579,7 @@ NETWORK:\n
...
@@ -579,7 +579,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
976.6
2292.13005.43588
</string>
</value>
<value>
<string>
976.6
3583.28202.43076
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -597,7 +597,7 @@ NETWORK:\n
...
@@ -597,7 +597,7 @@ NETWORK:\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1562
640407.16
</float>
<float>
1562
716840.37
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/ComputerNetwork_viewAsHateoas.xml
View file @
8c536a73
...
@@ -97,6 +97,7 @@
...
@@ -97,6 +97,7 @@
<string>
my_reference
</string>
<string>
my_reference
</string>
<string>
my_news
</string>
<string>
my_news
</string>
<string>
my_source_project_title
</string>
<string>
my_source_project_title
</string>
<string>
my_source_section_title
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/ComputerNetwork_viewAsHateoas/my_source_section_title.xml
0 → 100644
View file @
8c536a73
<?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>
default
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_source_section_title
</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>
default
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string></string>
</value>
</item>
<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>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Current Organisation
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: here.Item_getCurrentOwnerValue().title
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/HostingSubscription_viewAsHateoas.xml
View file @
8c536a73
...
@@ -108,6 +108,7 @@
...
@@ -108,6 +108,7 @@
<string>
my_connection_parameter_list
</string>
<string>
my_connection_parameter_list
</string>
<string>
my_upgrade_scope
</string>
<string>
my_upgrade_scope
</string>
<string>
my_source_project_title
</string>
<string>
my_source_project_title
</string>
<string>
my_source_title
</string>
</list>
</list>
</value>
</value>
</item>
</item>
...
...
master/bt5/slapos_jio/SkinTemplateItem/portal_skins/slapos_hal_json_style/HostingSubscription_viewAsHateoas/my_source_title.xml
0 → 100644
View file @
8c536a73
<?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>
default
</string>
<string>
title
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
my_source_title
</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>
default
</string>
</key>
<value>
<persistent>
<string
encoding=
"base64"
>
AAAAAAAAAAI=
</string>
</persistent>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
items
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
default
</string>
</key>
<value>
<string></string>
</value>
</item>
<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>
items
</string>
</key>
<value>
<list/>
</value>
</item>
<item>
<key>
<string>
target
</string>
</key>
<value>
<string>
Click to edit the target
</string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string>
Current Organisation
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
<record
id=
"2"
aka=
"AAAAAAAAAAI="
>
<pickle>
<global
name=
"TALESMethod"
module=
"Products.Formulator.TALESField"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
_text
</string>
</key>
<value>
<string>
python: here.Item_getCurrentSiteValue().title
</string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment