Check for 'http' or 'https' before saving a link
This commit is contained in:
		
							parent
							
								
									5fc679e0ca
								
							
						
					
					
						commit
						5f88408dcb
					
				|  | @ -26,6 +26,9 @@ class AdImage | |||
|   # validates_format_of :out_link, with: /(http:\/\/.*|)/ ,:message => 'Need a valid URL' | ||||
|   attr_reader :parse_post_date,:parse_unpost_date | ||||
| 
 | ||||
|   before_validation :add_http | ||||
|   validates :out_link, :presence => true, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix | ||||
| 
 | ||||
|   def parse_post_date=(att) | ||||
|     self.post_date = (Date.parse att.gsub(/\s+/, "") rescue nil) | ||||
|   end | ||||
|  | @ -52,4 +55,12 @@ class AdImage | |||
|     end | ||||
|     time | ||||
|   end | ||||
| 
 | ||||
|   protected | ||||
| 
 | ||||
|   def add_http | ||||
|     unless self.out_link[/^http:\/\//] || self.out_link[/^https:\/\//] | ||||
|       self.out_link = 'http://' + self.out_link | ||||
|     end | ||||
|   end | ||||
| end | ||||
|  |  | |||
|  | @ -10,4 +10,16 @@ class BulletinLink | |||
|    | ||||
|   # embedded_in :bulletin | ||||
|   belongs_to :bulletin | ||||
| 
 | ||||
|   before_validation :add_http | ||||
|   validates :url, :presence => true, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix | ||||
| 
 | ||||
|   protected | ||||
| 
 | ||||
| 	def add_http | ||||
| 	  unless self.url[/^http:\/\//] || self.url[/^https:\/\//] | ||||
| 	    self.url = 'http://' + self.url | ||||
| 	  end | ||||
| 	end | ||||
| 
 | ||||
| end | ||||
|  |  | |||
|  | @ -9,4 +9,15 @@ class NewsBulletinLink | |||
|   field :should_destroy, :type => Boolean | ||||
|    | ||||
|   belongs_to :news_bulletin | ||||
|    | ||||
|   before_validation :add_http | ||||
|   validates :url, :presence => true, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix | ||||
| 
 | ||||
|   protected | ||||
| 
 | ||||
| 	def add_http | ||||
| 	  unless self.url[/^http:\/\//] || self.url[/^https:\/\//] | ||||
| 	    self.url = 'http://' + self.url | ||||
| 	  end | ||||
| 	end | ||||
| end | ||||
|  |  | |||
|  | @ -26,6 +26,9 @@ class WebLink | |||
| 
 | ||||
|   validates :title, :at_least_one => true | ||||
| 
 | ||||
|   before_validation :add_http | ||||
|   validates :url, :presence => true, :format => /^(http|https):\/\/[a-z0-9]+([\-\.]{1}[a-z0-9]+)*\.[a-z]{2,5}(([0-9]{1,5})?\/.*)?$/ix | ||||
| 
 | ||||
|   def self.search( category_id = nil ) | ||||
|    | ||||
| 	if category_id.to_s.size > 0 | ||||
|  | @ -65,4 +68,12 @@ class WebLink | |||
|     end | ||||
|   end | ||||
| 
 | ||||
|   protected | ||||
| 
 | ||||
|   def add_http | ||||
|     unless self.url[/^http:\/\//] || self.url[/^https:\/\//] | ||||
|       self.url = 'http://' + self.url | ||||
|     end | ||||
|   end | ||||
|    | ||||
| end | ||||
		Loading…
	
		Reference in New Issue