From 82f8dcb57883807ca88af4eb62fe4a51678380a7 Mon Sep 17 00:00:00 2001
From: Stas Vilchik <vilchiks@gmail.com>
Date: Tue, 14 Apr 2015 09:08:28 +0200
Subject: [PATCH] SONAR-5851 refactor profile forms ids

---
 .../quality-profiles/quality-profiles-copy-profile.hbs |  8 ++++----
 .../quality-profiles-create-profile.hbs                |  2 +-
 .../quality-profiles-delete-profile.hbs                |  4 ++--
 .../quality-profiles-rename-profile.hbs                | 10 +++++-----
 .../quality-profiles-restore-profile.hbs               |  6 +++---
 .../src/main/js/quality-profiles/copy-profile-view.js  |  2 +-
 .../main/js/quality-profiles/rename-profile-view.js    |  3 +--
 server/sonar-web/src/test/js/quality-profiles.js       | 10 +++++-----
 8 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-copy-profile.hbs b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-copy-profile.hbs
index 5d352d68412..04c5a10c516 100644
--- a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-copy-profile.hbs
+++ b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-copy-profile.hbs
@@ -5,12 +5,12 @@
   <div class="modal-body">
     <div class="js-modal-messages"></div>
     <div class="modal-field">
-      <label for="name">{{t 'quality_profiles.copy_new_name'}}<em class="mandatory">*</em></label>
-      <input id="copy-name" name="name" type="text" size="50" maxlength="100" autofocus="autofocus">
+      <label for="copy-profile-name">{{t 'quality_profiles.copy_new_name'}}<em class="mandatory">*</em></label>
+      <input id="copy-profile-name" name="name" type="text" size="50" maxlength="100">
     </div>
   </div>
   <div class="modal-foot">
-    <button id="copy-submit">{{t 'copy'}}</button>
-    <a href="#" class="js-modal-close" id="copy-cancel">{{t 'cancel'}}</a>
+    <button id="copy-profile-submit">{{t 'copy'}}</button>
+    <a href="#" class="js-modal-close" id="copy-profile-cancel">{{t 'cancel'}}</a>
   </div>
 </form>
diff --git a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-create-profile.hbs b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-create-profile.hbs
index 1a16c954460..e44f29d4de5 100644
--- a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-create-profile.hbs
+++ b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-create-profile.hbs
@@ -6,7 +6,7 @@
     <div class="js-modal-messages"></div>
     <div class="modal-field">
       <label for="create-profile-name">{{t 'name'}}<em class="mandatory">*</em></label>
-      <input id="create-profile-name" name="name" type="text" size="50" maxlength="100" autofocus="autofocus">
+      <input id="create-profile-name" name="name" type="text" size="50" maxlength="100">
     </div>
     <div class="modal-field">
       <label for="create-profile-language">{{t 'language'}}<em class="mandatory">*</em></label>
diff --git a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-delete-profile.hbs b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-delete-profile.hbs
index 960f447e4f8..bd011a01694 100644
--- a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-delete-profile.hbs
+++ b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-delete-profile.hbs
@@ -7,7 +7,7 @@
     <p>{{tp 'quality_profiles.are_you_sure_want_delete_profile_x_and_descendants' name languageName}}</p>
   </div>
   <div class="modal-foot">
-    <button id="delete-submit">{{t 'delete'}}</button>
-    <a href="#" class="js-modal-close" id="delete-cancel">{{t 'cancel'}}</a>
+    <button id="delete-profile-submit">{{t 'delete'}}</button>
+    <a href="#" class="js-modal-close" id="delete-profile-cancel">{{t 'cancel'}}</a>
   </div>
 </form>
diff --git a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-rename-profile.hbs b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-rename-profile.hbs
index a7250b2f43c..fc57dcaa03f 100644
--- a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-rename-profile.hbs
+++ b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-rename-profile.hbs
@@ -1,16 +1,16 @@
-<form id="copy-profile-form">
+<form id="rename-profile-form">
   <div class="modal-head">
     <h2>{{tp 'quality_profiles.rename_x_title' name languageName}}</h2>
   </div>
   <div class="modal-body">
     <div class="js-modal-messages"></div>
     <div class="modal-field">
-      <label for="new_name">{{t 'quality_profiles.new_name'}} <em class="mandatory">*</em></label>
-      <input id="new-name" name="new_name" type="text" size="50" maxlength="100" autofocus="autofocus" value="{{name}}">
+      <label for="rename-profile-name">{{t 'quality_profiles.new_name'}} <em class="mandatory">*</em></label>
+      <input id="rename-profile-name" name="name" type="text" size="50" maxlength="100" value="{{name}}">
     </div>
   </div>
   <div class="modal-foot">
-    <button id="rename-submit">{{t 'rename'}}</button>
-    <a href="#" class="js-modal-close" id="rename-cancel">{{t 'cancel'}}</a>
+    <button id="rename-profile-submit">{{t 'rename'}}</button>
+    <a href="#" class="js-modal-close" id="rename-profile-cancel">{{t 'cancel'}}</a>
   </div>
 </form>
diff --git a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-restore-profile.hbs b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-restore-profile.hbs
index 30edf580e71..4f27e912d48 100644
--- a/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-restore-profile.hbs
+++ b/server/sonar-web/src/main/hbs/quality-profiles/quality-profiles-restore-profile.hbs
@@ -1,8 +1,8 @@
-<div class="modal-head">
-  <h2>{{t 'quality_profiles.restore_profile'}}</h2>
-</div>
 <form id="restore-profile-form" action="{{link '/api/qualityprofiles/restore'}}" enctype="multipart/form-data"
       method="POST">
+  <div class="modal-head">
+    <h2>{{t 'quality_profiles.restore_profile'}}</h2>
+  </div>
   <div class="modal-body">
     <div class="js-modal-messages"></div>
     <div class="modal-field">
diff --git a/server/sonar-web/src/main/js/quality-profiles/copy-profile-view.js b/server/sonar-web/src/main/js/quality-profiles/copy-profile-view.js
index 376872436a1..7d686a86bb9 100644
--- a/server/sonar-web/src/main/js/quality-profiles/copy-profile-view.js
+++ b/server/sonar-web/src/main/js/quality-profiles/copy-profile-view.js
@@ -36,7 +36,7 @@ define([
     sendRequest: function () {
       var that = this,
           url = baseUrl + '/api/qualityprofiles/copy',
-          name = this.$('#copy-name').val(),
+          name = this.$('#copy-profile-name').val(),
           options = {
             fromKey: this.model.get('key'),
             toName: name
diff --git a/server/sonar-web/src/main/js/quality-profiles/rename-profile-view.js b/server/sonar-web/src/main/js/quality-profiles/rename-profile-view.js
index be565a4cbab..023f3a94f78 100644
--- a/server/sonar-web/src/main/js/quality-profiles/rename-profile-view.js
+++ b/server/sonar-web/src/main/js/quality-profiles/rename-profile-view.js
@@ -33,10 +33,9 @@ define([
     },
 
     sendRequest: function () {
-      // TODO change name input id
       var that = this,
           url = baseUrl + '/api/qualityprofiles/rename',
-          name = this.$('#new-name').val(),
+          name = this.$('#rename-profile-name').val(),
           options = {
             key: this.model.get('key'),
             name: name
diff --git a/server/sonar-web/src/test/js/quality-profiles.js b/server/sonar-web/src/test/js/quality-profiles.js
index d5088ab82a5..eacb4e3d431 100644
--- a/server/sonar-web/src/test/js/quality-profiles.js
+++ b/server/sonar-web/src/test/js/quality-profiles.js
@@ -247,9 +247,9 @@ casper.test.begin(testName('Copy Profile'), 5, function (test) {
 
       .then(function () {
         casper.evaluate(function () {
-          jQuery('#copy-name').val('Copied Profile');
+          jQuery('#copy-profile-name').val('Copied Profile');
         });
-        casper.click('#copy-submit');
+        casper.click('#copy-profile-submit');
         casper.waitForSelectorTextChange('.search-navigator-header-component');
       })
 
@@ -307,9 +307,9 @@ casper.test.begin(testName('Rename Profile'), 2, function (test) {
         lib.mockRequestFromFile('/api/qualityprofiles/search', 'search-renamed.json');
 
         casper.evaluate(function () {
-          jQuery('#new-name').val('Renamed Profile');
+          jQuery('#rename-profile-name').val('Renamed Profile');
         });
-        casper.click('#rename-submit');
+        casper.click('#rename-profile-submit');
         casper.waitForSelectorTextChange('.search-navigator-header-component');
       })
 
@@ -417,7 +417,7 @@ casper.test.begin(testName('Delete Profile'), 2, function (test) {
         lib.clearRequestMock(this.searchMock);
         lib.mockRequestFromFile('/api/qualityprofiles/search', 'search.json');
 
-        casper.click('#delete-submit');
+        casper.click('#delete-profile-submit');
         lib.waitForElementCount('.js-list .list-group-item', 5);
       })
 
-- 
2.39.5