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
7
Merge Requests
7
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Jérome Perrin
erp5
Commits
51b4ff57
Commit
51b4ff57
authored
Dec 26, 2017
by
Cédric Le Ninivin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_officejs: Update / Fix bookmark manager to latest jio and erp5 search field
parent
70da8503
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
26 additions
and
17 deletions
+26
-17
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_manager_appcache.xml
...page_module/gadget_officejs_bookmark_manager_appcache.xml
+4
-4
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher.js.js
...age_module/gadget_officejs_bookmark_page_dispatcher.js.js
+15
-6
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher.js.xml
...ge_module/gadget_officejs_bookmark_page_dispatcher.js.xml
+3
-3
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher_html.html
...module/gadget_officejs_bookmark_page_dispatcher_html.html
+1
-1
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher_html.xml
..._module/gadget_officejs_bookmark_page_dispatcher_html.xml
+3
-3
No files found.
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_manager_appcache.xml
View file @
51b4ff57
...
@@ -108,7 +108,7 @@
...
@@ -108,7 +108,7 @@
<item>
<item>
<key>
<string>
text_content
</string>
</key>
<key>
<string>
text_content
</string>
</key>
<value>
<string>
CACHE MANIFEST\n
<value>
<string>
CACHE MANIFEST\n
# generated on
Fri, 09 Dec 2016
11:45:33 +0000\n
# generated on
Tue, 26 Dec 2017
11:45:33 +0000\n
# XXX + fonts\n
# XXX + fonts\n
# images/ajax-loader.gif\n
# images/ajax-loader.gif\n
CACHE:\n
CACHE:\n
...
@@ -343,7 +343,7 @@ NETWORK:\n
...
@@ -343,7 +343,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
vincent
</string>
</value>
<value>
<string>
cedric.le.ninivin
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -357,7 +357,7 @@ NETWORK:\n
...
@@ -357,7 +357,7 @@ NETWORK:\n
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
2.42958.18622.47018
</string>
</value>
<value>
<string>
96
4.25551.64087.3020
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -375,7 +375,7 @@ NETWORK:\n
...
@@ -375,7 +375,7 @@ NETWORK:\n
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
07552624.72
</float>
<float>
15
14298247.3
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher.js.js
View file @
51b4ff57
...
@@ -36,10 +36,8 @@
...
@@ -36,10 +36,8 @@
};
};
}
else
{
}
else
{
query
=
{
query
=
{
query
:
'
(title:"%
'
+
search
+
query
:
'
("
'
+
search
+
'
%" OR url_string:"%
'
+
search
+
'
") AND portal_type:"
'
+
gadget
.
state
.
portal_type
+
'
"
'
,
'
%" OR description:"%
'
+
search
+
'
%") AND portal_type:"
'
+
gadget
.
state
.
portal_type
+
'
"
'
,
select_list
:
[
'
title
'
,
'
url_string
'
,
'
description
'
]
select_list
:
[
'
title
'
,
'
url_string
'
,
'
description
'
]
};
};
}
}
...
@@ -139,11 +137,22 @@
...
@@ -139,11 +137,22 @@
return
gadget
.
getDeclaredGadget
(
'
erp5_searchfield
'
)
return
gadget
.
getDeclaredGadget
(
'
erp5_searchfield
'
)
.
push
(
function
(
search_gadget
)
{
.
push
(
function
(
search_gadget
)
{
return
search_gadget
.
render
({
return
search_gadget
.
render
({
extended_search
:
gadget
.
state
.
search
field_json
:
{
value
:
gadget
.
state
.
search
,
editable
:
true
,
title
:
"
Search
"
,
required
:
true
,
key
:
"
search
"
}
});
});
});
});
})
})
.
allowPublicAcquisition
(
"
notifyValid
"
,
function
()
{
return
true
;
})
.
allowPublicAcquisition
(
"
notifyInvalid
"
,
function
()
{
return
true
;
})
.
onEvent
(
"
submit
"
,
function
()
{
.
onEvent
(
"
submit
"
,
function
()
{
var
gadget
=
this
;
var
gadget
=
this
;
return
gadget
.
notifySubmitting
()
return
gadget
.
notifySubmitting
()
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher.js.xml
View file @
51b4ff57
...
@@ -228,7 +228,7 @@
...
@@ -228,7 +228,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
cedric.le.ninivin
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -242,7 +242,7 @@
...
@@ -242,7 +242,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
1.10293.23355.24473
</string>
</value>
<value>
<string>
96
4.25718.43962.9301
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -260,7 +260,7 @@
...
@@ -260,7 +260,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
01746582.52
</float>
<float>
15
14295848.43
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher_html.html
View file @
51b4ff57
...
@@ -17,7 +17,7 @@
...
@@ -17,7 +17,7 @@
<form
class=
"dialog_form ui-body-c"
novalidate
>
<form
class=
"dialog_form ui-body-c"
novalidate
>
<button
type=
"submit"
class=
"ui-btn ui-btn-b ui-btn-inline
<button
type=
"submit"
class=
"ui-btn ui-btn-b ui-btn-inline
ui-icon-edit ui-btn-icon-right ui-screen-hidden"
></button>
ui-icon-edit ui-btn-icon-right ui-screen-hidden"
></button>
<div
data-gadget-url=
"gadget_erp5_
searchfield
.html"
<div
data-gadget-url=
"gadget_erp5_
field_string
.html"
data-gadget-scope=
"erp5_searchfield"
data-gadget-scope=
"erp5_searchfield"
data-gadget-sandbox=
"public"
>
data-gadget-sandbox=
"public"
>
</div>
</div>
...
...
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher_html.xml
View file @
51b4ff57
...
@@ -263,7 +263,7 @@
...
@@ -263,7 +263,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
actor
</string>
</key>
<key>
<string>
actor
</string>
</key>
<value>
<string>
zope
</string>
</value>
<value>
<string>
cedric.le.ninivin
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
comment
</string>
</key>
<key>
<string>
comment
</string>
</key>
...
@@ -277,7 +277,7 @@
...
@@ -277,7 +277,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
96
1.9156.29616.4744
</string>
</value>
<value>
<string>
96
4.25687.29107.19507
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -295,7 +295,7 @@
...
@@ -295,7 +295,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
15
01746747.4
4
</float>
<float>
15
14294307.
4
</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