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
Labels
Merge Requests
144
Merge Requests
144
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
Jobs
Commits
Open sidebar
nexedi
erp5
Commits
1d45e289
Commit
1d45e289
authored
Feb 27, 2020
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_project_ui: big refactoring
- web page instead of gadget field
parent
a755c0ba
Changes
9
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
702 additions
and
94 deletions
+702
-94
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_erp5_appcache.xml
...lateItem/web_page_module/project_gadget_erp5_appcache.xml
+5
-4
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_controller_js.js
...Item/web_page_module/project_gadget_page_controller_js.js
+6
-19
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_controller_js.xml
...tem/web_page_module/project_gadget_page_controller_js.xml
+2
-2
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_html.html
...e_module/project_gadget_page_project_front_page_html.html
+1
-1
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_html.xml
...ge_module/project_gadget_page_project_front_page_html.xml
+336
-0
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.js
..._page_module/project_gadget_page_project_front_page_js.js
+22
-12
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.xml
...page_module/project_gadget_page_project_front_page_js.xml
+330
-0
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_front_page_info.html.xml
...al_skins/erp5_web_project/gadget_front_page_info.html.xml
+0
-28
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_front_page_info.js.xml
...rtal_skins/erp5_web_project/gadget_front_page_info.js.xml
+0
-28
No files found.
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_erp5_appcache.xml
View file @
1d45e289
...
...
@@ -115,10 +115,11 @@ gadget_erp5_page_project_redirector.html\n
gadget_erp5_page_project_redirector.js\n
gadget_erp5_project_panel.html\n
gadget_erp5_project_panel.js\n
gadget_
front_page_info
.html\n
gadget_
front_page_info
.js\n
gadget_
erp5_page_project_front_page
.html\n
gadget_
erp5_page_project_front_page
.js\n
gadget_project_info.html\n
gadget_project_info.js\n
gadget_project_info.css\n
\n
favicon.ico\n
font-awesome/font-awesome-webfont.eot\n
...
...
@@ -407,7 +408,7 @@ NETWORK:\n
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
981.522
34.40735.41557
</string>
</value>
<value>
<string>
981.522
79.63159.55722
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -425,7 +426,7 @@ NETWORK:\n
</tuple>
<state>
<tuple>
<float>
158
1523847.97
</float>
<float>
158
2797345.19
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_controller_js.js
View file @
1d45e289
...
...
@@ -9,31 +9,18 @@
// Acquired methods
/////////////////////////////////////////////////////////////////
.
declareAcquiredMethod
(
"
redirect
"
,
"
redirect
"
)
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
/////////////////////////////////////////////////////////////////
// declared methods
/////////////////////////////////////////////////////////////////
.
declareMethod
(
"
render
"
,
function
(
options
)
{
var
gadget
=
this
;
return
gadget
.
getSetting
(
"
hateoas_url
"
)
.
push
(
function
(
hateoas_url
)
{
return
gadget
.
redirect
({
'
command
'
:
'
display
'
,
'
options
'
:
{
'
page
'
:
'
form
'
,
'
jio_key
'
:
'
project_module
'
,
'
view
'
:
hateoas_url
+
'
/ERP5Document_getHateoas?mode=traverse&relative_url=
'
+
'
project_module&view=ProjectModule_viewProjectManagementList
'
,
'
field_listbox_sort_list:json
'
:
[[
"
title
"
,
"
ascending
"
]],
'
field_listbox_column_list:json
'
:
[
"
title
"
,
"
default_destination_section_title
"
],
'
extended_search
'
:
'
selection_domain_state_project_domain: "started"
'
}
});
});
return
this
.
redirect
({
'
command
'
:
'
display
'
,
'
options
'
:
{
'
page
'
:
'
project_front_page
'
}
});
});
}(
document
,
window
,
rJS
));
\ No newline at end of file
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_controller_js.xml
View file @
1d45e289
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
98
0.38481.6518.6147
4
</string>
</value>
<value>
<string>
98
2.6887.63919.5280
4
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
15
77471606.29
</float>
<float>
15
82796228.57
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_project_ui/
SkinTemplateItem/portal_skins/erp5_web_project/gadget_front_page_info.
html.html
→
bt5/erp5_web_project_ui/
PathTemplateItem/web_page_module/project_gadget_page_project_front_page_
html.html
View file @
1d45e289
...
...
@@ -6,7 +6,7 @@
<title>
Project front page gadget
</title>
<script
src=
"rsvp.js"
></script>
<script
src=
"renderjs.js"
></script>
<script
src=
"gadget_
front_page_info
.js"
></script>
<script
src=
"gadget_
erp5_page_project_front_page
.js"
></script>
<link
rel=
"stylesheet"
type=
"text/css"
href=
"gadget_project_info.css"
>
</head>
...
...
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_html.xml
0 → 100644
View file @
1d45e289
This diff is collapsed.
Click to expand it.
bt5/erp5_web_project_ui/
SkinTemplateItem/portal_skins/erp5_web_project/gadget_front_page_info.
js.js
→
bt5/erp5_web_project_ui/
PathTemplateItem/web_page_module/project_gadget_page_project_front_page_
js.js
View file @
1d45e289
...
...
@@ -21,9 +21,8 @@
"
Test Result
"
:
"
Test Results
"
,
"
Bug
"
:
"
Bugs
"
,
"
Project Milestone
"
:
"
Milestones
"
,
"
Task Report
"
:
"
Task Reports
"
,
"
Support Request
"
:
"
Support Requests
"
};
const
PORTAL_TYPE_LIST
=
[
"
Task
"
,
"
Bug
"
,
"
Task Report
"
,
"
Support Request
"
];
"
Task Report
"
:
"
Task Reports
"
};
const
PORTAL_TYPE_LIST
=
[
"
Task
"
,
"
Bug
"
,
"
Task Report
"
];
const
VALID_STATE_LIST
=
[
"
planned
"
,
"
auto_planned
"
,
"
ordered
"
,
"
confirmed
"
,
"
ready
"
,
"
stopped
"
,
"
started
"
,
"
submitted
"
,
"
validated
"
];
function
getProjectId
(
id
)
{
...
...
@@ -244,23 +243,34 @@
rJS
(
window
)
/////////////////////////////////////////////////////////////////
// Acquired methods
/////////////////////////////////////////////////////////////////
.
declareAcquiredMethod
(
"
updateHeader
"
,
"
updateHeader
"
)
.
declareAcquiredMethod
(
"
getUrlForList
"
,
"
getUrlForList
"
)
.
declareAcquiredMethod
(
"
getUrlFor
"
,
"
getUrlFor
"
)
.
declareAcquiredMethod
(
"
jio_allDocs
"
,
"
jio_allDocs
"
)
.
declareAcquiredMethod
(
"
jio_getAttachment
"
,
"
jio_getAttachment
"
)
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
.
declareMethod
(
'
render
'
,
function
(
options
)
{
return
this
.
changeState
(
options
);
})
.
onStateChange
(
function
()
{
var
gadget
=
this
;
return
getProjectList
(
gadget
)
.
push
(
function
(
project_list
)
{
return
renderProjectList
(
gadget
,
project_list
);
})
.
push
(
function
(
project_list
)
{
options
.
project_list
=
project_list
;
return
gadget
.
changeState
(
options
);
});
})
.
onStateChange
(
function
(
modification_dict
)
{
var
gadget
=
this
;
return
gadget
.
updateHeader
({
page_title
:
'
Project Management
'
});
})
.
declareService
(
function
()
{
var
gadget
=
this
;
return
renderProjectList
(
gadget
,
gadget
.
state
.
project_list
)
.
push
(
function
()
{
//run the rest of queries and render async
gadget
.
renderMilestoneInfo
();
gadget
.
renderProjectDocumentInfo
();
...
...
bt5/erp5_web_project_ui/PathTemplateItem/web_page_module/project_gadget_page_project_front_page_js.xml
0 → 100644
View file @
1d45e289
This diff is collapsed.
Click to expand it.
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_front_page_info.html.xml
deleted
100644 → 0
View file @
a755c0ba
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"File"
module=
"OFS.Image"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
__name__
</string>
</key>
<value>
<string>
gadget_front_page_info.html
</string>
</value>
</item>
<item>
<key>
<string>
content_type
</string>
</key>
<value>
<string>
text/html
</string>
</value>
</item>
<item>
<key>
<string>
precondition
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></string>
</value>
</item>
</dictionary>
</pickle>
</record>
</ZopeData>
bt5/erp5_web_project_ui/SkinTemplateItem/portal_skins/erp5_web_project/gadget_front_page_info.js.xml
deleted
100644 → 0
View file @
a755c0ba
<?xml version="1.0"?>
<ZopeData>
<record
id=
"1"
aka=
"AAAAAAAAAAE="
>
<pickle>
<global
name=
"File"
module=
"OFS.Image"
/>
</pickle>
<pickle>
<dictionary>
<item>
<key>
<string>
__name__
</string>
</key>
<value>
<string>
gadget_front_page_info.js
</string>
</value>
</item>
<item>
<key>
<string>
content_type
</string>
</key>
<value>
<string>
application/javascript
</string>
</value>
</item>
<item>
<key>
<string>
precondition
</string>
</key>
<value>
<string></string>
</value>
</item>
<item>
<key>
<string>
title
</string>
</key>
<value>
<string></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