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
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Tristan Cavelier
erp5
Commits
6cb06ffb
Commit
6cb06ffb
authored
Aug 28, 2015
by
Xiaowu Zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
erp5_web_renderjs_ui: show domain tree in filter editor
parent
48269f33
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
104 additions
and
7 deletions
+104
-7
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.xml
...tal_skins/erp5_hal_json_style/ERP5Document_getHateoas.xml
+18
-0
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_html.xml
...tem/web_page_module/rjs_gadget_erp5_filtereditor_html.xml
+4
-4
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
...eItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
+82
-3
No files found.
bt5/erp5_hal_json_style/SkinTemplateItem/portal_skins/erp5_hal_json_style/ERP5Document_getHateoas.xml
View file @
6cb06ffb
...
@@ -98,6 +98,16 @@ url_template_dict = {\n
...
@@ -98,6 +98,16 @@ url_template_dict = {\n
\n
\n
default_document_uri_template = url_template_dict["jio_get_template"]\n
default_document_uri_template = url_template_dict["jio_get_template"]\n
\n
\n
def getAllSubCategoriesAsMap(root):\n
result = {}\n
sub_categories_list = root.objectValues()\n
if len(sub_categories_list) != 0:\n
for grain in sub_categories_list:\n
result[grain.getId()] = {"sub_categories": getAllSubCategoriesAsMap(grain),\n
"title": grain.getTitle()}\n
\n
return result\n
\n
def getRealRelativeUrl(document):\n
def getRealRelativeUrl(document):\n
return \'/\'.join(portal.portal_url.getRelativeContentPath(document))\n
return \'/\'.join(portal.portal_url.getRelativeContentPath(document))\n
\n
\n
...
@@ -377,6 +387,12 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
...
@@ -377,6 +387,12 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
# line[title] = prop\n
# line[title] = prop\n
# line["_relative_url"] = document.getRelativeUrl()\n
# line["_relative_url"] = document.getRelativeUrl()\n
# line_list.append(line)\n
# line_list.append(line)\n
domain_tree_map = {} \n
domain_tree = field.get_value("domain_root_list")\n
for tree in domain_tree:\n
if hasattr(portal_categories, tree[0]):\n
domain_tree_map[tree[0]] = {"sub_categories":getAllSubCategoriesAsMap(portal_categories[tree[0]]),\n
"title": tree[1]}\n
\n
\n
result = {\n
result = {\n
"type": meta_type,\n
"type": meta_type,\n
...
@@ -392,6 +408,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
...
@@ -392,6 +408,7 @@ def renderField(traversed_document, field, form_relative_url, value=None, meta_t
"portal_type": portal_types,\n
"portal_type": portal_types,\n
"lines": lines,\n
"lines": lines,\n
"default_params": default_params,\n
"default_params": default_params,\n
"domain_tree_map": domain_tree_map,\n
"list_method": list_method_name\n
"list_method": list_method_name\n
}\n
}\n
if (list_method_custom is not None):\n
if (list_method_custom is not None):\n
...
@@ -560,6 +577,7 @@ def renderFormDefinition(form, response_dict):\n
...
@@ -560,6 +577,7 @@ def renderFormDefinition(form, response_dict):\n
\n
\n
mime_type = \'application/hal+json\'\n
mime_type = \'application/hal+json\'\n
portal = context.getPortalObject()\n
portal = context.getPortalObject()\n
portal_categories = portal.portal_categories\n
sql_catalog = portal.portal_catalog.getSQLCatalog()\n
sql_catalog = portal.portal_catalog.getSQLCatalog()\n
\n
\n
# Calculate the site root to prevent unexpected browsing\n
# Calculate the site root to prevent unexpected browsing\n
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_html.xml
View file @
6cb06ffb
...
@@ -190,7 +190,7 @@
...
@@ -190,7 +190,7 @@
</section>
\n
</section>
\n
\n
\n
\n
\n
\n
\n
<section
class=
"ui-content-header-plain"
>
\n
<section
class=
"ui-content-header-plain"
>
\n
<h3
class=
"ui-content-title ui-body-c"
>
\n
<h3
class=
"ui-content-title ui-body-c"
>
\n
<span
class=
"ui-icon ui-icon-custom"
>
</span>
\n
<span
class=
"ui-icon ui-icon-custom"
>
</span>
\n
...
@@ -198,7 +198,7 @@
...
@@ -198,7 +198,7 @@
</h3>
\n
</h3>
\n
</section>
\n
</section>
\n
<section
class=
"ui-body-c ui-content-section"
>
\n
<section
class=
"ui-body-c ui-content-section"
>
\n
<div
class=
"
predefined_filt
er"
>
\n
<div
class=
"
domain_tree_contain
er"
>
\n
</div>
\n
</div>
\n
</section>
\n
</section>
\n
</div>
\n
</div>
\n
...
@@ -345,7 +345,7 @@
...
@@ -345,7 +345,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
945.
19755.27628.12919
</string>
</value>
<value>
<string>
945.
22508.10889.31197
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -363,7 +363,7 @@
...
@@ -363,7 +363,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1440
523041.2
</float>
<float>
1440
760242.27
</float>
<string>
UTC
</string>
<string>
UTC
</string>
</tuple>
</tuple>
</state>
</state>
...
...
bt5/erp5_web_renderjs_ui/PathTemplateItem/web_page_module/rjs_gadget_erp5_filtereditor_js.xml
View file @
6cb06ffb
...
@@ -168,8 +168,75 @@
...
@@ -168,8 +168,75 @@
});\n
});\n
}\n
}\n
\n
\n
\n
function createDomainTree(gadget, options_tree_map) {\n
var select = document.createElement("select"),\n
div_container = document.createElement("div"),\n
first,\n
domain_tree_map = gadget.props.domain_tree_map,\n
domain_tree_container = gadget.props.element.querySelector(".domain_tree_container"),\n
tmp = "",\n
key,\n
i;\n
if (options_tree_map) {\n
domain_tree_map = options_tree_map;\n
}\n
\n
function updateDomainTree(gadget, event) {\n
var domain_tree_list = domain_tree_container.querySelectorAll(\'.domain_tree\'),\n
update_domain_tree_map = gadget.props.domain_tree_map;\n
for (i = domain_tree_list.length - 1; i >
0; i -= 1) {\n
if (domain_tree_list[i] !== event.target.parentElement.parentElement.parentElement) {\n
gadget.props.tree_path.pop();\n
domain_tree_list[i].parentElement.removeChild(domain_tree_list[i]);\n
} else {\n
break;\n
}\n
}\n
if (event.target.value !== \'--\') {\n
gadget.props.tree_path[gadget.props.tree_path.length - 1] = event.target.value;\n
for (i = 0; i
< gadget.props.tree_path.length
;
i
+=
1)
{\n
update_domain_tree_map =
update_domain_tree_map[gadget.props.tree_path[i]];\n
update_domain_tree_map =
update_domain_tree_map.sub_categories;\n
}\n
if
(Object.keys(update_domain_tree_map).length
!==
0)
{\n
createDomainTree(gadget,
update_domain_tree_map);\n
}\n
}\n
}\n
\n
\n
\n
\n
tmp
+=
option_template({\n
value:
"--",\n
text:
"--"\n
});\n
for
(key
in
domain_tree_map)
{\n
if
(domain_tree_map.hasOwnProperty(key))
{\n
if
(
first =
==
undefined)
{\n
first =
key;\n
}\n
tmp
+=
option_template({\n
value:
key,\n
text:
domain_tree_map[key].title\n
});\n
}\n
}\n
gadget.props.tree_path.push(first);\n
select.setAttribute("class",
"domain_tree_select");\n
select.innerHTML =
tmp;\n
div_container.setAttribute("class",
"domain_tree");\n
loopEventListener(\n
select,\n
"change",\n
false,\n
function
(event)
{\n
updateDomainTree(gadget,
event);\n
}\n
);\n
div_container.appendChild(select);\n
domain_tree_container.appendChild(div_container);\n
$(select).selectmenu();\n
}\n
\n
\n
\n
\n
function
createFilterItem(gadget,
select,
input_value)
{\n
function
createFilterItem(gadget,
select,
input_value)
{\n
...
@@ -210,6 +277,7 @@
...
@@ -210,6 +277,7 @@
}\n
}\n
if (event.target.value.indexOf(\'date\') !== -1) {\n
if (event.target.value.indexOf(\'date\') !== -1) {\n
text.setAttribute("type", "date");\n
text.setAttribute("type", "date");\n
value_list[value_list.length - 1] = value_list[value_list.length - 1].replace(/\\//g, "-");\n
} else {\n
} else {\n
text.setAttribute("type", "text");\n
text.setAttribute("type", "text");\n
}\n
}\n
...
@@ -303,6 +371,7 @@
...
@@ -303,6 +371,7 @@
//
Init
local
properties\n
//
Init
local
properties\n
.ready(function
(g)
{\n
.ready(function
(g)
{\n
g.props =
{};\n
g.props =
{};\n
g.props.tree_path =
[];\n
})\n
})\n
\n
\n
//////////////////////////////////////////////\n
//////////////////////////////////////////////\n
...
@@ -351,6 +420,7 @@
...
@@ -351,6 +420,7 @@
options =
gadget.props.options;\n
options =
gadget.props.options;\n
gadget.props.jelement.panel("toggle");\n
gadget.props.jelement.panel("toggle");\n
if
(gadget.props.element.querySelector(".filterForm")
===
null
||
gadget.props.change)
{\n
if
(gadget.props.element.querySelector(".filterForm")
===
null
||
gadget.props.change)
{\n
gadget.props.tree_path =
[];\n
gadget.props.change =
false;\n
gadget.props.change =
false;\n
return
new
RSVP.Queue()\n
return
new
RSVP.Queue()\n
.push(function
()
{\n
.push(function
()
{\n
...
@@ -359,13 +429,16 @@
...
@@ -359,13 +429,16 @@
.push(function
(result)
{\n
.push(function
(result)
{\n
var
container =
gadget.props.element.querySelector(".filter_item_container");\n
var
container =
gadget.props.element.querySelector(".filter_item_container");\n
gadget.props.options =
result.data._embedded._view.listbox.column_list;\n
gadget.props.options =
result.data._embedded._view.listbox.column_list;\n
gadget.props.domain_tree_map =
result.data._embedded._view.listbox.domain_tree_map;\n
container.insertBefore(createFilterItem(gadget),
container.lastChild);\n
container.insertBefore(createFilterItem(gadget),
container.lastChild);\n
createDomainTree(gadget);\n
});\n
});\n
}\n
}\n
})\n
})\n
\n
\n
.declareMethod(\'render\',
function
(options)
{\n
.declareMethod(\'render\',
function
(options)
{\n
var
container =
this.props.element.querySelector(".filter_item_container"),\n
var
container =
this.props.element.querySelector(".filter_item_container"),\n
domain_tree_container =
this.props.element.querySelector(".domain_tree_container"),\n
i,\n
i,\n
gadget =
this,\n
gadget =
this,\n
item,\n
item,\n
...
@@ -376,9 +449,13 @@
...
@@ -376,9 +449,13 @@
while
(container.firstChild
!==
container.lastChild)
{\n
while
(container.firstChild
!==
container.lastChild)
{\n
container.removeChild(container.firstChild);\n
container.removeChild(container.firstChild);\n
}\n
}\n
while
(domain_tree_container.firstChild)
{\n
domain_tree_container.removeChild(domain_tree_container.firstChild);\n
}\n
\n
this.props.options =
options;\n
this.props.options =
options;\n
if
(options.filterEditor
!==
undefined
||
options.pg
!==
undefined)
{\n
if
(options.filterEditor
!==
undefined
||
options.pg
!==
undefined)
{\n
\n
gadget.props.tree_path =
[];
\n
query =
options.filterEditor
?
options.filterEditor.extended_search
:
options.pg.fg.erp5_searchfield.extended_search;\n
query =
options.filterEditor
?
options.filterEditor.extended_search
:
options.pg.fg.erp5_searchfield.extended_search;\n
return
new
RSVP.Queue()\n
return
new
RSVP.Queue()\n
.push(function
()
{\n
.push(function
()
{\n
...
@@ -386,6 +463,7 @@
...
@@ -386,6 +463,7 @@
})\n
})\n
.push(function
(result)
{\n
.push(function
(result)
{\n
gadget.props.options =
result.data._embedded._view.listbox.column_list;\n
gadget.props.options =
result.data._embedded._view.listbox.column_list;\n
gadget.props.domain_tree_map =
result.data._embedded._view.listbox.domain_tree_map;\n
var
query_list =
query.split("
OR
");\n
var
query_list =
query.split("
OR
");\n
if
(
query_list.length =
==
1)
{\n
if
(
query_list.length =
==
1)
{\n
query_list =
query.split("
AND
");\n
query_list =
query.split("
AND
");\n
...
@@ -405,6 +483,7 @@
...
@@ -405,6 +483,7 @@
}\n
}\n
container.insertBefore(item,
container.lastChild);\n
container.insertBefore(item,
container.lastChild);\n
}\n
}\n
createDomainTree(gadget);\n
});\n
});\n
}\n
}\n
\n
\n
...
@@ -588,7 +667,7 @@
...
@@ -588,7 +667,7 @@
</item>
</item>
<item>
<item>
<key>
<string>
serial
</string>
</key>
<key>
<string>
serial
</string>
</key>
<value>
<string>
945.
19828.51016.30276
</string>
</value>
<value>
<string>
945.
23700.50924.1689
</string>
</value>
</item>
</item>
<item>
<item>
<key>
<string>
state
</string>
</key>
<key>
<string>
state
</string>
</key>
...
@@ -606,7 +685,7 @@
...
@@ -606,7 +685,7 @@
</tuple>
</tuple>
<state>
<state>
<tuple>
<tuple>
<float>
1440
527609.31
</float>
<float>
1440
760231.23
</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