Index: luci/cluster/resource-form-macros =================================================================== RCS file: /cvs/cluster/conga/luci/cluster/resource-form-macros,v retrieving revision 1.21.2.16 diff -u -r1.21.2.16 resource-form-macros --- a/luci/cluster/resource-form-macros 21 May 2009 13:32:04 -0000 1.21.2.16 +++ b/luci/cluster/resource-form-macros 7 Aug 2010 03:14:12 -0000 @@ -1495,6 +1495,27 @@ value res/attrs/home | nothing" /> </td> </tr> + <tr> + <td>Oracle installation type</td> + <td> + <select name="oracletype" + tal:attributes="disabled python: editDisabled" + tal:define="odbtype res/attrs/type | string:default"> + <option name="default" value="default" + tal:content="string:Default" + tal:attributes="selected python:odbtype == 'default' and 'selected'"/> + <option value="base" + tal:content="string:Database Instance and Listener only" + tal:attributes="selected python:odbtype == 'base' and 'selected'"/> + <option value="base-em" + tal:content="string:Database, Listener, Enterprise Manager, and iSQL*Plus" + tal:attributes="selected python:odbtype in ('10g', 'base-em') and 'selected'"/> + <option value="ias" + tal:content="string:Internet Application Server (Infrastructure)" + tal:attributes="selected python:odbtype in ('ias', '10g-ias') and 'selected'"/> + </select> + </td> + </tr> <tr class="systemsTable"> <td class="systemsTable">Virtual hostname (optional)</td> <td class="systemsTable"> Index: luci/site/luci/Extensions/ResourceHandler.py =================================================================== RCS file: /cvs/cluster/conga/luci/site/luci/Extensions/ResourceHandler.py,v retrieving revision 1.1.4.9 diff -u -r1.1.4.9 ResourceHandler.py --- a/luci/site/luci/Extensions/ResourceHandler.py 7 Jan 2010 18:08:35 -0000 1.1.4.9 +++ b/luci/site/luci/Extensions/ResourceHandler.py 7 Aug 2010 03:14:12 -0000 @@ -804,13 +804,17 @@ params = ( ('user', 'Oracle User Name', True, None), ('home', 'Oracle Home Directory', True, None), - #('type', 'Oracle Installation Type', True, None), + ('oracletype', 'Oracle Installation Type', False, None), ('vhost', 'Virtual Hostname', False, None) ) errors = config_resource(params, res, rname, form) - dbtype = res.getAttribute('type') - if not dbtype: - res.addAttribute('type', '10g') + dbtype = res.getAttribute('oracletype') + res.removeAttribute('type') + if dbtype: + res.removeAttribute('oracletype') + dbtype = dbtype.lower() + if dbtype in ('base', 'base-em', '10g', 'ias', '10g-ias'): + res.addAttribute('type', dbtype) return errors resource_table = {