[881bf08aee]v.0.10.0 커밋까지 반영

hwe/js/ext.expand_city.js

@@ -330,16 +330,7 @@ $(function() {
                 //window.$html = $html;
                 
                 var cnt =0;
-                var $tmpTable = null;
-                $html.each(function(idx){
-                    if(this.tagName == "TABLE"){
-                        cnt+=1;
-                        if(cnt==5){
-                            $tmpTable = $(this);
-                            return false;
-                        }
-                    }
-                });
+                var $tmpTable = $html.filter('#officer_list').eq(0);
                 
                 $selects = $tmpTable.find("select");
                 if($selects.length == 0){

hwe/js/msg.js

@@ -385,7 +385,7 @@ function refreshMailboxList(obj){
 
             var $item = $('<option value="{0}">{1}</option>'.format(generalID, textName));
 
-            if(permissionLevel == 4 && isAmbassador){
+            if(permissionLevel == 4 && isAmbassador && myNation.mailbox != nation.mailbox){
                 $item.prop('disabled', true);
             }
             $optgroup.append($item);