From 1d024efcdc75087d1a252be585140ea6ad21b0c6 Mon Sep 17 00:00:00 2001
From: Benjamin Brunner <bbrunner@suse.de>
Date: Thu, 14 Feb 2013 11:25:00 +0100
Subject: [PATCH] [webui] - Fixed adding of unknown trackers in the
 PatchinfoController - Added a link to a list of valid trackers

---
 .../app/controllers/patchinfo_controller.rb   | 42 ++++++++++++-------
 src/webui/app/views/patchinfo/_form.html.erb  |  4 +-
 2 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/src/webui/app/controllers/patchinfo_controller.rb b/src/webui/app/controllers/patchinfo_controller.rb
index 8dc95c60a05..aaeb4a7adcd 100644
--- a/src/webui/app/controllers/patchinfo_controller.rb
+++ b/src/webui/app/controllers/patchinfo_controller.rb
@@ -82,8 +82,12 @@ def read_patchinfo
         issue = Array.new
         issueid = a.value(:id)
         issueurl = IssueTracker.find(:name => a.tracker)
-        issueurl = issueurl.each("/issue-tracker/show-url").first.text
-        issueurl = issueurl.sub(/@@@/, issueid)
+        if !issueurl.nil?
+          issueurl = issueurl.each("/issue-tracker/show-url").first.text
+          issueurl = issueurl.sub(/@@@/, issueid)
+        else
+          issueurl = ""
+        end
         issue << a.tracker
         issue << issueid
         issue << issueurl
@@ -274,7 +278,9 @@ def new_tracker
     new_issues = params[:issues]
     #collection with all informations of the new issues
     issue_collection = Array.new
-    error = ""
+    error = String.new
+    invalid_format = String.new
+    invalid_tracker = String.new
     new_issues.each do |new_issue|
       #issue = collecting all informations of an new issue
       issue = Array.new
@@ -286,25 +292,31 @@ def new_tracker
       end
       if issue.length > 1
         begin
+          
           issueurl = IssueTracker.find(:name => issue[0])
-          issueurl = issueurl.each("/issue-tracker/show-url").first.text
-          issueurl = issueurl.sub(/@@@/, issue[1])
-          issue << issueurl
-          get_issue_sum(issue[0], issue[1])
-          if !@error.nil?
-            error += "#{issue[0]} "
-            next
+          if !issueurl.nil?
+            issueurl = issueurl.each("/issue-tracker/show-url").first.text
+            issueurl = issueurl.sub(/@@@/, issue[1])
+            issue << issueurl
+            get_issue_sum(issue[0], issue[1])
+            if !@error.nil?
+              invalid_format += "#{issue[0]} "
+              next
+            end
+            issue << @issuesum
+            issue_collection << issue
+          else
+            invalid_tracker += "#{issue[0]} is not a valid tracker.\n"
           end
-          issue << @issuesum
-          issue_collection << issue
         rescue ActiveXML::Transport::NotFoundError
-          error += "#{issue[0]} "
+          invalid_format += "#{issue[0]} "
         end
       else
-        error += "#{issue[0]} "
+        invalid_format += "#{issue[0]} "
       end
     end
-    error += "has no valid format. (Correct formats are e.g. bnc#123456, CVE-1234-5678 and the string has to be a comma-separated list)" if error != ""
+    error += "#{invalid_tracker}" 
+    error += "#{invalid_format}has no valid format. (Correct formats are e.g. bnc#123456, CVE-1234-5678 and the string has to be a comma-separated list)" if !invalid_format.empty?
     render :nothing => true, :json => { :error => error, :issues => issue_collection}
   end
 
diff --git a/src/webui/app/views/patchinfo/_form.html.erb b/src/webui/app/views/patchinfo/_form.html.erb
index 113b9093ecf..de394e11252 100644
--- a/src/webui/app/views/patchinfo/_form.html.erb
+++ b/src/webui/app/views/patchinfo/_form.html.erb
@@ -59,7 +59,9 @@
           </div>
           <div class="box show_right show_left" style="margin-top:5px;">
             <p>
-              <label for='issue'>Add an additional bug (single or a comma-separated list e.g.: "bnc#123456, bgo#654321,CVE-2012-1234)"</label>
+              <label for='issue'>Add an additional bug (single or a comma-separated list e.g.: "bnc#123456, bgo#654321,CVE-2012-1234)"<br/>
+                A list of all supported tracker you can find here: 
+                <%= link_to "Tracker List", "https://en.opensuse.org/openSUSE:Packaging_Patches_guidelines#Current_set_of_abbreviations"%></label>
               <input type="text" id="issue" name="issuelist" value="<%=@issueid%>"/>
 
               <%= link_to image_tag('bug_add.png', :alt => "Add Bug", :title => "Add additional issues e.g.: \"bnc#123456, bgo#654321\""), '#', :onclick => 'append_bug($("#issue").val()); return false;', :id => 'add_bug' %>