Commit 7d6826ea authored by Alain Takoudjou's avatar Alain Takoudjou

erp5_web_mynij_search: Minors fix, cleanup activities page and set return url to search page

parent 1100d054
......@@ -54,8 +54,8 @@
<li class="ui-first-child"><a href="{{mynij_search_href}}" class="ui-btn ui-btn-icon-left ui-icon-search" data-i18n="Search">Search</a></li>
<li><a href="{{source_list_href}}" class="ui-btn ui-btn-icon-left ui-icon-sitemap" data-i18n="Sources" accesskey="s">Sources</a></li>
<li><a href="{{activity_href}}" class="ui-btn ui-btn-icon-left ui-icon-magnet" data-i18n="Activities" accesskey="a">Activities</a></li>
<li><a href="{{sync_href}}" class="ui-btn ui-btn-icon-left ui-icon-refresh" data-i18n="Synchronize">Synchronize</a></li>
<li class="ui-last-child"><a href="https://www.erp5.com/mynij-HowTo.Install.And.Use.For.Search" target="_blank" class="ui-btn ui-btn-icon-left ui-icon-question" data-i18n="help">Help</a></li>
<!--<li><a href="{{sync_href}}" class="ui-btn ui-btn-icon-left ui-icon-refresh" data-i18n="Synchronize">Synchronize</a></li>-->
<li class="ui-last-child"><a href="https://blog.mynij.com/mynij-HowTo.Install.And.Use.For.Search" target="_blank" class="ui-btn ui-btn-icon-left ui-icon-question" data-i18n="help">Help</a></li>
</script>
<script id="panel-template-body-desktop" type="text/x-handlebars-template">
......
......@@ -238,7 +238,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>994.59702.18641.5717</string> </value>
<value> <string>995.15946.10561.1843</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -256,7 +256,7 @@
</tuple>
<state>
<tuple>
<float>1633359969.66</float>
<float>1634135767.72</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -593,7 +593,7 @@
console.log(result_list);
for (i = 0; i < result_list.data.rows.length; i += 1) {
let item = result_list.data.rows[i];
if (item.value.status !== "built") {
if (item.value.seed === "on" && item.value.status !== "built") {
promise_list.push(
notify("Cannot seed '" + item.value.title +
"', the source is not built!"));
......
......@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>995.17036.58458.56166</string> </value>
<value> <string>995.17038.8005.56661</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>1633425487.32</float>
<float>1633428415.41</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -3,26 +3,11 @@
(function (window, document, rJS, RSVP) {
var gadget;
rJS(window)
.setState({
torrent_gadget : null
})
.declareAcquiredMethod("updateHeader", "updateHeader")
.declareAcquiredMethod("getUrlParameter", "getUrlParameter")
.declareAcquiredMethod("getSetting", "getSetting")
.declareAcquiredMethod("getUrlFor", "getUrlFor")
.declareAcquiredMethod("updatePanel", "updatePanel")
/*.ready(function () {
var gadget = this;
return this.getDeclaredGadget("torrent")
.push(function (torrent) {
return gadget.changeState({
torrent_gadget: torrent
});
});
})*/
.onStateChange(function () {
})
......@@ -31,8 +16,13 @@
return gadget.updatePanel({view_action_dict: {}})
.push(function () {
return gadget.getUrlFor({command: 'display',
options: {page: "mynij_search"}});
})
.push(function (previous_url) {
return gadget.updateHeader({
page_title: "Mynij Activities"
page_title: "Return to Search",
selection_url: previous_url
});
});
});
......
......@@ -242,7 +242,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>994.60874.57737.41779</string> </value>
<value> <string>994.60877.7278.6229</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -260,7 +260,7 @@
</tuple>
<state>
<tuple>
<float>1632210066.65</float>
<float>1634246954.36</float>
<string>UTC</string>
</tuple>
</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