From 4fecea04ce39cfaa2fda251040fb94083e997f0a Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 26 May 2016 08:55:09 +0800
Subject: [PATCH 1/3] * fix bug #838.

---
 module/tree/js/browse.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/tree/js/browse.js b/module/tree/js/browse.js
index 94895f6c29..50f70b93a9 100644
--- a/module/tree/js/browse.js
+++ b/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});
 });

From 267e8f3105551106e023ad72aa59432dd3c23e80 Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Thu, 26 May 2016 15:21:39 +0800
Subject: [PATCH 2/3] * update select chosen for group when creating a user.

---
 module/user/js/create.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/module/user/js/create.js b/module/user/js/create.js
index b24e605ba4..486fb56483 100644
--- a/module/user/js/create.js
+++ b/module/user/js/create.js
@@ -8,4 +8,5 @@ function changeGroup(role)
     {
         $('#group').val(''); 
     }
+    $('#group').trigger("chosen:updated");
 }

From 05b9b0b9b4a985a71aa98ec3792cb8ce5023c91a Mon Sep 17 00:00:00 2001
From: chenfeiCF <chenfei@qdphp.com>
Date: Fri, 27 May 2016 09:38:45 +0800
Subject: [PATCH 3/3] * update select chosen when batch creating users.

---
 module/user/js/batchcreate.js | 3 ++-
 module/user/js/create.js      | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/module/user/js/batchcreate.js b/module/user/js/batchcreate.js
index 1780fe989c..570f4b526e 100644
--- a/module/user/js/batchcreate.js
+++ b/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)
 {
diff --git a/module/user/js/create.js b/module/user/js/create.js
index 486fb56483..0adc074c5c 100644
--- a/module/user/js/create.js
+++ b/module/user/js/create.js
@@ -1,6 +1,6 @@
 function changeGroup(role)
 {
-    if(role || roleGroup[role])
+    if(role && roleGroup[role])
     {
         $('#group').val(roleGroup[role]); 
     }