aboutsummaryrefslogtreecommitdiffstats
path: root/app/models
diff options
context:
space:
mode:
Diffstat (limited to 'app/models')
-rw-r--r--app/models/contact_validator.rb4
-rw-r--r--app/models/incoming_message.rb4
-rw-r--r--app/models/info_request.rb7
-rw-r--r--app/models/info_request_event.rb4
-rw-r--r--app/models/outgoing_message.rb4
-rw-r--r--app/models/post_redirect.rb4
-rw-r--r--app/models/public_body.rb4
-rw-r--r--app/models/public_body_tag.rb4
-rw-r--r--app/models/user.rb11
-rw-r--r--app/models/user_info_request_sent_alert.rb4
10 files changed, 29 insertions, 21 deletions
diff --git a/app/models/contact_validator.rb b/app/models/contact_validator.rb
index cfa345daf..4df57d064 100644
--- a/app/models/contact_validator.rb
+++ b/app/models/contact_validator.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: contact_validators
#
@@ -15,7 +15,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: contact_validator.rb,v 1.4 2008-02-27 14:01:30 francis Exp $
+# $Id: contact_validator.rb,v 1.5 2008-03-12 16:07:13 francis Exp $
class ContactValidator < ActiveRecord::BaseWithoutTable
column :name, :string
diff --git a/app/models/incoming_message.rb b/app/models/incoming_message.rb
index 661b3b659..a44cddcfe 100644
--- a/app/models/incoming_message.rb
+++ b/app/models/incoming_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: incoming_messages
#
@@ -18,7 +18,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: incoming_message.rb,v 1.56 2008-03-07 23:13:38 francis Exp $
+# $Id: incoming_message.rb,v 1.57 2008-03-12 16:07:13 francis Exp $
# TODO
diff --git a/app/models/info_request.rb b/app/models/info_request.rb
index cdd9badb0..793506dfe 100644
--- a/app/models/info_request.rb
+++ b/app/models/info_request.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: info_requests
#
@@ -13,6 +13,7 @@
# awaiting_description :boolean default(false), not null
# prominence :string(255) default("normal"), not null
# url_title :text not null
+# solr_up_to_date :boolean default(false), not null
#
# models/info_request.rb:
@@ -21,7 +22,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: info_request.rb,v 1.60 2008-03-11 08:14:29 francis Exp $
+# $Id: info_request.rb,v 1.61 2008-03-12 16:07:13 francis Exp $
require 'digest/sha1'
@@ -126,7 +127,7 @@ public
end
# For request with same name as others, tag on the request numeric id
while not InfoRequest.find_by_url_title(url_title, :conditions => ["id <> ?", self.id] ).nil?
- url_title += "-" + self.id.to_s
+ url_title += "_" + self.id.to_s
end
write_attribute(:url_title, url_title)
end
diff --git a/app/models/info_request_event.rb b/app/models/info_request_event.rb
index dd74db18d..e8d6098ee 100644
--- a/app/models/info_request_event.rb
+++ b/app/models/info_request_event.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: info_request_events
#
@@ -16,7 +16,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: info_request_event.rb,v 1.19 2008-02-27 14:01:30 francis Exp $
+# $Id: info_request_event.rb,v 1.20 2008-03-12 16:07:13 francis Exp $
class InfoRequestEvent < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/outgoing_message.rb b/app/models/outgoing_message.rb
index bbbf1c7bb..3e21a8af7 100644
--- a/app/models/outgoing_message.rb
+++ b/app/models/outgoing_message.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: outgoing_messages
#
@@ -21,7 +21,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: outgoing_message.rb,v 1.33 2008-03-06 01:23:38 francis Exp $
+# $Id: outgoing_message.rb,v 1.34 2008-03-12 16:07:13 francis Exp $
class OutgoingMessage < ActiveRecord::Base
belongs_to :info_request
diff --git a/app/models/post_redirect.rb b/app/models/post_redirect.rb
index 3b79e638f..b38a63644 100644
--- a/app/models/post_redirect.rb
+++ b/app/models/post_redirect.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: post_redirects
#
@@ -25,7 +25,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: post_redirect.rb,v 1.21 2008-02-28 16:25:30 francis Exp $
+# $Id: post_redirect.rb,v 1.22 2008-03-12 16:07:13 francis Exp $
require 'openssl' # for random bytes function
diff --git a/app/models/public_body.rb b/app/models/public_body.rb
index 82eaa5822..031c1e476 100644
--- a/app/models/public_body.rb
+++ b/app/models/public_body.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: public_bodies
#
@@ -22,7 +22,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body.rb,v 1.34 2008-03-07 23:13:38 francis Exp $
+# $Id: public_body.rb,v 1.35 2008-03-12 16:07:13 francis Exp $
require 'csv'
require 'set'
diff --git a/app/models/public_body_tag.rb b/app/models/public_body_tag.rb
index 6dc60f886..bab41660f 100644
--- a/app/models/public_body_tag.rb
+++ b/app/models/public_body_tag.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: public_body_tags
#
@@ -15,7 +15,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: public_body_tag.rb,v 1.2 2008-02-27 14:01:30 francis Exp $
+# $Id: public_body_tag.rb,v 1.3 2008-03-12 16:07:13 francis Exp $
class PublicBodyTag < ActiveRecord::Base
validates_presence_of :public_body
diff --git a/app/models/user.rb b/app/models/user.rb
index 547ae4225..14a1d63e3 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: users
#
@@ -20,7 +20,7 @@
# Copyright (c) 2007 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user.rb,v 1.34 2008-03-07 23:13:38 francis Exp $
+# $Id: user.rb,v 1.35 2008-03-12 16:07:13 francis Exp $
require 'digest/sha1'
@@ -85,6 +85,13 @@ class User < ActiveRecord::Base
end
def update_url_name
url_name = MySociety::Format.simplify_url_part(self.name)
+ if url_name.size > 32
+ url_name = url_name[0..31]
+ end
+ # For request with same name as others, tag on the request numeric id
+ while not User.find_by_url_name(url_name, :conditions => ["id <> ?", self.id] ).nil?
+ url_name += "_" + self.id.to_s
+ end
write_attribute(:url_name, url_name)
end
diff --git a/app/models/user_info_request_sent_alert.rb b/app/models/user_info_request_sent_alert.rb
index a739e3f11..1e629fd58 100644
--- a/app/models/user_info_request_sent_alert.rb
+++ b/app/models/user_info_request_sent_alert.rb
@@ -1,5 +1,5 @@
# == Schema Information
-# Schema version: 39
+# Schema version: 41
#
# Table name: user_info_request_sent_alerts
#
@@ -16,7 +16,7 @@
# Copyright (c) 2008 UK Citizens Online Democracy. All rights reserved.
# Email: francis@mysociety.org; WWW: http://www.mysociety.org/
#
-# $Id: user_info_request_sent_alert.rb,v 1.3 2008-02-27 14:01:30 francis Exp $
+# $Id: user_info_request_sent_alert.rb,v 1.4 2008-03-12 16:07:13 francis Exp $
class UserInfoRequestSentAlert < ActiveRecord::Base
belongs_to :user
generated by cgit v1.2.3 (git 2.25.1) at 2025-07-24 11:16:38 +0000