Skip to content

erp5
erp5
Commit 29590cd7 authored by Papa Tamsir Kane's avatar Papa Tamsir Kane
Browse files
Options

erp5_officejs: Use url_module in Bookmark Manager 

* bookmark_module -> url_module
* portal Bookmark -> portal Url
* url_string -> coordinate_text
parent d0e9a3a8
Show whitespace changes
Inline Side-by-side
Showing with 17 additions and 17 deletions
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_manager_router_html.html
View file @ 29590cd7
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
</head> </head>
<body> <body>
<script data-renderjs-configuration="portal_type" type="text/x-renderjs-configuration">Bookmark</script> <script data-renderjs-configuration="portal_type" type="text/x-renderjs-configuration">Url</script>
<script data-renderjs-configuration="parent_relative_url" type="text/x-renderjs-configuration">bookmark_module</script> <script data-renderjs-configuration="parent_relative_url" type="text/x-renderjs-configuration">url_module</script>
<script data-renderjs-configuration="document_title" type="text/x-renderjs-configuration">Bookmark</script> <script data-renderjs-configuration="document_title" type="text/x-renderjs-configuration">Bookmark</script>
<script data-renderjs-configuration="document_title_plural" type="text/x-renderjs-configuration">Bookmarks</script> <script data-renderjs-configuration="document_title_plural" type="text/x-renderjs-configuration">Bookmarks</script>
<script data-renderjs-configuration="global_setting_gadget_url" type="text/x-renderjs-configuration">../officejs_setting_gadget/development/</script> <script data-renderjs-configuration="global_setting_gadget_url" type="text/x-renderjs-configuration">../officejs_setting_gadget/development/</script>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_bookmark_view_js.js
View file @ 29590cd7
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
var i, var i,
doc = gadget.options.doc, doc = gadget.options.doc,
now = new Date(); now = new Date();
doc.parent_relative_url = "bookmark_module"; doc.parent_relative_url = "url_module";
doc.portal_type = "Bookmark"; doc.portal_type = "Url";
doc.modification_date = now.toISOString(); doc.modification_date = now.toISOString();
for (i = 0; i < submit_event.target.length; i += 1) { for (i = 0; i < submit_event.target.length; i += 1) {
// XXX Should check input type instead // XXX Should check input type instead
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_bookmark_view_html.html → bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_url_view_html.html
View file @ 29590cd7
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
<script src="handlebars.js"></script> <script src="handlebars.js"></script>
<script class="view-web-page-template" type="text/x-handlebars-template"> <script class="view-web-page-template" type="text/x-handlebars-template">
<a href="{{url_string}}" style="display: block; text-align: center; font-size: 1.7em;">{{url_string}}</a> <a href="{{coordinate_text}}" style="display: block; text-align: center; font-size: 1.7em;">{{coordinate_text}}</a>
<form class="view-web-page-form"> <form class="view-web-page-form">
<div class="center"> <div class="center">
<div class="ui-field-contain"> <div class="ui-field-contain">
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
</div> </div>
<div class="ui-field-contain"> <div class="ui-field-contain">
<label data-i18n="Url:">Url:</label> <label data-i18n="Url:">Url:</label>
<input type="text" name="url_string" value="{{url_string}}"> <input type="text" name="coordinate_text" value="{{coordinate_text}}">
</div> </div>
<div class="ui-field-contain"> <div class="ui-field-contain">
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_bookmark_view_html.xml → bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_jio_url_view_html.xml
View file @ 29590cd7
...@@ -75,7 +75,7 @@ ...@@ -75,7 +75,7 @@
</item> </item>
<item> <item>
<key> <string>default_reference</string> </key> <key> <string>default_reference</string> </key>
<value> <string>gadget_officejs_jio_bookmark_view.html</string> </value> <value> <string>gadget_officejs_jio_url_view.html</string> </value>
</item> </item>
<item> <item>
<key> <string>description</string> </key> <key> <string>description</string> </key>
...@@ -85,7 +85,7 @@ ...@@ -85,7 +85,7 @@
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
<value> <string>gadget_officejs_jio_bookmark_view_html</string> </value> <value> <string>gadget_officejs_jio_url_view_html</string> </value>
</item> </item>
<item> <item>
<key> <string>language</string> </key> <key> <string>language</string> </key>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_add_bookmark_js.js
View file @ 29590cd7
...@@ -53,7 +53,7 @@ ...@@ -53,7 +53,7 @@
.push(function () { .push(function () {
var doc = { var doc = {
// XXX Hardcoded // XXX Hardcoded
url_string: gadget.props.options.url_string, coordinate_text: gadget.props.options.coordinate_text,
parent_relative_url: gadget.props.parent_relative_url, parent_relative_url: gadget.props.parent_relative_url,
portal_type: gadget.props.portal_type portal_type: gadget.props.portal_type
}; };
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_dispatcher_js.js
View file @ 29590cd7
...@@ -83,7 +83,7 @@ ...@@ -83,7 +83,7 @@
if (command === "add") { if (command === "add") {
return gadget.getUrlFor({ return gadget.getUrlFor({
page: "add_bookmark", page: "add_bookmark",
url_string: parameter coordinate_text: parameter
}).push(function (url) { }).push(function (url) {
window.location.href = url; window.location.href = url;
}); });
...@@ -91,12 +91,12 @@ ...@@ -91,12 +91,12 @@
query = { query = {
query: '(reference:"' + command + '")' query: '(reference:"' + command + '")'
+ ' AND portal_type:"' + portal_type + '"', + ' AND portal_type:"' + portal_type + '"',
select_list: ['url_string'] select_list: ['coordinate_text']
}; };
} else { } else {
query = { query = {
query: '(title:"%' + search + '%" OR url_string:"%' + search + '%" OR description:"%' + search + '%") AND portal_type:"' + portal_type + '"', query: '(title:"%' + search + '%" OR coordinate_text:"%' + search + '%" OR description:"%' + search + '%") AND portal_type:"' + portal_type + '"',
select_list: ['title', 'url_string', 'description'], select_list: ['title', 'coordinate_text', 'description'],
}; };
} }
return gadget.jio_allDocs(query) return gadget.jio_allDocs(query)
...@@ -109,7 +109,7 @@ ...@@ -109,7 +109,7 @@
} else if (result_list_length === 1 } else if (result_list_length === 1
&& (option.auto_redirect === true || command !== "")) { && (option.auto_redirect === true || command !== "")) {
// if 1 result, and redirect or command ,we go there // if 1 result, and redirect or command ,we go there
window.location.href = query_result.data.rows[0].value.url_string window.location.href = query_result.data.rows[0].value.coordinate_text
+ parameter; + parameter;
} }
else { else {
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_bookmark_list_js.js
View file @ 29590cd7
...@@ -91,7 +91,7 @@ ...@@ -91,7 +91,7 @@
select: 'title', select: 'title',
title: 'Title' title: 'Title'
}, { }, {
select: 'url_string', select: 'coordinate_text',
title: 'URL' title: 'URL'
}, { }, {
select: 'description', select: 'description',
...@@ -99,7 +99,7 @@ ...@@ -99,7 +99,7 @@
}], }],
query: { query: {
query: 'portal_type:("' + gadget.props.portal_type + '")', query: 'portal_type:("' + gadget.props.portal_type + '")',
select_list: ['reference', 'title', 'url_string', 'description'], select_list: ['reference', 'title', 'coordinate_text', 'description'],
limit: [0, 30], limit: [0, 30],
sort_on: [["modification_date", "descending"]] sort_on: [["modification_date", "descending"]]
} }
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js
View file @ 29590cd7
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
.push(function (answer_list) { .push(function (answer_list) {
gadget.props.portal_type = answer_list[0]; gadget.props.portal_type = answer_list[0];
// Hardcoded For Bookmark View // Hardcoded For Bookmark View
if (gadget.props.portal_type === "Bookmark") { if (gadget.props.portal_type === "Url") {
return gadget.redirect({"page": "bookmark_list" }); return gadget.redirect({"page": "bookmark_list" });
} }
gadget.props.document_title_plural = answer_list[1]; gadget.props.document_title_plural = answer_list[1];
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7