[Libreoffice-commits] .: 2 commits - bug/bug bug/bug.xhtml

Wed Oct 19 08:55:09 PDT 2011

bug/bug.xhtml      |    2 +-
 bug/bug/bug.js     |    1 +
 bug/bug/frame.html |    2 +-
 bug/bug/test.js    |    3 ++-
 4 files changed, 5 insertions(+), 3 deletions(-)

New commits:
commit cbbe8e26a783edfcf47a4cce2669f80be0800001
Author: Loic Dachary <loic at dachary.org>
Date:   Wed Oct 19 17:54:54 2011 +0200

    post_bug.cgi is moved in the bug.js instead of being in bug.xhtml so that it can be prefixed with $.bug.url like all other bugzilla cgi scripts

diff --git a/bug/bug.xhtml b/bug/bug.xhtml
index 962f24d..23081e3 100644
--- a/bug/bug.xhtml
+++ b/bug/bug.xhtml
@@ -165,7 +165,7 @@ Platform (if different from the browser):
             <iframe id="submissionoutput" name="submissionoutput"></iframe>
 
             <div class="submission_form">
-              <form action='/post_bug.cgi' target="submissionoutput" method='POST' enctype='multipart/form-data'>
+              <form target="submissionoutput" method='POST' enctype='multipart/form-data'>
                 <input type="hidden" name="product" value="LibreOffice"></input>
                 <input type="hidden" name="bug_status" value="UNCONFIRMED"></input>
                 <input type="hidden" name="rep_platform" value="Other"></input>
diff --git a/bug/bug/bug.js b/bug/bug/bug.js
index 30c9b7f..88fff59 100644
--- a/bug/bug/bug.js
+++ b/bug/bug/bug.js
@@ -212,6 +212,7 @@
             var element = $('.state_submit');
             if(!element.hasClass('initialized')) {
                 var form = $('.submission_form');
+                form.attr('action', $.bug.url + '/post_bug.cgi');
                 form.submit(function() {
                     if($(element).hasClass('inprogress')) {
                         return false;
diff --git a/bug/bug/test.js b/bug/bug/test.js
index 576fc7d..d8db7af 100644
--- a/bug/bug/test.js
+++ b/bug/bug/test.js
@@ -227,7 +227,7 @@ test("state_description", function() {
 });
 
 test("state_submit", function() {
-    expect(25);
+    expect(27);
 
     var state_success = $.bug.state_success;
     $.bug.state_success = function() { ok(true, 'state_success'); };
@@ -257,6 +257,7 @@ test("state_submit", function() {
 
     form.submit(function() {
         ok(element.hasClass('inprogress'), 'is in progress');
+        ok(form.attr('action'), '/post_bug.cgi');
         equal($('input[name="component"]', form).val(), component_text);
         equal($('input[name="version"]', form).val(), version);
         equal($('input[name="short_desc"]', form).val(), subcomponent + ': ' + short_desc);
commit fa8c500bfd2ad0b137fd7bf9b9418d127f1e962e
Author: Loic Dachary <loic at dachary.org>
Date:   Wed Oct 19 17:49:55 2011 +0200

    s/bugzilla_path/bugzilla_url/

diff --git a/bug/bug/frame.html b/bug/bug/frame.html
index 6f82168..fd8920c 100644
--- a/bug/bug/frame.html
+++ b/bug/bug/frame.html
@@ -20,7 +20,7 @@
     <title>Load bug.html in a frame</title>
   </head>
   <body>
-    <script>var bugzilla_path = '/bugzilla';</script>
+    <script>var bugzilla_url = '/bugzilla';</script>
     <iframe src="bug.html?version=2" width="892" height="1600" frameborder="0"> </iframe>
   </body>
 </html>
