Skip to content
Extraits de code Groupes Projets
Valider 94d08954 rédigé par danielvincent's avatar danielvincent
Parcourir les fichiers

401 -> 406 in controllers resolving http basic auth prompt on failed...

401 -> 406 in controllers resolving http basic auth prompt on failed comment/status message creation.  fixed status message validation.
parent 5075a738
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -25,7 +25,7 @@ class CommentsController < ApplicationController ...@@ -25,7 +25,7 @@ class CommentsController < ApplicationController
format.html{ render :nothing => true, :status => 201 } format.html{ render :nothing => true, :status => 201 }
end end
else else
render :nothing => true, :status => 401 render :nothing => true, :status => 406
end end
end end
......
...@@ -35,7 +35,7 @@ class StatusMessagesController < ApplicationController ...@@ -35,7 +35,7 @@ class StatusMessagesController < ApplicationController
end end
else else
respond_to do |format| respond_to do |format|
format.js{ render :status => 401 } format.js{ render :status => 406 }
end end
end end
end end
......
...@@ -32,7 +32,7 @@ class StatusMessage < Post ...@@ -32,7 +32,7 @@ class StatusMessage < Post
protected protected
def message_or_photos_present? def message_or_photos_present?
unless self.message || self.photos.count > 0 unless !self.message.blank? || self.photos.count > 0
errors[:base] << 'Status message requires a message or at least one photo' errors[:base] << 'Status message requires a message or at least one photo'
end end
end end
......
...@@ -14,6 +14,10 @@ describe StatusMessage do ...@@ -14,6 +14,10 @@ describe StatusMessage do
it "should have either a message or at least one photo" do it "should have either a message or at least one photo" do
n = Factory.build(:status_message, :message => nil) n = Factory.build(:status_message, :message => nil)
n.valid?.should be_false n.valid?.should be_false
n.message = ""
n.valid?.should be_false
n.message = "wales" n.message = "wales"
n.valid?.should be_true n.valid?.should be_true
n.message = nil n.message = nil
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter