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
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
Titouan Soulard
erp5
Commits
b86ea801
Commit
b86ea801
authored
Jun 16, 2022
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: panel update to handle about page
parent
a802f521
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
55 additions
and
33 deletions
+55
-33
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.xml
...e/gadget_officejs_controller_page_local_controller_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.js
...Item/web_page_module/gadget_officejs_erp5_ojs_panel_js.js
+48
-27
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.xml
...tem/web_page_module/gadget_officejs_erp5_ojs_panel_js.xml
+2
-2
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.html
...Item/web_page_module/gadget_officejs_erp5_panel_html.html
+1
-0
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.xml
...eItem/web_page_module/gadget_officejs_erp5_panel_html.xml
+2
-2
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_controller_page_local_controller_js.xml
View file @
b86ea801
...
@@ -234,7 +234,7 @@
...
@@ -234,7 +234,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
979.63498.47896.7901
</string>
</value>
<value>
<string>
1001.7199.47519.37307
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -252,7 +252,7 @@
...
@@ -252,7 +252,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
574423725.43
</float>
<float>
1
658943004.35
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.js
View file @
b86ea801
...
@@ -86,6 +86,7 @@
...
@@ -86,6 +86,7 @@
.
declareAcquiredMethod
(
"
redirect
"
,
"
redirect
"
)
.
declareAcquiredMethod
(
"
redirect
"
,
"
redirect
"
)
.
declareAcquiredMethod
(
"
getUrlParameter
"
,
"
getUrlParameter
"
)
.
declareAcquiredMethod
(
"
getUrlParameter
"
,
"
getUrlParameter
"
)
.
declareAcquiredMethod
(
"
getUrlForList
"
,
"
getUrlForList
"
)
.
declareAcquiredMethod
(
"
getUrlForList
"
,
"
getUrlForList
"
)
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
/////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////
// declared methods
// declared methods
...
@@ -127,7 +128,10 @@
...
@@ -127,7 +128,10 @@
view_list
:
view_list
,
view_list
:
view_list
,
global
:
true
,
global
:
true
,
view_action_dict
:
options
.
view_action_dict
||
false
,
view_action_dict
:
options
.
view_action_dict
||
false
,
editable
:
options
.
editable
||
editable
||
false
editable
:
options
.
editable
||
editable
||
false
,
// force render to refresh the menus
render_timestamp
:
new
Date
().
getTime
(),
first_render
:
true
});
});
});
});
})
})
...
@@ -136,7 +140,8 @@
...
@@ -136,7 +140,8 @@
var
context
=
this
,
var
context
=
this
,
gadget
=
this
,
gadget
=
this
,
queue
=
new
RSVP
.
Queue
(),
queue
=
new
RSVP
.
Queue
(),
tmp_element
;
tmp_element
,
about_page
;
if
(
modification_dict
.
hasOwnProperty
(
"
visible
"
))
{
if
(
modification_dict
.
hasOwnProperty
(
"
visible
"
))
{
if
(
this
.
state
.
visible
)
{
if
(
this
.
state
.
visible
)
{
...
@@ -150,6 +155,14 @@
...
@@ -150,6 +155,14 @@
}
}
}
}
queue
.
push
(
function
()
{
return
gadget
.
getSetting
(
'
about_page
'
);
})
.
push
(
function
(
setting
)
{
about_page
=
setting
;
});
if
(
modification_dict
.
hasOwnProperty
(
"
global
"
))
{
if
(
modification_dict
.
hasOwnProperty
(
"
global
"
))
{
queue
queue
.
push
(
function
()
{
.
push
(
function
()
{
...
@@ -182,13 +195,13 @@
...
@@ -182,13 +195,13 @@
});
});
}
}
if
(
modification_dict
.
hasOwnProperty
(
"
editable
"
))
{
queue
queue
// Update the global links
// Update the global links
.
push
(
function
()
{
.
push
(
function
()
{
return
RSVP
.
all
([
return
RSVP
.
all
([
context
.
getUrlFor
({
command
:
'
display
'
}),
context
.
getUrlFor
({
command
:
'
display
'
}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
ojs_configurator
"
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
ojs_configurator
"
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
about_page
}}),
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
ojs_sync
"
,
'
auto_repair
'
:
true
}})
context
.
getUrlFor
({
command
:
'
display
'
,
options
:
{
page
:
"
ojs_sync
"
,
'
auto_repair
'
:
true
}})
]);
]);
})
})
...
@@ -197,15 +210,24 @@
...
@@ -197,15 +210,24 @@
panel_template_body_list
({
panel_template_body_list
({
"
document_list_href
"
:
result_list
[
0
],
"
document_list_href
"
:
result_list
[
0
],
"
storage_href
"
:
result_list
[
1
],
"
storage_href
"
:
result_list
[
1
],
"
sync_href
"
:
result_list
[
2
]
"
about_href
"
:
result_list
[
2
],
"
sync_href
"
:
result_list
[
3
]
})
})
);
);
})
})
.
push
(
function
(
result
)
{
.
push
(
function
(
result
)
{
context
.
element
.
querySelector
(
"
ul
"
).
innerHTML
=
result
;
context
.
element
.
querySelector
(
"
ul
"
).
innerHTML
=
result
;
});
})
.
push
(
function
()
{
if
(
!
about_page
)
{
context
.
element
.
querySelector
(
"
#about_page_li
"
)
.
style
.
display
=
'
none
'
;
}
else
{
context
.
element
.
querySelector
(
"
#about_page_li
"
)
.
style
.
display
=
'
block
'
;
}
}
});
if
((
this
.
state
.
global
===
true
)
&&
if
((
this
.
state
.
global
===
true
)
&&
(
modification_dict
.
hasOwnProperty
(
"
desktop
"
)
||
(
modification_dict
.
hasOwnProperty
(
"
desktop
"
)
||
...
@@ -285,9 +307,8 @@
...
@@ -285,9 +307,8 @@
]);
]);
})
})
.
push
(
function
(
view_action_list
)
{
.
push
(
function
(
view_action_list
)
{
var
dl_element
,
var
dl_element
=
gadget
.
element
.
querySelector
(
"
dl
"
)
,
dl_fragment
=
document
.
createDocumentFragment
();
dl_fragment
=
document
.
createDocumentFragment
();
dl_element
=
gadget
.
element
.
querySelector
(
"
dl
"
);
while
(
dl_element
.
firstChild
)
{
while
(
dl_element
.
firstChild
)
{
dl_element
.
removeChild
(
dl_element
.
firstChild
);
dl_element
.
removeChild
(
dl_element
.
firstChild
);
}
}
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_ojs_panel_js.xml
View file @
b86ea801
...
@@ -231,7 +231,7 @@
...
@@ -231,7 +231,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
989.27524.31537.13687
</string>
</value>
<value>
<string>
1001.57742.17876.27579
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -249,7 +249,7 @@
...
@@ -249,7 +249,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
16
13148260.92
</float>
<float>
16
58943108.94
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.html
View file @
b86ea801
...
@@ -43,6 +43,7 @@
...
@@ -43,6 +43,7 @@
<script
id=
"panel-template-body-list"
type=
"text/x-handlebars-template"
>
<script
id=
"panel-template-body-list"
type=
"text/x-handlebars-template"
>
<
li
class
=
"
ui-first-child
"
><
a
href
=
"
{{document_list_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-search
"
data
-
i18n
=
"
Document
"
accesskey
=
"
s
"
>
Document
<
/a></
li
>
<
li
class
=
"
ui-first-child
"
><
a
href
=
"
{{document_list_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-search
"
data
-
i18n
=
"
Document
"
accesskey
=
"
s
"
>
Document
<
/a></
li
>
<
li
><
a
href
=
"
{{sync_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-refresh
"
data
-
i18n
=
"
Synchronize
"
>
Synchronize
<
/a></
li
>
<
li
><
a
href
=
"
{{sync_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-refresh
"
data
-
i18n
=
"
Synchronize
"
>
Synchronize
<
/a></
li
>
<
li
id
=
"
about_page_li
"
><
a
href
=
"
{{about_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-question-circle
"
data
-
i18n
=
"
About
"
>
About
<
/a></
li
>
<
li
class
=
"
ui-last-child
"
><
a
href
=
"
{{storage_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-gear
"
data
-
i18n
=
"
Storages
"
>
Storages
<
/a></
li
>
<
li
class
=
"
ui-last-child
"
><
a
href
=
"
{{storage_href}}
"
class
=
"
ui-btn ui-btn-icon-left ui-icon-gear
"
data
-
i18n
=
"
Storages
"
>
Storages
<
/a></
li
>
</script>
</script>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_erp5_panel_html.xml
View file @
b86ea801
...
@@ -235,7 +235,7 @@
...
@@ -235,7 +235,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
979.53350.54566.580
2
</string>
</value>
<value>
<string>
1001.4391.61246.4304
2
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -253,7 +253,7 @@
...
@@ -253,7 +253,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1
573813812.11
</float>
<float>
1
655913247.73
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
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