Index: /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.init.controller.js
===================================================================
--- /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.init.controller.js	(revision 2502)
+++ /branches/amp_3_7/src/webui/webui/htdocs/new/src/client/app/modules/configuration/modal/config.init.controller.js	(working copy)
@@ -23,21 +23,15 @@
             var device_type = $rootScope.__initKey__.device_type;
             var deviceList = [];
             _.each($rootScope.__deviceList__, function(device) {
-                if (device.type == device_type) {
+                if (device.type === device_type) {
                     deviceList.push(device);
                 }
             })
             initViewModal.deviceList = deviceList;
-            if (initViewModal.deviceList.length > 0) {
-                initViewModal.deviceList.unshift({"name": "ALL"})
-            }
 
             deviceGroupService.getDeviceGroup().then(function (res) {
                 if (res && res.status === 200) {
                     initViewModal.deviceGroupList = $filter("FG")(res.data);
-                    if (initViewModal.deviceGroupList.length > 0) {
-                        initViewModal.deviceGroupList.unshift({"name": "ALL"})
-                    }
                 } else {
                     initViewModal.deviceGroupList = [];
                 }
@@ -46,33 +40,11 @@
 
             initViewModal.is_vpn_customize = false;
             var device_type_info = localStorageService.getWebStorage("device_type_info");
-            if (device_type_info.VPN_TYPE_LIST.indexOf(device_type.toLowerCase()) != -1) {
-                if (initViewModal.file_type == 'customize') {
+            if (device_type_info.VPN_TYPE_LIST.indexOf(device_type.toLowerCase()) !== -1) {
+                if (initViewModal.file_type === 'customize') {
                     initViewModal.is_vpn_customize = true;
                 }
             }
-            // if (initViewModal.is_vpn_customize) {
-            //     initViewModal.vsiteList = [];
-            //     _.each(initViewModal.deviceList, function(device){
-            //         initViewModal.vsiteList.push({
-            //             "value":device.name+'"global',
-            //             "display":"Global ("+device.name+")"
-            //         });
-            //         configService.getDeviceCofigVsites(device.name).then(function (res) {
-            //             if (res && res.status === 200) {
-            //                 if (res.data[0]) {
-            //                     _.each(res.data[1], function(vs) {
-            //                         initViewModal.vsiteList.push({
-            //                             "value":device.name+'"'+vs.name,
-            //                             "display":vs.name+" ("+device.name+")"
-            //                         });
-            //                     });
-            //                     initViewModal.vpn_data_ready = true;
-            //                 }
-            //             }
-            //         });
-            //     });
-            // }
 
             // init option
             initViewModal.option = 'immediate';
@@ -90,7 +62,7 @@
             initViewModal.click_device = function () {
                 initViewModal.showDeviceTab = true;
             };
-    
+
             initViewModal.click_device_group = function () {
                 initViewModal.showDeviceTab = false;
             };
@@ -145,3 +117,4 @@
 
         }
     ])
+