Skip to content
Browse files

Merge commit 'bf0f1fdf714339b3349eb15268864cd407829668' into HEAD

  • Loading branch information...
2 parents dc1d03a + bf0f1fd commit 0500269a513a24fa4119fe2910a7808a76a3fac8 Jenkins committed May 30, 2012
Showing with 5 additions and 5 deletions.
  1. +1 −1 Gemfile
  2. +2 −2 Gemfile.lock
  3. +1 −1 app/views/artefacts/_form.html.erb
  4. +1 −1 features/editing.feature
View
2 Gemfile
@@ -35,7 +35,7 @@ gem "bson", "1.5.2"
if ENV['CONTENT_MODELS_DEV']
gem "govuk_content_models", :path => '../govuk_content_models'
else
- gem "govuk_content_models", "~> 0.0.12"
+ gem "govuk_content_models", "~> 0.0.13"
end
if ENV['BUNDLE_DEV']
View
4 Gemfile.lock
@@ -123,7 +123,7 @@ GEM
json
gherkin (2.7.3)
json (>= 1.4.6)
- govuk_content_models (0.0.12)
+ govuk_content_models (0.0.13)
bson_ext
differ
gds-api-adapters
@@ -284,7 +284,7 @@ DEPENDENCIES
gds-sso (~> 0.5)
gds-warmup-controller
gelf
- govuk_content_models (~> 0.0.12)
+ govuk_content_models (~> 0.0.13)
launchy
marples (~> 1.0)
minitest
View
2 app/views/artefacts/_form.html.erb
@@ -16,7 +16,7 @@
<%= semantic_form_for(artefact, :html => { :class => '', :id => 'edit_artefact'}) do |f| %>
<%= f.inputs do %>
<%= f.input :name, :input_html => { :class => "span6" } %>
- <%= f.input :slug, :input_html => { :class => "span6", :disabled => f.object.persisted? } %>
+ <%= f.input :slug, :input_html => { :class => "span6", :disabled => f.object.any_editions_published? }, :hint => "A valid slug might look like this: i-am-a-good-slug-with-no-spaces" %>
<%= f.input :need_id, :input_html => { :class => "span6", :disabled => f.object.persisted? } %>
<% if ! artefact.new_record? && ! artefact.business_proposition %>
<%= link_to "View in Need-O-Tron", need_url(f.object), :rel => 'external', :class => "btn btn-primary" %>
View
2 features/editing.feature
@@ -7,7 +7,7 @@ Feature: Editing artefacts
Scenario: Editing an artefact and changing the slug
Given two artefacts exist
- When I change the slug of the first artefact to "a new slug"
+ When I change the slug of the first artefact to "a-new-slug"
And I save
Then I should see the edit form again
And I should see an indication that the save worked

0 comments on commit 0500269

Please sign in to comment.
Something went wrong with that request. Please try again.