Skip to content

erp5
erp5
Commit cb3ed1c0 authored by hptk95's avatar hptk95 Committed by Papa Tamsir Kane
Browse files
Options

erp5_officejs: Bookmark Manager: Use Url module 

* bookmark module -> url module
* url_string -> coordinate_text
* do not use text_content
* fix required fields
parent a528c15c
Hide whitespace changes
Inline Side-by-side
Showing with 53 additions and 41 deletions
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_manager_appcache.xml
View file @ cb3ed1c0
...@@ -202,7 +202,7 @@ gadget_html5_textarea.js\n ...@@ -202,7 +202,7 @@ gadget_html5_textarea.js\n
gadget_erp5_field_checkbox.html\n gadget_erp5_field_checkbox.html\n
gadget_erp5_field_checkbox.js\n gadget_erp5_field_checkbox.js\n
gadget_officejs_bookmark_manager_router.html\n gadget_officejs_bookmark_manager_router.html\n
gadget_officejs_jio_bookmark_view.html\n gadget_officejs_jio_url_view.html\n
gadget_officejs_jio_bookmark_view.js\n gadget_officejs_jio_bookmark_view.js\n
gadget_erp5_page_ojs_add_bookmark.html\n gadget_erp5_page_ojs_add_bookmark.html\n
gadget_erp5_page_ojs_add_bookmark.js\n gadget_erp5_page_ojs_add_bookmark.js\n
...@@ -358,7 +358,7 @@ NETWORK:\n ...@@ -358,7 +358,7 @@ NETWORK:\n
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.40807.30284.14097</string> </value> <value> <string>961.50649.27654.34781</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -376,7 +376,7 @@ NETWORK:\n ...@@ -376,7 +376,7 @@ NETWORK:\n
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1503579323.73</float> <float>1504181844.13</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_manager_router_html.html
View file @ cb3ed1c0
...@@ -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="erp5_attachment_synchro" type="text/x-renderjs-configuration"></script> <script data-renderjs-configuration="erp5_attachment_synchro" type="text/x-renderjs-configuration"></script>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_manager_router_html.xml
View file @ cb3ed1c0
...@@ -275,7 +275,7 @@ ...@@ -275,7 +275,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.16277.24517.44253</string> </value> <value> <string>961.49448.1356.36437</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -293,7 +293,7 @@ ...@@ -293,7 +293,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1503648762.54</float> <float>1504096072.75</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_add_bookmark_js.js
View file @ cb3ed1c0
...@@ -72,14 +72,14 @@ ...@@ -72,14 +72,14 @@
"hidden": 0, "hidden": 0,
"type": "StringField" "type": "StringField"
}, },
"my_url_string": { "my_coordinate_text": {
"description": "", "description": "",
"title": "Url", "title": "Url",
"default": options.url_string || "", "default": options.coordinate_text || "",
"css_class": "", "css_class": "",
"required": 1, "required": 1,
"editable": 1, "editable": 1,
"key": "url_string", "key": "coordinate_text",
"hidden": 0, "hidden": 0,
"type": "StringField" "type": "StringField"
}, },
...@@ -127,7 +127,7 @@ ...@@ -127,7 +127,7 @@
form_definition: { form_definition: {
group_list: [[ group_list: [[
"left", "left",
[["my_reference"], ["my_title"], ["my_url_string"], ["my_description"], [["my_reference"], ["my_title"], ["my_coordinate_text"], ["my_description"],
["my_portal_type"], ["my_parent_relative_url"]] ["my_portal_type"], ["my_parent_relative_url"]]
]] ]]
} }
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_add_bookmark_js.xml
View file @ cb3ed1c0
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.40804.27282.46165</string> </value> <value> <string>961.49495.38480.31197</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>1503577300.12</float> <float>1504099935.87</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 @ cb3ed1c0
...@@ -25,22 +25,22 @@ ...@@ -25,22 +25,22 @@
command: 'display', command: 'display',
options: { options: {
page: "ojs_add_bookmark", page: "ojs_add_bookmark",
url_string: parameter coordinate_text: parameter
} }
}); });
} }
query = { query = {
query: '(reference:"' + command + '")' + query: '(reference:"' + command + '")' +
' AND portal_type:"' + gadget.state.portal_type + '"', ' AND portal_type:"' + gadget.state.portal_type + '"',
select_list: ['url_string'] select_list: ['coordinate_text']
}; };
} else { } else {
query = { query = {
query: '(title:"%' + search + query: '(title:"%' + search +
'%" OR url_string:"%' + search + '%" OR coordinate_text:"%' + search +
'%" OR description:"%' + search + '%" OR description:"%' + search +
'%") AND portal_type:"' + gadget.state.portal_type + '"', '%") AND portal_type:"' + gadget.state.portal_type + '"',
select_list: ['title', 'url_string', 'description'] select_list: ['title', 'coordinate_text', 'description']
}; };
} }
return gadget.jio_allDocs(query) return gadget.jio_allDocs(query)
...@@ -65,7 +65,7 @@ ...@@ -65,7 +65,7 @@
return gadget.redirect({ return gadget.redirect({
command: 'raw', command: 'raw',
options: { options: {
url: query_result.data.rows[0].value.url_string + url: query_result.data.rows[0].value.coordinate_text +
parameter parameter
} }
}); });
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_dispatcher.js.xml
View file @ cb3ed1c0
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.10293.23355.24473</string> </value> <value> <string>961.49415.17092.22306</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>1501746582.52</float> <float>1504099409.68</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_list_js.js
View file @ cb3ed1c0
...@@ -38,7 +38,7 @@ ...@@ -38,7 +38,7 @@
var column_list = [ var column_list = [
['reference', 'Reference'], ['reference', 'Reference'],
['title', 'Title'], ['title', 'Title'],
['url_string', 'Url'], ['coordinate_text', 'Url'],
['description', 'Description'] ['description', 'Description']
]; ];
return result[0].render({ return result[0].render({
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_page_list_js.xml
View file @ cb3ed1c0
...@@ -242,7 +242,7 @@ ...@@ -242,7 +242,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.9215.4122.51694</string> </value> <value> <string>961.49415.17092.22306</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>1501746703.37</float> <float>1504099713.54</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_view_html.html
View file @ cb3ed1c0
...@@ -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>
</script> </script>
<script src="gadget_officejs_jio_bookmark_view.js"></script> <script src="gadget_officejs_jio_bookmark_view.js"></script>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_view_html.xml
View file @ cb3ed1c0
...@@ -63,6 +63,14 @@ ...@@ -63,6 +63,14 @@
</tuple> </tuple>
</value> </value>
</item> </item>
<item>
<key> <string>categories</string> </key>
<value>
<tuple>
<string>classification/collaborative/team</string>
</tuple>
</value>
</item>
<item> <item>
<key> <string>content_md5</string> </key> <key> <string>content_md5</string> </key>
<value> <value>
...@@ -75,7 +83,7 @@ ...@@ -75,7 +83,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>
...@@ -97,6 +105,12 @@ ...@@ -97,6 +105,12 @@
<key> <string>portal_type</string> </key> <key> <string>portal_type</string> </key>
<value> <string>Web Page</string> </value> <value> <string>Web Page</string> </value>
</item> </item>
<item>
<key> <string>short_title</string> </key>
<value>
<none/>
</value>
</item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>OfficeJS Jio Bookmark View</string> </value> <value> <string>OfficeJS Jio Bookmark View</string> </value>
...@@ -236,7 +250,7 @@ ...@@ -236,7 +250,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.8981.40656.43178</string> </value> <value> <string>961.49484.34054.54169</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +268,7 @@ ...@@ -254,7 +268,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1501746717.77</float> <float>1504098066.74</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_view_js.js
View file @ cb3ed1c0
...@@ -45,10 +45,8 @@ ...@@ -45,10 +45,8 @@
doc = content; doc = content;
content.portal_type = gadget.state.doc.portal_type; content.portal_type = gadget.state.doc.portal_type;
content.parent_relative_url = gadget.state.doc.parent_relative_url; content.parent_relative_url = gadget.state.doc.parent_relative_url;
content.text_content = gadget.state.doc.text_content;
} else { } else {
doc = gadget.state.doc; doc = gadget.state.doc;
doc.text_content = content.text_content;
} }
doc.modification_date = (new Date()).toUTCString(); doc.modification_date = (new Date()).toUTCString();
return gadget.jio_put(gadget.state.jio_key, doc); return gadget.jio_put(gadget.state.jio_key, doc);
...@@ -68,7 +66,7 @@ ...@@ -68,7 +66,7 @@
var gadget = this; var gadget = this;
return new RSVP.Queue() return new RSVP.Queue()
.push(function () { .push(function () {
return gadget.translateHtml(template({url_string: gadget.state.doc.url_string})); return gadget.translateHtml(template({coordinate_text: gadget.state.doc.coordinate_text}));
}) })
.push(function (html) { .push(function (html) {
gadget.element.querySelector('.template-view').innerHTML = html; gadget.element.querySelector('.template-view').innerHTML = html;
...@@ -94,20 +92,20 @@ ...@@ -94,20 +92,20 @@
"title": "Title", "title": "Title",
"default": gadget.state.doc.title, "default": gadget.state.doc.title,
"css_class": "", "css_class": "",
"required": 1, "required": 0,
"editable": 1, "editable": 1,
"key": "title", "key": "title",
"hidden": 0, "hidden": 0,
"type": "StringField" "type": "StringField"
}, },
"my_url_string": { "my_coordinate_text": {
"description": "", "description": "",
"title": "Url", "title": "Url",
"default": gadget.state.doc.url_string, "default": gadget.state.doc.coordinate_text,
"css_class": "", "css_class": "",
"required": 0, "required": 1,
"editable": 1, "editable": 1,
"key": "url_string", "key": "coordinate_text",
"hidden": 0, "hidden": 0,
"type": "StringField" "type": "StringField"
}, },
...@@ -133,7 +131,7 @@ ...@@ -133,7 +131,7 @@
form_definition: { form_definition: {
group_list: [[ group_list: [[
"left", "left",
[["my_reference"], ["my_title"], ["my_url_string"], ["my_description"]] [["my_reference"], ["my_title"], ["my_coordinate_text"], ["my_description"]]
]] ]]
} }
}); });
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_bookmark_view_js.xml
View file @ cb3ed1c0
...@@ -236,7 +236,7 @@ ...@@ -236,7 +236,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>961.40803.35937.59409</string> </value> <value> <string>961.50752.48497.40618</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -254,7 +254,7 @@ ...@@ -254,7 +254,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1503577301.58</float> <float>1504174258.05</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.js
View file @ cb3ed1c0
...@@ -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];
......
bt5/erp5_officejs/PathTemplateItem/web_page_module/gadget_officejs_page_document_list_js.xml
View file @ cb3ed1c0
...@@ -267,7 +267,7 @@ ...@@ -267,7 +267,7 @@
</item> </item>
<item> <item>
<key> <string>serial</string> </key> <key> <string>serial</string> </key>
<value> <string>959.44888.46554.50039</string> </value> <value> <string>961.49452.62475.34167</string> </value>
</item> </item>
<item> <item>
<key> <string>state</string> </key> <key> <string>state</string> </key>
...@@ -285,7 +285,7 @@ ...@@ -285,7 +285,7 @@
</tuple> </tuple>
<state> <state>
<tuple> <tuple>
<float>1498035961.94</float> <float>1504096141.96</float>
<string>UTC</string> <string>UTC</string>
</tuple> </tuple>
</state> </state>
......
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