[select2] bugfix

seahub/group/templates/group/group_manage.html

@@ -101,7 +101,7 @@
 
 <form id="group-transfer-form" method="post" action="{% url 'group_transfer' group.id %}" class="hide">{% csrf_token %}
     <h3>{% trans "Transfer Group To"%}</h3>
-    <input type="text" name="email" value="" /><br />
+    <input type="hidden" name="email" /><br />
     <p class="error hide"></p>
     <input type="submit" value="{% trans "Submit"%}" />
 </form>
@@ -164,14 +164,15 @@ addConfirmTo($(".rm-member"), {
 });
 
 $("#group-member-add, #group-admin-add").click(function() {
-    $('#' + $(this).attr('id') + '-form').modal({appendTo: "#main", focus:false});
+    var form = $('#' + $(this).attr('id') + '-form');
+    form.modal({appendTo: "#main", focus:false});
     $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
-});
 
-$('[name="user_name"]', $('#group-member-add-form, #group-admin-add-form')).select2($.extend({
+    $('[name="user_name"]', form).select2($.extend({
         width: '268px',
         placeholder: "{% trans "Search users or enter emails" %}"
-}, userInputOPtionsForSelect2('{% url 'search-user' %}')));
+    }, userInputOPtionsForSelect2('{% url 'search-user' %}')));
+});
 
 $('#group-member-add-form, #group-admin-add-form').submit(function() {
     var form = $(this);
@@ -209,14 +210,18 @@ $('#group-member-add-form, #group-admin-add-form').submit(function() {
 });
 
 $('#group-transfer').click(function() {
-    $('#group-transfer-form').modal({appendTo: "#main", focus:false});
+    var form = $('#group-transfer-form');
-    return false;
+    form.modal({appendTo: "#main", focus:false});
-});
+    $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
-$('[name="email"]', $('#group-transfer-form')).select2($.extend({
+
+    $('[name="email"]', form).select2($.extend({
         width: '268px',
         maximumSelectionSize: 1,
         placeholder: "{% trans "Search user or enter email" %}"
-}, userInputOPtionsForSelect2('{% url 'search-user' %}')));
+    }, userInputOPtionsForSelect2('{% url 'search-user' %}')));
+
+    return false;
+});
 
 $('#group-transfer-form').submit(function() {
     if (!$.trim($('[name="email"]', $(this)).val())) {

seahub/templates/repo_share_manage.html

@@ -7,9 +7,6 @@
 {% block extra_style %}
 <link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}" />
 <link rel="stylesheet" type="text/css" href="{% static "css/select2.custom.css" %}" />
-<style type="text/css">
-#left-panel { position: relative; }
-</style>
 {% endblock %}
 
 {% block left_panel %}
@@ -136,29 +133,29 @@
 {% block extra_script %}
 <script type="text/javascript" src="{% static "scripts/lib/select2-3.5.2.js" %}"></script>
 <script type="text/javascript">
-$(".repo-share-btn").click(function() {
-    $('#dir-private-share').modal({appendTo: "#main", focus:false});
-    $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
-});
-
-$('[name="emails"]', $('#dir-private-share')).select2($.extend({
-    placeholder: "{% trans "Search users or enter emails" %}",
-    width: '400px'
-}, userInputOPtionsForSelect2('{% url 'search-user' %}')));
-
 var g_opts = '';
 {% for group in request.user.joined_groups %}
 g_opts += '<option value="' + '{{ group.id}}'+ '" data-index="' + '{{forloop.counter0}}' + '">' + '{{ group.group_name}}' + '</option>';
 {% endfor %}
 
-$('[name="groups"]', $('#dir-private-share')).html(g_opts).select2({
+$(".repo-share-btn").click(function() {
+    var form = $('#dir-private-share');
+    form.modal({appendTo: "#main", focus:false});
+    $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
+
+    $('[name="emails"]', $('#dir-private-share')).select2($.extend({
+        placeholder: "{% trans "Search users or enter emails" %}",
+        width: '400px'
+    }, userInputOPtionsForSelect2('{% url 'search-user' %}')));
+
+    $('[name="groups"]', $('#dir-private-share')).html(g_opts).select2({
         placeholder: "{% trans "Select groups" %}",
         width: '400px',
         escapeMarkup: function(m) { return m; }
+    });
 });
 
 $('.submit', $('#dir-private-share')).click(function() {
-
     var form = $("#dir-private-share"),
         emails = $('[name="emails"]', form).val(), // string
         groups = $('[name="groups"]', form).val(), // null or [group.id]

seahub/templates/repo_transfer_owner.html

@@ -7,9 +7,6 @@
 {% block extra_style %}
 <link rel="stylesheet" type="text/css" href="{% static "css/select2-3.5.2.css" %}" />
 <link rel="stylesheet" type="text/css" href="{% static "css/select2.custom.css" %}" />
-<style type="text/css">
-#left-panel { position: relative; }
-</style>
 {% endblock %}
 
 {% block left_panel %}
@@ -38,7 +35,7 @@
     <div id="transfer-ownership" class="setting-item">
         <form id="repo-owner-form" action="" method="post" class="form">{% csrf_token %}
             <p>{% trans "Transfer this library to another user:" %}</p>
-            <input type="text" name="email" value="" /><br />
+            <input type="hidden" name="email" /><br />
             <p class="error hide"></p>
             <input type="submit" value="{% trans "Submit" %}" class="submit" />
         </form>

seahub/templates/sysadmin/repo_transfer_form.html

@@ -2,7 +2,7 @@
 <form id="repo-transfer-form" method="post" action="{% url 'sys_repo_transfer' %}" class="hide">{% csrf_token %}
     <h3>{% trans "Transfer Library"%}</h3>
     <p class="detail">{% trans "Transfer %(lib_name)s to:"%}</p>
-    <input type="text" name="email" /><br />
+    <input type="hidden" name="email" /><br />
     <input type="hidden" name="repo_id" value="" />
     <p class="error hide"></p>
     <input type="submit" value="{% trans "Submit" %}" class="submit" />

seahub/templates/sysadmin/repoadmin_js.html

@@ -1,11 +1,5 @@
 {% load i18n%}
 
-$('[name="email"]', $('#repo-transfer-form')).select2($.extend({
-    width: '268px',
-    maximumSelectionSize: 1,
-    placeholder: "{% trans "Search user or enter email" %}"
-}, userInputOPtionsForSelect2('{% url 'search-user' %}')));
-
 $('.repo-transfer-btn').click(function(){
     var btn_ct = $(this).parents('td'),
         repo_id = btn_ct.data('id'),
@@ -13,9 +7,18 @@ $('.repo-transfer-btn').click(function(){
         form = $('#repo-transfer-form');
 
     form.modal({appendTo:'#main'});
-    $('input[name="repo_id"]', form).val(repo_id);
+    $('#simplemodal-container').css({'width':'auto', 'height':'auto'});
+
     var detail = $('.detail', form);
     detail.html(detail.html().replace('%(lib_name)s', '<span class="op-target">' + HTMLescape(repo_name) + '</span>'));
+
+    $('[name="email"]', $('#repo-transfer-form')).select2($.extend({
+        width: '268px',
+        maximumSelectionSize: 1,
+        placeholder: "{% trans "Search user or enter email" %}"
+    }, userInputOPtionsForSelect2('{% url 'search-user' %}')));
+
+    $('input[name="repo_id"]', form).val(repo_id);
     return false;
 });
 
@@ -25,7 +28,6 @@ $('#repo-transfer-form').submit(function() {
         email = $.trim(form.children('[name="email"]').val());
 
     if (!email) {
-        apply_form_error(form_id, "{% trans "Please select or enter an email" %}");
         return false;
     }
 });