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
83d1d847
Commit
83d1d847
authored
Jul 18, 2019
by
Roque
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: disable listbox select buttons on officejs apps
parent
a09c1faa
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
38 additions
and
17 deletions
+38
-17
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
...emplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
+21
-9
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
...mplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
+2
-2
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js
...teItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js
+13
-4
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
...eItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
+2
-2
No files found.
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.js
View file @
83d1d847
...
...
@@ -341,6 +341,7 @@
"
triggerListboxSelectAction
"
)
.
declareAcquiredMethod
(
"
triggerListboxClipboardAction
"
,
"
triggerListboxClipboardAction
"
)
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
//////////////////////////////////////////////
// initialize the gadget content
...
...
@@ -444,6 +445,9 @@
if
(
displayed_column_item_list
.
length
===
0
)
{
displayed_column_item_list
=
field_json
.
column_list
;
}
if
(
field_json
.
sort
===
undefined
)
{
field_json
.
sort
=
[]
}
return
gadget
.
changeState
({
key
:
field_json
.
key
,
...
...
@@ -511,6 +515,10 @@
'
button[name="Clipboard"]
'
,
'
button[name="Configure"]
'
,
'
button[name="SelectRows"]
'
],
url_for_option_list
=
[],
is_sortable_list
=
[],
select_list
,
hide_buttons
,
button
;
/*
...
...
@@ -605,10 +613,7 @@
column
,
is_sortable
,
current_sort
,
options
,
url_for_option_list
=
[],
is_sortable_list
=
[],
select_list
;
options
;
for
(
k
=
0
;
k
<
column_list
.
length
;
k
+=
1
)
{
column
=
column_list
[
k
];
...
...
@@ -651,7 +656,11 @@
throw
error
;
});
}
return
gadget
.
getSetting
(
'
hide_listbox_buttons
'
);
})
.
push
(
function
(
hide_listbox_buttons
)
{
// XXX Disable select and clipboard functionalities on migrated apps: 'uid'-workaround made for renderjs UI doesn't work on officejs
hide_buttons
=
((
hide_listbox_buttons
!==
undefined
&&
hide_listbox_buttons
==
"
1
"
)
?
true
:
false
);
return
RSVP
.
all
([
gadget
.
getUrlForList
(
url_for_option_list
),
is_sortable_list
,
...
...
@@ -768,9 +777,11 @@
button_element
.
setAttribute
(
'
data-rel
'
,
'
clipboard
'
);
button_element
.
setAttribute
(
'
name
'
,
'
Clipboard
'
);
button_element
.
type
=
'
button
'
;
button_element
.
setAttribute
(
'
class
'
,
'
ui-icon-list-ul ui-btn-icon-left
'
);
button_element
.
setAttribute
(
'
class
'
,
'
ui-icon-list-ul ui-btn-icon-left
'
+
gadget
.
state
.
hide_class
);
button_element
.
textContent
=
translation_list
[
5
];
div_element
.
appendChild
(
button_element
);
if
(
!
hide_buttons
)
{
div_element
.
appendChild
(
button_element
);
}
// Add Select button
// <button {{disabled}} data-rel="hide" data-i18n="Select" name="Hide" type="button" class="ui-icon-check-square-o ui-btn-icon-left {{hide_class}}"></button>
...
...
@@ -781,7 +792,9 @@
button_element
.
type
=
'
button
'
;
button_element
.
setAttribute
(
'
class
'
,
'
ui-icon-check-square-o ui-btn-icon-left
'
+
gadget
.
state
.
hide_class
);
button_element
.
textContent
=
translation_list
[
1
];
div_element
.
appendChild
(
button_element
);
if
(
!
hide_buttons
)
{
div_element
.
appendChild
(
button_element
);
}
}
fragment
.
appendChild
(
div_element
);
...
...
@@ -1181,7 +1194,6 @@
if
(
gadget
.
state
.
show_count
===
true
)
{
aggregation_option_list
.
push
(
"
count
"
);
}
return
gadget
.
jio_allDocs
({
// XXX Not jIO compatible, but until a better api is found...
"
list_method_template
"
:
this
.
state
.
list_method_template
,
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_listbox_js.xml
View file @
83d1d847
...
...
@@ -234,7 +234,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
6.39970.24604.49271
</string>
</value>
<value>
<string>
97
7.7896.61696.31214
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>
156
1386450.62
</float>
<float>
156
3307776.79
</float>
<string>
UTC
</string>
</tuple>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.js
View file @
83d1d847
...
...
@@ -74,6 +74,7 @@
.
declareAcquiredMethod
(
"
getUrlParameter
"
,
"
getUrlParameter
"
)
.
declareAcquiredMethod
(
"
renderEditorPanel
"
,
"
renderEditorPanel
"
)
.
declareAcquiredMethod
(
"
getTranslationList
"
,
"
getTranslationList
"
)
.
declareAcquiredMethod
(
"
getSetting
"
,
"
getSetting
"
)
/////////////////////////////////////////////////////////////////
// Proxy methods to the child gadget
...
...
@@ -111,10 +112,18 @@
})
.
onStateChange
(
function
onStateChange
()
{
var
form_gadget
=
this
;
var
form_gadget
=
this
,
hide_enabled
;
// render the erp5 form
return
form_gadget
.
getDeclaredGadget
(
"
erp5_form
"
)
return
RSVP
.
Queue
()
.
push
(
function
()
{
return
form_gadget
.
getSetting
(
'
hide_listbox_buttons
'
);
})
.
push
(
function
(
hide_listbox_buttons
)
{
// XXX Disable select and clipboard functionalities on migrated apps: 'uid'-workaround made for renderjs UI doesn't work on officejs
hide_enabled
=
((
hide_listbox_buttons
!==
undefined
&&
hide_listbox_buttons
==
"
1
"
)
?
false
:
true
);
// render the erp5 form
return
form_gadget
.
getDeclaredGadget
(
"
erp5_form
"
);
})
.
push
(
function
(
erp5_form
)
{
var
form_options
=
form_gadget
.
state
.
erp5_form
;
...
...
@@ -125,8 +134,8 @@
form_options
.
editable
=
form_gadget
.
state
.
editable
;
// XXX Hardcoded for listbox's hide/configure functionalities
form_options
.
form_definition
.
hide_enabled
=
true
;
form_options
.
form_definition
.
configure_enabled
=
true
;
form_options
.
form_definition
.
hide_enabled
=
hide_enabled
;
// XXX not generic, fix later
if
(
form_gadget
.
state
.
extended_search
)
{
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_pt_form_list_js.xml
View file @
83d1d847
...
...
@@ -228,7 +228,7 @@
</item>
<item>
<key>
<string>
serial
</string>
</key>
<value>
<string>
97
4.48375.47521.35942
</string>
</value>
<value>
<string>
97
7.7261.25868.10427
</string>
</value>
</item>
<item>
<key>
<string>
state
</string>
</key>
...
...
@@ -246,7 +246,7 @@
</tuple>
<state>
<tuple>
<float>
15
54113017.67
</float>
<float>
15
63269623.68
</float>
<string>
UTC
</string>
</tuple>
</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