refactor(frontend): machine settings ldap and copy faster

Klius · Nov 21, 2018 · e54c167 · e54c167
1 parent 7a02e42
commit e54c167
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/public/js/ravada.js b/public/js/ravada.js
@@ -165,10 +165,13 @@
                 $http.get('/machine/info/'+$scope.showmachineId+'.json')
                     .then(function(response) {
                             $scope.showmachine=response.data;
-                    $scope.new_name=$scope.showmachine.name+"-2";
-                    $scope.validate_new_name($scope.showmachine.name);
-                    $scope.refresh_machine();
-                    $scope.init_ldap_access();
+                            if (typeof $scope.new_name == 'undefined' ) {
+                                $scope.new_name=$scope.showmachine.name+"-2";
+                                $scope.validate_new_name($scope.showmachine.name);
+                            }
+                            $scope.refresh_machine();
+                            $scope.init_ldap_access();
+                            $scope.list_ldap_attributes();
                 });
           };
           $scope.domain_remove = 0;
@@ -408,7 +411,7 @@
             });
           };
           $scope.getReqs();
-
+          $scope.list_ldap_attributes();
         };
 
     function swListMach() {

diff --git a/templates/main/machine_access.html.ep b/templates/main/machine_access.html.ep
@@ -2,7 +2,7 @@
     <div class="panel-body">
         Type a typical LDAP user name to fetch the attribute list
         <input type="text" ng-model="cn" ng-change="list_ldap_attributes()"
-        ng-init="cn='<%= $ldap_attributes_cn %>';list_ldap_attributes()">
+        ng-init="cn='<%= $ldap_attributes_cn %>'">
         <span ng-hide="ldap_attributes || !cn">
             User name <b>{{cn}}</b> not found in LDAP server
         </span>