Commit 5b20a780 authored by Romain Courteaud's avatar Romain Courteaud

erp5_web_renderjs_ui: highlight current jump action

parent d5e928a1
......@@ -48,7 +48,8 @@
erp5_document: erp5_document,
editable: true,
jio_key: options.jio_key,
view: options.view
view: options.view,
jump_view: options.jump_view
})
]);
})
......
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>981.346.21600.55296</string> </value>
<value> <string>986.32404.49746.11571</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1578410546.67</float>
<float>1600354981.16</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -60,6 +60,7 @@
var erp5_document = options.erp5_document,
jio_key = options.jio_key,
view = options.view,
jump_view = options.jump_view,
visible = options.visible,
display_workflow_list,
context = this,
......@@ -102,7 +103,7 @@
action_list[i].class_name = action_list[i].href === view ? 'active' : '';
}
for (i = 0; i < jump_list.length; i += 1) {
jump_list[i].class_name = jump_list[i].href === view ? 'active' : '';
jump_list[i].class_name = ((jump_list[i].href === jump_view) || (jump_list[i].href === view)) ? 'active' : '';
}
}
// Prevent has much as possible to modify the DOM panel
......
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>986.32404.49746.11571</string> </value>
<value> <string>986.44167.44817.34355</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1600352235.33</float>
<float>1600355451.8</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -50,6 +50,7 @@
result_dict.jio_key = gadget.state.jio_key;
result_dict.view = result.view;
result_dict.page = "jump";
result_dict.jump_view = gadget.state.view;
}
} else {
......@@ -62,6 +63,7 @@
result_dict.jio_key = gadget.state.jio_key;
result_dict.view = result.view;
result_dict.page = "jump";
result_dict.jump_view = gadget.state.view;
} else {
command = 'push_history';
result_dict.jio_key = result.jio_key;
......
......@@ -234,7 +234,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>985.40438.63970.10154</string> </value>
<value> <string>986.49476.10141.22340</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -252,7 +252,7 @@
</tuple>
<state>
<tuple>
<float>1596199151.01</float>
<float>1600695820.08</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -63,6 +63,12 @@
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-scope='panel']//a[text()='Related Form' and contains(@class, 'active')]</td>
<td></td>
</tr>
<!-- Check the history link -->
<tr>
<td>click</td>
......
......@@ -65,6 +65,12 @@
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-scope='panel']//a[text()='Related Self' and contains(@class, 'active')]</td>
<td></td>
</tr>
<!-- Check the history link -->
<tr>
<td>click</td>
......
......@@ -50,6 +50,13 @@
<td>//div[@data-gadget-scope='panel']//a[text()='Metadata' and not(contains(@class, 'active'))]</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-scope='panel']//a[text()='Related Bar' and contains(@class, 'active')]</td>
<td></td>
</tr>
<tr>
<td>assertElementPresent</td>
<td>//div[@data-gadget-scope='header']//button[text()='Filter']</td>
......
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