[prev in list] [next in list] [prev in thread] [next in thread] 

List:       luci-commits
Subject:    [Luci-commits] [luci] luci: Fix display of OracleDB type
From:       rmccabe () fedoraproject ! org (Ryan McCabe)
Date:       2012-12-21 15:31:47
Message-ID: 20121221153147.E09F540CD () hosted02 ! fedoraproject ! org
[Download RAW message or body]

commit b4e7e5512ba75c0babd9cea7d718eb80a8796846
Author: Ryan McCabe <rmccabe at redhat.com>
Date:   Fri Dec 21 10:29:57 2012 -0500

    luci: Fix display of OracleDB type
    
    Fix the display of the OracleDB type attribute. Currently, it
    will always show "Default" even if something other than the
    default is selected.
    
    Patch from John Ruemker <jruemker at redhat.com>
    Signed-off-by: Ryan McCabe <rmccabe at redhat.com>

 luci/templates/resource_list.html |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/luci/templates/resource_list.html b/luci/templates/resource_list.html
index 1d2f5c6..e3097ae 100644
--- a/luci/templates/resource_list.html
+++ b/luci/templates/resource_list.html
@@ -1422,13 +1422,13 @@
         <select name="oracletype" class="serviceformselect"
           py:attrs="{'disabled':global_resource and 'disabled' or None}">
           <option value=""
-            py:attrs="(not res or not res.getAttribute('oracletype')) and \
{'selected':'selected'} or {}">Default</option> +            py:attrs="(not res or \
not res.getAttribute('type')) and {'selected':'selected'} or {}">Default</option>  \
                <option value="base"
-            py:attrs="res and res.getAttribute('oracletype') == 'base' and \
{'selected':'selected'} or {}">Database Instance and Listener Only</option> +         \
py:attrs="res and res.getAttribute('type') == 'base' and {'selected':'selected'} or \
{}">Database Instance and Listener Only</option>  <option value="base-em"
-            py:attrs="res and res.getAttribute('oracletype') == 'base-em' and \
{'selected':'selected'} or {}">Database, Listener, Enterprise Manager, and \
iSQL*Plus</option> +            py:attrs="res and res.getAttribute('type') == \
'base-em' and {'selected':'selected'} or {}">Database, Listener, Enterprise Manager, \
and iSQL*Plus</option>  <option value="ias"
-            py:attrs="res and res.getAttribute('oracletype') == 'ias' and \
{'selected':'selected'} or {}">Internet Application Server (Infrastructure)</option> \
+            py:attrs="res and res.getAttribute('type') == 'ias' and \
{'selected':'selected'} or {}">Internet Application Server (Infrastructure)</option>  \
</select>  </td>
     </tr>


[prev in list] [next in list] [prev in thread] [next in thread]