Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
erp5
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
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Cédric Le Ninivin
erp5
Commits
a99c7db3
Commit
a99c7db3
authored
Apr 04, 2017
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs_appstore_base: Various improvment for ERP5JS compatibility
parent
a7588514
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
121 additions
and
29 deletions
+121
-29
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/ERP5Site_createNewSoftwarePublication.py
...js_appstore_base/ERP5Site_createNewSoftwarePublication.py
+4
-1
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublicationModule_view.xml
...officejs_appstore_base/SoftwarePublicationModule_view.xml
+3
-1
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublicationModule_view/listbox.xml
..._appstore_base/SoftwarePublicationModule_view/listbox.xml
+5
-14
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublicationModule_view/listbox_modification_date.xml
...twarePublicationModule_view/listbox_modification_date.xml
+89
-0
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_attachSoftwareProduct.xml
...pstore_base/SoftwarePublication_attachSoftwareProduct.xml
+1
-1
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_getTestUrl.py
..._officejs_appstore_base/SoftwarePublication_getTestUrl.py
+15
-0
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_getTestUrl.xml
...officejs_appstore_base/SoftwarePublication_getTestUrl.xml
+2
-2
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_jumpToRelatedWebSection.py
...store_base/SoftwarePublication_jumpToRelatedWebSection.py
+0
-9
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_submitSoftwarePublication.py
...ore_base/SoftwarePublication_submitSoftwarePublication.py
+2
-1
No files found.
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/ERP5Site_createNewSoftwarePublication.py
View file @
a99c7db3
...
...
@@ -49,5 +49,8 @@ if software_product:
return
software_publication
.
SoftwarePublication_attachSoftwareProduct
(
relative_url
=
software_product
)
return
software_publication
.
Base_redirect
(
'SoftwarePublication_attachSoftwareProductDialog'
,
''
,
keep_items
=
{
"portal_status_message"
:
portal
.
Base_translateString
(
"Please create a software Product using the action"
)
}
)
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublicationModule_view.xml
View file @
a99c7db3
...
...
@@ -91,7 +91,9 @@
<item>
<key>
<string>
left
</string>
</key>
<value>
<list/>
<list>
<string>
listbox_modification_date
</string>
</list>
</value>
</item>
<item>
...
...
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublicationModule_view/listbox.xml
View file @
a99c7db3
...
...
@@ -195,14 +195,6 @@
<string>
resource_title
</string>
<string>
Type
</string>
</tuple>
<tuple>
<string>
destination_section_title
</string>
<string>
Client
</string>
</tuple>
<tuple>
<string>
destination_decision_title
</string>
<string>
Requester
</string>
</tuple>
<tuple>
<string>
source_section_title
</string>
<string>
Supplier
</string>
...
...
@@ -223,6 +215,10 @@
<string>
translated_simulation_state_title
</string>
<string>
State
</string>
</tuple>
<tuple>
<string>
modification_date
</string>
<string>
Modification Date
</string>
</tuple>
</list>
</value>
</item>
...
...
@@ -362,12 +358,7 @@
<item>
<key>
<string>
sort
</string>
</key>
<value>
<list>
<tuple>
<string>
modification_date
</string>
<string>
descending
</string>
</tuple>
</list>
<list/>
</value>
</item>
<item>
...
...
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublicationModule_view/listbox_modification_date.xml
0 → 100644
View file @
a99c7db3
<?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>
date_only
</string>
<string>
editable
</string>
</list>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
listbox_modification_date
</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>
</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>
</dictionary>
</value>
</item>
<item>
<key>
<string>
values
</string>
</key>
<value>
<dictionary>
<item>
<key>
<string>
date_only
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
editable
</string>
</key>
<value>
<int>
0
</int>
</value>
</item>
<item>
<key>
<string>
field_id
</string>
</key>
<value>
<string>
my_date
</string>
</value>
</item>
<item>
<key>
<string>
form_id
</string>
</key>
<value>
<string>
Base_viewFieldLibrary
</string>
</value>
</item>
</dictionary>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_attachSoftwareProduct.xml
View file @
a99c7db3
...
...
@@ -50,7 +50,7 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string>
title="", description="", relative_url=""
</string>
</value>
<value>
<string>
title="", description="", relative_url=""
, **kw
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
...
...
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_getTestUrl.py
0 → 100644
View file @
a99c7db3
software_publication_line_list
=
context
.
objectValues
(
portal_type
=
"Software Publication Line"
)
if
len
(
software_publication_line_list
)
==
0
:
return
software_publication_line
=
software_publication_line_list
[
0
]
software_release
=
software_publication_line
.
getAggregateValue
(
portal_type
=
"Software Release"
)
software_product
=
software_publication_line
.
getResourceValue
(
portal_type
=
"Software Product"
)
if
not
software_product
or
not
software_release
:
return
software_release_version
=
software_release
.
getReference
()
#if as_link:
# return '<a href="%(link)s">%(link)s</a>' % {"link": (software_product.getFollowUpValue(portal_type="Web Site")[software_release_version].absolute_url() + "/")}
return
software_product
.
getFollowUpValue
(
portal_type
=
"Web Site"
)[
software_release_version
].
absolute_url
()
+
"/"
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_
jumpToRelatedWebSection
.xml
→
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_
getTestUrl
.xml
View file @
a99c7db3
...
...
@@ -50,11 +50,11 @@
</item>
<item>
<key>
<string>
_params
</string>
</key>
<value>
<string></string>
</value>
<value>
<string>
as_link=True
</string>
</value>
</item>
<item>
<key>
<string>
id
</string>
</key>
<value>
<string>
SoftwarePublication_
jumpToRelatedWebSection
</string>
</value>
<value>
<string>
SoftwarePublication_
getTestUrl
</string>
</value>
</item>
</dictionary>
</pickle>
...
...
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_jumpToRelatedWebSection.py
deleted
100644 → 0
View file @
a7588514
software_publication_line
=
context
.
objectValues
(
portal_type
=
"Software Publication Line"
)[
0
]
software_release_version
=
software_publication_line
.
getAggregateValue
(
portal_type
=
"Software Release"
).
getReference
()
web_section
=
software_publication_line
.
getResourceValue
().
getFollowUpValue
(
portal_type
=
"Web Site"
)[
software_release_version
]
return
context
.
REQUEST
.
RESPONSE
.
redirect
(
web_section
.
absolute_url
()
+
"/"
,
)
bt5/erp5_officejs_appstore_base/SkinTemplateItem/portal_skins/erp5_officejs_appstore_base/SoftwarePublication_submitSoftwarePublication.py
View file @
a99c7db3
...
...
@@ -90,5 +90,6 @@ software_release.activate(after_tag=tag, tag=tag + "_2").SoftwareRelease_fixRela
if
portal
.
portal_workflow
.
isTransitionPossible
(
zip_file
,
'submit'
):
zip_file
.
submit
()
software_release
.
submit
()
if
portal
.
portal_workflow
.
isTransitionPossible
(
software_release
,
'submit'
):
software_release
.
submit
()
software_publication
.
activate
(
after_tag
=
tag
+
"_2"
).
submit
()
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