瀏覽代碼

AMBARI-2151. Incorrect error message for invalid user name. (yusaku)

git-svn-id: https://svn.apache.org/repos/asf/incubator/ambari/trunk@1483616 13f79535-47bb-0310-9956-ffa450edef68
Yusaku Sako 12 年之前
父節點
當前提交
e6585d4f53

+ 2 - 0
CHANGES.txt

@@ -862,6 +862,8 @@ Trunk (unreleased changes):
 
  BUG FIXES
 
+ AMBARI-2151. Incorrect error message for invalid user name. (yusaku)
+
  AMBARI-2149. Ambari needs to set right path for GC log directory of Hbase
  process. (mahadev)
 

+ 0 - 1
ambari-web/app/controllers/main/service/info/configs.js

@@ -698,7 +698,6 @@ App.MainServiceInfoConfigsController = Em.Controller.extend({
           } else {
             uhc = self.getHostComponentsByStatus([self.get('content'), App.Service.find('MAPREDUCE')], App.HostComponentStatus.unknown);
           }
-          debugger;
           unknownHosts = uhc.hosts;
           unknownComponentCount = uhc.componentCount;
         } else {

+ 1 - 1
ambari-web/app/messages.js

@@ -177,7 +177,7 @@ Em.I18n.translations = {
   'graphs.timeRange.month': 'Last 1 month',
   'graphs.timeRange.year': 'Last 1 year',
 
-  'users.userName.validationFail': 'Value should contains only letters and digits and start with letter',
+  'users.userName.validationFail': 'Only lowercase letters and numbers are allowed; must start with a letter',
 
   'services.nagios.description':'Nagios Monitoring and Alerting system',
   'services.ganglia.description':'Ganglia Metrics Collection system',

+ 0 - 16
ambari-web/app/utils/http_client.js

@@ -46,7 +46,6 @@ App.HttpClient = Em.Object.create({
    * @param {Object} ajaxOptions
    * @param {App.ServerDataMapper} mapper - json processor
    * @param {function} errorHandler
-   * @param {number} interval - frequecy request
    */
   request: function (url, ajaxOptions, mapper, errorHandler) {
 
@@ -133,19 +132,4 @@ App.HttpClient = Em.Object.create({
   post: function (url, data, mapper, errorHandler, interval) {
     this.get(url, data, mapper, errorHandler, interval);
   }
-
-//  not realized yet
-//  put:function (url, mapper, errorHandler) {
-//    this.request(url, {}, mapper, errorHandler);
-//  },
-//
-//  delete:function (url, mapper, errorHandler) {
-//    this.request(url, {}, mapper, errorHandler);
-//  }
 });
-
-/*App.HttpClient.get(
- 'http://nagiosserver/hdp/nagios/nagios_alerts.php?q1=alerts&alert_type=all',
- App.alertsMapper,
- { dataType: 'jsonp', jsonp: 'jsonp' }
- );*/