You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ambari.apache.org by yu...@apache.org on 2013/05/17 02:27:57 UTC

svn commit: r1483616 - in /incubator/ambari/trunk: CHANGES.txt ambari-web/app/controllers/main/service/info/configs.js ambari-web/app/messages.js ambari-web/app/utils/http_client.js

Author: yusaku
Date: Fri May 17 00:27:57 2013
New Revision: 1483616

URL: http://svn.apache.org/r1483616
Log:
AMBARI-2151. Incorrect error message for invalid user name. (yusaku)

Modified:
    incubator/ambari/trunk/CHANGES.txt
    incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
    incubator/ambari/trunk/ambari-web/app/messages.js
    incubator/ambari/trunk/ambari-web/app/utils/http_client.js

Modified: incubator/ambari/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/CHANGES.txt?rev=1483616&r1=1483615&r2=1483616&view=diff
==============================================================================
--- incubator/ambari/trunk/CHANGES.txt (original)
+++ incubator/ambari/trunk/CHANGES.txt Fri May 17 00:27:57 2013
@@ -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)
 

Modified: incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js?rev=1483616&r1=1483615&r2=1483616&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js (original)
+++ incubator/ambari/trunk/ambari-web/app/controllers/main/service/info/configs.js Fri May 17 00:27:57 2013
@@ -698,7 +698,6 @@ App.MainServiceInfoConfigsController = E
           } else {
             uhc = self.getHostComponentsByStatus([self.get('content'), App.Service.find('MAPREDUCE')], App.HostComponentStatus.unknown);
           }
-          debugger;
           unknownHosts = uhc.hosts;
           unknownComponentCount = uhc.componentCount;
         } else {

Modified: incubator/ambari/trunk/ambari-web/app/messages.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/messages.js?rev=1483616&r1=1483615&r2=1483616&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/messages.js (original)
+++ incubator/ambari/trunk/ambari-web/app/messages.js Fri May 17 00:27:57 2013
@@ -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',

Modified: incubator/ambari/trunk/ambari-web/app/utils/http_client.js
URL: http://svn.apache.org/viewvc/incubator/ambari/trunk/ambari-web/app/utils/http_client.js?rev=1483616&r1=1483615&r2=1483616&view=diff
==============================================================================
--- incubator/ambari/trunk/ambari-web/app/utils/http_client.js (original)
+++ incubator/ambari/trunk/ambari-web/app/utils/http_client.js Fri May 17 00:27:57 2013
@@ -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' }
- );*/