[api,webui] fix add repository from default list

openSUSE · Jul 2, 2012 · 58a174f · 58a174f
1 parent 72e1de9
commit 58a174f
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 17 deletions.
diff --git a/docs/api/api/distributions.rng b/docs/api/api/distributions.rng
@@ -1,20 +1,16 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<grammar ns="http://buildservice.org/api" xmlns="http://relaxng.org/ns/structure/1.0" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
-
-  <include href="obs.rng" />
-
+<grammar xmlns="http://relaxng.org/ns/structure/1.0" ns="http://buildservice.org/api" datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes">
+  <include href="obs.rng"/>
   <start>
     <ref name="distributions-element"/>
   </start>
-
   <define ns="" name="distributions-element">
     <element name="distributions">
       <zeroOrMore>
         <ref name="distribution-element"/>
       </zeroOrMore>
     </element>
   </define>
-
   <define ns="" name="distribution-element">
     <element name="distribution">
       <attribute name="id">
@@ -48,15 +44,18 @@
       </interleave>
     </element>
   </define>
-
   <define ns="" name="icon-element">
     <element name="icon">
-      <attribute name="width">
-        <data type="int"/>
-      </attribute>
-      <attribute name="height">
-        <data type="int"/>
-      </attribute>
+      <optional>
+        <attribute name="width">
+          <data type="int"/>
+        </attribute>
+      </optional>
+      <optional>
+        <attribute name="height">
+          <data type="int"/>
+        </attribute>
+      </optional>
       <attribute name="url">
         <data type="string"/>
       </attribute>

diff --git a/docs/api/api/distributions.xml b/docs/api/api/distributions.xml
@@ -4,7 +4,7 @@
     <project>openSUSE:11.0</project>
     <repository>standard</repository>
     <reponame>openSUSE_11.0</reponame>
-    <icon width="8" height="8" url="http://opensuse.org/static/os11logo8.png"/>
+    <icon width="8" url="http://opensuse.org/static/os11logo8.png"/>
     <icon width="16" height="16" url="http://opensuse.org/static/os11logo16.png"/>
     <link>http://www.opensuse.org</link>
   </distribution>
@@ -13,7 +13,7 @@
     <project>openSUSE:10.3</project>
     <reponame>openSUSE_10.3</reponame>
     <repository>standard</repository>
-    <icon width="8" height="8" url="http://opensuse.org/static/os10logo8.png"/>
+    <icon url="http://opensuse.org/static/os10logo8.png"/>
     <icon width="16" height="16" url="http://opensuse.org/static/os10logo16.png"/>
     <link>http://www.opensuse.org</link>
   </distribution>
@@ -22,7 +22,7 @@
     <project>Fedora:9</project>
     <reponame>Fedora_9</reponame>
     <repository>standard</repository>
-    <icon width="8" height="8" url="http://opensuse.org/static/fed9logo8.png"/>
+    <icon height="8" url="http://opensuse.org/static/fed9logo8.png"/>
     <icon width="16" height="16" url="http://opensuse.org/static/fed9logo16.png"/>
     <link>http://www.fedoraproject.org</link>
   </distribution>

diff --git a/src/webui/app/views/project/add_repository_from_default_list.html.erb b/src/webui/app/views/project/add_repository_from_default_list.html.erb
@@ -59,5 +59,5 @@
 <% end %>
 
 <%= content_for :ready_function do %>
-  $('.repocheckbox').click(function() { $('#submitrepos').enable(); } );
+  $('.repocheckbox').click(function() { $('#submitrepos').removeAttr('disabled'); } );
 <% end %>