Merge branch 'master' of github.com:easysoft/zentaopms

module/tree/js/browse.js

@@ -73,6 +73,6 @@ function deleteItem(obj)
 $(document).ready(function()
 {
     toggleCopy();
-//    $("#submenucreate").modalTrigger({type: 'iframe', width: 500});
-//    $("#submenuedit").modalTrigger({type: 'iframe', width: 500});
+    $('[data-id="create"] a').modalTrigger({type: 'iframe', width: 500});
+    $('[data-id="edit"] a').modalTrigger({type: 'iframe', width: 500});
 });

module/user/js/batchcreate.js

@@ -1,6 +1,6 @@
 function changeGroup(role, i)
 {
-    if(role || roleGroup[role])
+    if(role && roleGroup[role])
     {
         $('#group' + i).val(roleGroup[role]); 
     }
@@ -8,6 +8,7 @@ function changeGroup(role, i)
     {
         $('#group' + i).val(''); 
     }
+    $('#group' + i).trigger('chosen:updated');
 }
 function toggleCheck(obj, i)
 {

module/user/js/create.js

@@ -1,6 +1,6 @@
 function changeGroup(role)
 {
-    if(role || roleGroup[role])
+    if(role && roleGroup[role])
     {
         $('#group').val(roleGroup[role]); 
     }
@@ -8,4 +8,5 @@ function changeGroup(role)
     {
         $('#group').val(''); 
     }
+    $('#group').trigger("chosen:updated");
 }