public_html/js

[Aleksander Machniak]

 public_html/js/kolab_admin.js |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

New commits:
commit 503768db5edc109fde0711ff5b94dd96cbaea188
Author: Aleksander Machniak <alec at alec.pl>
Date:   Fri Oct 12 13:35:49 2012 +0200

    Fix attribute form initialization on attribute edit

diff --git a/public_html/js/kolab_admin.js b/public_html/js/kolab_admin.js
index 09da5f8..b7fff8a 100644
--- a/public_html/js/kolab_admin.js
+++ b/public_html/js/kolab_admin.js
@@ -1785,7 +1785,7 @@ function kolab_admin()
   {
     var name_select = $('select[name="attr_name"]'),
       data = attr ? this.env.attr_table[attr] : {},
-      type = data.type ? data.type : 'text';
+      type = data.type || 'text';
 
     $('select[name="attr_type"]').val(type);
     $('select[name="attr_value"]').val(attr ? data.valtype : 'normal');
@@ -1799,7 +1799,6 @@ function kolab_admin()
       name_select.hide().val(attr);
       $('<span></span>').text(this.env.attributes[attr] ? this.env.attributes[attr] : attr)
         .appendTo(name_select.parent());
-      return;
     }
     else {
       this.type_attr_select_init();