Adds permalink field to category creation

app/models/category.rb

@@ -75,10 +75,10 @@ def to_param
 
   protected
 
-  before_save :set_defaults
+  before_save :set_permalink
 
-  def set_defaults
-    self.permalink ||= self.name.to_permalink
+  def set_permalink
+    self.permalink = self.name.to_permalink if self.permalink.nil? or self.permalink.empty?
   end
 
   validates_presence_of :name

app/views/admin/categories/new.html.erb

@@ -15,6 +15,13 @@
       <%= text_field :category, :keywords, :class => 'large' %>
     </div>
   </div>
+  <div class='clearfix'>
+    <label for="category_permalink"><%= _("Permalink") %></label>
+    <div class='input'>
+      <%= text_field :category, :permalink, :class => 'large' %>
+	  <span class='help-block'><%= _("Your category slug. Leave empty if you don't know what to put here") %></span>
+    </div>
+  </div>
   <div class='clearfix'>
     <label for="category_description"><%= _("Description") %></label>
     <div class='input'>

spec/models/category_spec.rb

@@ -23,6 +23,19 @@
     c.articles.size.should == 2
     c.published_articles.size.should == 1
   end
+
+  it "empty permalink should be converted" do
+    Factory(:blog)
+    c = Category.create(:name => "test 1")
+    c.permalink.should == "test-1"
+  end
+
+  it "category with permalink should not have permalink generated" do
+    Factory(:blog)
+    c = Category.create(:name => "Test 2", :permalink => "yeah-nice-one")
+    c.permalink.should == "yeah-nice-one"
+  end
+
 end
 
 describe Category do