Commit fc437828 authored by Łukasz Nowak's avatar Łukasz Nowak

Support software type.

parent 4e634b9b
...@@ -68,6 +68,9 @@ if computer:\n ...@@ -68,6 +68,9 @@ if computer:\n
<parameter id="computer_guid">%s</parameter>\n <parameter id="computer_guid">%s</parameter>\n
</instance>""" % computer\n </instance>""" % computer\n
\n \n
\n
request_kw[\'software_type\'] = software_type or \'RootSoftwareInstance\'\n
\n
person.requestSoftwareInstance(**request_kw)\n person.requestSoftwareInstance(**request_kw)\n
\n \n
return True\n return True\n
...@@ -77,7 +80,7 @@ return True\n ...@@ -77,7 +80,7 @@ return True\n
</item> </item>
<item> <item>
<key> <string>_params</string> </key> <key> <string>_params</string> </key>
<value> <string>software_release_url, title, instance_xml, computer</string> </value> <value> <string>software_release_url, title, instance_xml, computer, software_type</string> </value>
</item> </item>
<item> <item>
<key> <string>id</string> </key> <key> <string>id</string> </key>
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<dictionary> <dictionary>
<item> <item>
<key> <string>_EtagSupport__etag</string> </key> <key> <string>_EtagSupport__etag</string> </key>
<value> <string>ts21635113.33</string> </value> <value> <string>ts21871310.83</string> </value>
</item> </item>
<item> <item>
<key> <string>__name__</string> </key> <key> <string>__name__</string> </key>
...@@ -94,12 +94,14 @@ function processRequest(event) {\n ...@@ -94,12 +94,14 @@ function processRequest(event) {\n
url = $(\'#url\').val();\n url = $(\'#url\').val();\n
title = $(\'#software_instance_title\').val();\n title = $(\'#software_instance_title\').val();\n
xml = $(\'#software_instance_xml\').val();\n xml = $(\'#software_instance_xml\').val();\n
software_type = $(\'#software_type\').val();\n
\n \n
$.post(vifib[\'site_url\'] + "/ERP5Site_requestComputerPartitionAsJSON", {\n $.post(vifib[\'site_url\'] + "/ERP5Site_requestComputerPartitionAsJSON", {\n
\'software_release_url\': url,\n \'software_release_url\': url,\n
\'title\': title,\n \'title\': title,\n
\'instance_xml\': xml,\n \'instance_xml\': xml,\n
\'computer\': computer\n \'computer\': computer,\n
\'software_type\': software_type\n
},\n },\n
function () {\n function () {\n
alert(\'Your Software Instance has been requested\');\n alert(\'Your Software Instance has been requested\');\n
...@@ -121,6 +123,14 @@ function drawRequest(data) {\n ...@@ -121,6 +123,14 @@ function drawRequest(data) {\n
title_a.attr(\'id\', \'software_instance_title\');\n title_a.attr(\'id\', \'software_instance_title\');\n
title_a.addClass(\'software_release_input\');\n title_a.addClass(\'software_release_input\');\n
title_q.append(title_a);\n title_q.append(title_a);\n
\n
type_q = $(\'<div>\');\n
type_q.html(\'Software Type:\');\n
js_container.append(type_q);\n
type_a = $(\'<input type="text">\');\n
type_a.attr(\'id\', \'software_type\');\n
type_a.addClass(\'software_release_input\');\n
type_q.append(type_a);\n
\n \n
xml_q = $(\'<div>\');\n xml_q = $(\'<div>\');\n
xml_q.html(\'Parameter XML:\');\n xml_q.html(\'Parameter XML:\');\n
...@@ -129,6 +139,7 @@ function drawRequest(data) {\n ...@@ -129,6 +139,7 @@ function drawRequest(data) {\n
xml_a.attr(\'id\', \'software_instance_xml\');\n xml_a.attr(\'id\', \'software_instance_xml\');\n
xml_a.addClass(\'software_release_input\');\n xml_a.addClass(\'software_release_input\');\n
xml_q.append(xml_a)\n xml_q.append(xml_a)\n
\n
computer_q = $(\'<div>\');\n computer_q = $(\'<div>\');\n
computer_q.html(\'Computer:\');\n computer_q.html(\'Computer:\');\n
js_container.append(computer_q);\n js_container.append(computer_q);\n
...@@ -218,7 +229,7 @@ function hashController ()\n ...@@ -218,7 +229,7 @@ function hashController ()\n
</item> </item>
<item> <item>
<key> <string>size</string> </key> <key> <string>size</string> </key>
<value> <int>5456</int> </value> <value> <int>5771</int> </value>
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
......
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