Commit 7cb23b7d authored by Vivek's avatar Vivek

erp5_gadget_interface_validator: updated URL navigation handling to follow...

erp5_gadget_interface_validator: updated URL navigation handling to follow modified erp5 launcher and router logic.
parent de4cc11e
......@@ -501,8 +501,8 @@
declared_method_list.push(item);\n
} \n
return RSVP.all([\n
declared_method_list,\n
gadget.getDeclaredMethodList()\n
declared_method_list //,\n
// gadget.getDeclaredMethodList()\n
]); \n
})\n
\n
......@@ -896,7 +896,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>946.46204.46630.51746</string> </value>
<value> <string>946.46289.58152.58624</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -914,7 +914,7 @@
</tuple>
<state>
<tuple>
<float>1445960753.22</float>
<float>1446475754.4</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -205,12 +205,16 @@
if(gadget_list.length > 0) {\n
var page_type = fetchPageType(gadget_list[0]);\n
return gadget.redirect({\n
page: page_type,\n
appcache_url: appcache_url\n
command: \'change\',\n
options: {\n
page: page_type,\n
appcache_url: appcache_url\n
}\n
});\n
} else {\n
return gadget.redirect({\n
found: false\n
command: \'change\',\n
options: {found: false}\n
});\n
}\n
});\n
......@@ -361,7 +365,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>946.46360.38047.28279</string> </value>
<value> <string>946.46361.42674.38161</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -379,7 +383,7 @@
</tuple>
<state>
<tuple>
<float>1445965059.05</float>
<float>1446476000.92</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -200,7 +200,7 @@
}\n
\n
function updateReportData(gadget, report_data) {\n
var id = "#" + report_data.id,\n
var id = "#" + report_data.id.replace(\'/\',\'\\\\/\'),\n
update_element = gadget.props.content_element.querySelector(id),\n
interface_data = \'\',\n
validation_status = report_data.validation_status,\n
......@@ -299,7 +299,8 @@
return validateAppGadgetList(gadget, gadget_list);\n
}, function(error) {\n
return gadget.redirect({\n
found: false\n
command: \'change\',\n
options: {found: false, page: \'form\'}\n
});\n
});\n
})\n
......@@ -472,7 +473,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>946.46341.46226.26060</string> </value>
<value> <string>946.49108.59205.8413</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -490,7 +491,7 @@
</tuple>
<state>
<tuple>
<float>1445965003.93</float>
<float>1446476069.46</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -140,7 +140,7 @@
<script id="panel-template-body" type="text/x-handlebars-template">\n
<div class="ui-content">\n
<ul data-role="listview" class="ui-listview">\n
<li><a href="#page=form" data-i18n="Interface Validation Form">Interface Validation Form</a></li>\n
<li><a href="#/?page=form" data-i18n="Interface Validation Form">Interface Validation Form</a></li>\n
</ul>\n
</div>\n
</script>\n
......@@ -289,7 +289,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>946.44766.36269.12373</string> </value>
<value> <string>946.44825.62507.52206</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -307,7 +307,7 @@
</tuple>
<state>
<tuple>
<float>1445872917.21</float>
<float>1446476148.07</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -156,6 +156,10 @@
.declareMethod(\'toggle\', function () {\n
this.props.jelement.panel("toggle");\n
})\n
\n
.declareMethod(\'close\', function () {\n
this.props.jelement.panel("close");\n
})\n
\n
.declareMethod(\'render\', function () {\n
return;\n
......@@ -334,7 +338,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>946.44742.21501.55296</string> </value>
<value> <string>946.44742.30838.38775</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -352,7 +356,7 @@
</tuple>
<state>
<tuple>
<float>1445867908.17</float>
<float>1446476219.73</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -121,6 +121,7 @@
\n
</head>\n
<body>\n
<div data-gadget-url="gadget_jio.html" data-gadget-scope="jio_selection"></div>\n
</body>\n
</html>
......@@ -259,7 +260,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>946.44747.45157.45653</string> </value>
<value> <string>946.44766.54929.30600</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -277,7 +278,7 @@
</tuple>
<state>
<tuple>
<float>1445869370.23</float>
<float>1446476270.36</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -426,7 +426,7 @@
</item>
<item>
<key> <string>configuration_jio_gadget_url</string> </key>
<value> <string>gadget_officejs_jio.html</string> </value>
<value> <string>gadget_erp5_jio.html</string> </value>
</item>
<item>
<key> <string>configuration_manifest_url</string> </key>
......@@ -442,7 +442,7 @@
</item>
<item>
<key> <string>configuration_translation_gadget_url</string> </key>
<value> <string>gadget_officejs_translation.html</string> </value>
<value> <string>gadget_translation.html</string> </value>
</item>
<item>
<key> <string>configuration_view_action_category</string> </key>
......@@ -741,7 +741,7 @@
</item>
<item>
<key> <string>serial</string> </key>
<value> <string>946.44750.63239.42905</string> </value>
<value> <string>946.44751.34537.43673</string> </value>
</item>
<item>
<key> <string>state</string> </key>
......@@ -759,7 +759,7 @@
</tuple>
<state>
<tuple>
<float>1445868451.61</float>
<float>1446476438.92</float>
<string>UTC</string>
</tuple>
</state>
......
......@@ -44,7 +44,7 @@
</head>\n
<body>\n
<table cellpadding="1" cellspacing="1" border="1">\n
<thead>in\n
<thead>\n
<tr><td rowspan="1" colspan="3">Test Gadget Interface Validation UI</td></tr>\n
</thead><tbody>\n
<tal:block metal:use-macro="here/Zuite_CommonTemplate/macros/init" />\n
......@@ -80,7 +80,7 @@
</tr>\n
<tr>\n
<td>click</td>\n
<td>//input[@name=\'Submit\']</td>t\n
<td>//input[@name=\'Submit\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -160,7 +160,7 @@
</tr>\n
<tr>\n
<td>click</td>\n
<td>//a[@data-i18n=\'Interface Validation Form\']</td>inp\n
<td>//a[@data-i18n=\'Interface Validation Form\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -168,11 +168,6 @@
<td>//form[@class=\'interface-validation-form\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>click</td>\n
<td>//input[@data-i18n=\'[value]Close\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>type</td>\n
<td>name=appcache_url</td>\n
......@@ -180,7 +175,7 @@
</tr>\n
<tr>\n
<td>click</td>\n
<td>//input[@name=\'Submit\']</td>t\n
<td>//input[@name=\'Submit\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -205,7 +200,7 @@
</tr>\n
<tr>\n
<td>click</td>\n
<td>//a[@data-i18n=\'Home\']</td>inp\n
<td>//a[@data-i18n=\'Home\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
......@@ -213,11 +208,6 @@
<td>//form[@class=\'interface-validation-form\']</td>\n
<td></td>\n
</tr>\n
<tr>\n
<td>click</td>\n
<td>//input[@data-i18n=\'[value]Close\']</td>\n
<td></td>\n
</tr>\n
</tbody></table>\n
</body>\n
</html>
......
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