Changeset 1234
- Timestamp:
- 09/15/08 14:43:58 (4 months ago)
- Files:
-
- trunk/app/views/email/_email_form.html.erb (modified) (1 diff)
- trunk/app/views/profile/edit.html.erb (modified) (1 diff)
- trunk/db/development_structure.sql (modified) (22 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
trunk/app/views/email/_email_form.html.erb
r1231 r1234 62 62 <td> </td> 63 63 <td style="text-align: right;"> 64 <%= link_to _("Cancel"), email_ user_url %>64 <%= link_to _("Cancel"), email_index_url %> 65 65 66 66 <%= spinned_submit_tag _("Send"), _("Sending...") %> trunk/app/views/profile/edit.html.erb
r1090 r1234 11 11 <%= render :partial => "shared/notices", :object => flash[:notice] %><% flash[:notice] = nil -%> 12 12 13 <% form_tag profile_edit_url :username => @owner.usernamedo %>13 <% form_tag profile_edit_url(:username => @owner.username) do %> 14 14 <table> 15 15 <tr> trunk/db/development_structure.sql
r735 r1234 1 CREATE TABLE `assistings` ( 2 `id` int(11) NOT NULL auto_increment, 3 `assistant_id` int(11) default '0', 4 `user_id` int(11) default '0', 5 PRIMARY KEY (`id`), 6 KEY `index_assistings_on_assistant_id` (`assistant_id`), 7 KEY `index_assistings_on_user_id` (`user_id`), 8 KEY `index_assistings_on_assistant_id_and_user_id` (`assistant_id`,`user_id`) 9 ) ENGINE=MyISAM AUTO_INCREMENT=22 DEFAULT CHARSET=utf8; 10 1 11 CREATE TABLE `blogs` ( 2 12 `id` int(11) NOT NULL auto_increment, … … 4 14 `address` varchar(255) default NULL, 5 15 `title` varchar(255) default NULL, 16 `gadget` text, 17 `disabled` tinyint(1) default '0', 18 `created_at` datetime default NULL, 19 `modified_at` datetime default NULL, 6 20 `description` text, 7 `disabled` tinyint(1) default '0',8 `created_at` datetime default NULL,9 `modified_at` datetime default NULL,10 `hue_save` int(11) default NULL,11 `saturation_save` int(11) default NULL,12 `luminosity_save` int(11) default NULL,13 `custom_css_save` text,14 21 PRIMARY KEY (`id`), 15 22 UNIQUE KEY `blogs_address_index` (`address`), … … 17 24 KEY `blogs_created_at_index` (`created_at`,`disabled`), 18 25 KEY `index_blogs_on_id_and_disabled` (`id`,`disabled`) 19 ) ENGINE=MyISAM AUTO_INCREMENT= 17711DEFAULT CHARSET=utf8;26 ) ENGINE=MyISAM AUTO_INCREMENT=34287 DEFAULT CHARSET=utf8; 20 27 21 28 CREATE TABLE `bookmarks` ( … … 30 37 KEY `bookmarks_user_id_index` (`user_id`,`created_at`), 31 38 KEY `bookmarks_created_at_index` (`created_at`) 32 ) ENGINE=MyISAM AUTO_INCREMENT=8182 DEFAULT CHARSET=utf8; 33 34 CREATE TABLE `comment_stats` ( 35 `id` int(11) NOT NULL auto_increment, 36 `commentable_id` int(11) NOT NULL, 37 `commentable_type` varchar(255) default NULL, 38 `comment_counter` int(11) default NULL, 39 `last_commented_at` datetime default NULL, 40 PRIMARY KEY (`id`), 41 KEY `comment_stats_last_commented_at_index` (`last_commented_at`,`commentable_type`,`commentable_id`), 42 KEY `comment_stats_commentable_id_index` (`commentable_id`,`commentable_type`,`last_commented_at`), 43 KEY `comment_stats_commentable_type_index` (`commentable_type`,`commentable_id`,`last_commented_at`), 44 KEY `comment_stats_commentable_type_counter_index` (`commentable_type`,`comment_counter`) 45 ) ENGINE=MyISAM AUTO_INCREMENT=45693 DEFAULT CHARSET=utf8; 39 ) ENGINE=MyISAM AUTO_INCREMENT=9368 DEFAULT CHARSET=utf8; 46 40 47 41 CREATE TABLE `comments` ( … … 60 54 KEY `comments_commentable_id_index` (`commentable_id`,`commentable_type`,`created_at`), 61 55 KEY `comments_commentable_type_index` (`commentable_type`,`commentable_id`,`created_at`) 62 ) ENGINE=MyISAM AUTO_INCREMENT= 224021DEFAULT CHARSET=utf8;56 ) ENGINE=MyISAM AUTO_INCREMENT=574744 DEFAULT CHARSET=utf8; 63 57 64 58 CREATE TABLE `hits` ( … … 66 60 `hittable_id` int(11) NOT NULL, 67 61 `hittable_type` varchar(255) default NULL, 68 `count` int(11) default NULL,62 `count` int(11) default '0', 69 63 `last_session_id` varchar(255) default NULL, 70 64 `last_ip` varchar(255) default NULL, … … 73 67 KEY `index_hits_on_hittable_id_and_hittable_type` (`hittable_id`,`hittable_type`), 74 68 KEY `index_hits_on_modified_at_and_hittable_type_and_hittable_id` (`modified_at`,`hittable_type`,`hittable_id`) 75 ) ENGINE=MyISAM AUTO_INCREMENT=1611864 DEFAULT CHARSET=utf8; 69 ) ENGINE=MyISAM AUTO_INCREMENT=1809725 DEFAULT CHARSET=utf8; 70 71 CREATE TABLE `journal_entries` ( 72 `id` int(11) NOT NULL auto_increment, 73 `user_id` int(11) NOT NULL, 74 `content` text, 75 `visibility` int(11) default '2', 76 `created_at` datetime default NULL, 77 `modified_at` datetime default NULL, 78 PRIMARY KEY (`id`), 79 KEY `index_journal_entries_on_user_id` (`user_id`), 80 KEY `index_journal_entries_on_visibility` (`visibility`), 81 KEY `index_journal_entries_on_created_at` (`created_at`), 82 KEY `index_journal_entries_on_visibility_and_created_at_and_user_id` (`visibility`,`created_at`,`user_id`) 83 ) ENGINE=MyISAM AUTO_INCREMENT=55 DEFAULT CHARSET=utf8; 84 85 CREATE TABLE `journal_followings` ( 86 `id` int(11) NOT NULL auto_increment, 87 `owner_id` int(11) NOT NULL, 88 `follower_id` int(11) NOT NULL, 89 `created_at` datetime default NULL, 90 PRIMARY KEY (`id`), 91 KEY `index_journal_followings_on_owner_id` (`owner_id`), 92 KEY `index_journal_followings_on_follower_id` (`follower_id`), 93 KEY `index_journal_followings_on_owner_id_and_follower_id` (`owner_id`,`follower_id`), 94 KEY `index_journal_followings_on_created_at` (`created_at`) 95 ) ENGINE=MyISAM AUTO_INCREMENT=7 DEFAULT CHARSET=utf8; 76 96 77 97 CREATE TABLE `pictures` ( … … 82 102 PRIMARY KEY (`id`), 83 103 KEY `pictures_user_id_index` (`user_id`) 84 ) ENGINE=MyISAM AUTO_INCREMENT= 8241DEFAULT CHARSET=utf8;104 ) ENGINE=MyISAM AUTO_INCREMENT=31045 DEFAULT CHARSET=utf8; 85 105 86 106 CREATE TABLE `planet_subscriptions` ( … … 92 112 KEY `planet_subscriptions_blog_id_index` (`blog_id`,`planet_id`), 93 113 KEY `planet_subscriptions_created_at_index` (`created_at`) 94 ) ENGINE=MyISAM AUTO_INCREMENT= 37475DEFAULT CHARSET=utf8;114 ) ENGINE=MyISAM AUTO_INCREMENT=80369 DEFAULT CHARSET=utf8; 95 115 96 116 CREATE TABLE `planets` ( … … 106 126 KEY `planets_user_id_index` (`user_id`), 107 127 KEY `planets_created_at_index` (`created_at`) 108 ) ENGINE=MyISAM AUTO_INCREMENT= 6886DEFAULT CHARSET=utf8;128 ) ENGINE=MyISAM AUTO_INCREMENT=13769 DEFAULT CHARSET=utf8; 109 129 110 130 CREATE TABLE `posts` ( … … 122 142 `comment_counter` int(11) default '0', 123 143 `last_commented_at` datetime default NULL, 144 `member_only_readable` tinyint(1) default '0', 145 `member_only_commentable` tinyint(1) default '0', 146 `section_id` int(11) default '0', 124 147 PRIMARY KEY (`id`), 125 148 UNIQUE KEY `posts_blog_id_index` (`blog_id`,`created_at`,`hidden`), … … 127 150 KEY `posts_started_at_index` (`started_at`,`ended_at`), 128 151 KEY `index_posts_on_blog_id_and_hidden_and_created_at` (`blog_id`,`hidden`,`created_at`), 129 KEY `idx_posts_lca_cc_bid_hdn` (`last_commented_at`,`comment_counter`,`blog_id`,`hidden`) 130 ) ENGINE=MyISAM AUTO_INCREMENT=90248 DEFAULT CHARSET=utf8; 152 KEY `idx_posts_lca_cc_bid_hdn` (`last_commented_at`,`comment_counter`,`blog_id`,`hidden`), 153 KEY `index_posts_on_section_id_and_created_at_and_hidden_and_blog_id` (`section_id`,`created_at`,`hidden`,`blog_id`) 154 ) ENGINE=MyISAM AUTO_INCREMENT=170786 DEFAULT CHARSET=utf8; 131 155 132 156 CREATE TABLE `questions` ( … … 152 176 KEY `index_questions_on_questioner_id_and_created_at_and_answered_at` (`questioner_id`,`created_at`,`answered_at`), 153 177 KEY `idx_questions_lca_cc_uid` (`last_commented_at`,`comment_counter`,`user_id`) 154 ) ENGINE=MyISAM AUTO_INCREMENT=5229 DEFAULT CHARSET=utf8; 155 156 CREATE TABLE `schema_info` ( 157 `version` int(11) default NULL 158 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 178 ) ENGINE=MyISAM AUTO_INCREMENT=8993 DEFAULT CHARSET=utf8; 179 180 CREATE TABLE `schema_migrations` ( 181 `version` varchar(255) NOT NULL, 182 UNIQUE KEY `unique_schema_migrations` (`version`) 183 ) ENGINE=InnoDB DEFAULT CHARSET=latin1; 184 185 CREATE TABLE `sections` ( 186 `id` int(11) NOT NULL auto_increment, 187 `name` varchar(255) default NULL, 188 `importance` int(11) default '0', 189 PRIMARY KEY (`id`), 190 UNIQUE KEY `index_sections_on_name` (`name`), 191 KEY `index_sections_on_importance` (`importance`) 192 ) ENGINE=MyISAM AUTO_INCREMENT=14 DEFAULT CHARSET=utf8; 159 193 160 194 CREATE TABLE `sessions` ( … … 166 200 PRIMARY KEY (`id`), 167 201 KEY `session_id_idx` (`session_id`) 168 ) ENGINE=MyISAM AUTO_INCREMENT= 21DEFAULT CHARSET=latin1;202 ) ENGINE=MyISAM AUTO_INCREMENT=65585819 DEFAULT CHARSET=latin1; 169 203 170 204 CREATE TABLE `sites` ( … … 173 207 `title_image` varchar(255) default '', 174 208 `locale` varchar(255) default 'en_US', 175 `announcement_planet` varchar(255) default '',176 `featured_planet` varchar(255) default NULL,177 209 `title` varchar(255) default '', 178 210 `home_content` text, … … 182 214 `notifier_email_prefix` varchar(255) default '[KV Error]', 183 215 `notifier_email_recipients` varchar(255) default '', 184 `google_search_code` text,185 216 `modified_at` datetime default NULL, 186 217 `pre_reg_msg` text, 187 218 `mailmasters` varchar(255) default '', 188 219 `subtitle` varchar(255) default '', 220 `system_message` text, 221 `google_custom_search_code` text, 222 `featured_planets` text, 223 `featured_post` int(11) default '0', 224 `skip_pre_reg` tinyint(1) default '0', 225 `show_reg_link` tinyint(1) default '1', 226 `user_profile_visibility` int(11) default '2', 189 227 PRIMARY KEY (`id`), 190 228 UNIQUE KEY `sites_domain_index` (`domain`) 191 229 ) ENGINE=MyISAM AUTO_INCREMENT=2 DEFAULT CHARSET=utf8; 192 230 231 CREATE TABLE `special_pages` ( 232 `id` int(11) NOT NULL auto_increment, 233 `address` varchar(255) default NULL, 234 `title` varchar(255) default NULL, 235 `content` text, 236 `created_at` datetime default NULL, 237 `updated_at` datetime default NULL, 238 PRIMARY KEY (`id`), 239 KEY `index_special_pages_on_address` (`address`) 240 ) ENGINE=MyISAM DEFAULT CHARSET=utf8; 241 193 242 CREATE TABLE `tag_sets` ( 194 243 `id` int(11) NOT NULL auto_increment, … … 200 249 KEY `index_tag_sets_on_user_id` (`user_id`), 201 250 KEY `index_tag_sets_on_title` (`title`) 202 ) ENGINE=MyISAM AUTO_INCREMENT= 168DEFAULT CHARSET=utf8;251 ) ENGINE=MyISAM AUTO_INCREMENT=462 DEFAULT CHARSET=utf8; 203 252 204 253 CREATE TABLE `taggings` ( … … 212 261 KEY `taggings_tag_id_index` (`tag_id`,`taggable_type`), 213 262 KEY `taggings_taggable_id_index` (`taggable_id`,`taggable_type`) 214 ) ENGINE=MyISAM AUTO_INCREMENT= 964244DEFAULT CHARSET=utf8;263 ) ENGINE=MyISAM AUTO_INCREMENT=2173737 DEFAULT CHARSET=utf8; 215 264 216 265 CREATE TABLE `tags` ( … … 221 270 UNIQUE KEY `tags_name_index` (`name`), 222 271 KEY `index_tags_on_count` (`count`) 223 ) ENGINE=MyISAM AUTO_INCREMENT= 69229DEFAULT CHARSET=utf8;272 ) ENGINE=MyISAM AUTO_INCREMENT=171927 DEFAULT CHARSET=utf8; 224 273 225 274 CREATE TABLE `themes` ( … … 228 277 `themeable_type` varchar(255) default NULL, 229 278 `user_id` int(11) NOT NULL, 230 `hue` int(11) default '0', 231 `saturation` int(11) default '0', 232 `luminosity` int(11) default '0', 279 `theme_name` varchar(255) default NULL, 233 280 `custom_css` text, 234 281 `show_title` tinyint(1) default '1', 235 282 PRIMARY KEY (`id`), 236 KEY ` themes_user_id_index` (`user_id`),237 KEY ` themes_themeable_id_index` (`themeable_id`,`themeable_type`),238 KEY ` themes_themeable_type_index` (`themeable_type`,`themeable_id`)239 ) ENGINE=MyISAM AUTO_INCREMENT= 3111DEFAULT CHARSET=utf8;283 KEY `index_themes_on_user_id` (`user_id`), 284 KEY `index_themes_on_themeable_id_and_themeable_type` (`themeable_id`,`themeable_type`), 285 KEY `index_themes_on_themeable_type_and_themeable_id` (`themeable_type`,`themeable_id`) 286 ) ENGINE=MyISAM AUTO_INCREMENT=1980 DEFAULT CHARSET=utf8; 240 287 241 288 CREATE TABLE `uploads` ( … … 254 301 KEY `uploads_user_id_index` (`user_id`,`created_at`), 255 302 KEY `uploads_filename_index` (`filename`,`user_id`), 256 KEY `idx_uploads_lca_cc_uid` (`last_commented_at`,`comment_counter`,`user_id`) 257 ) ENGINE=MyISAM AUTO_INCREMENT=72681 DEFAULT CHARSET=utf8; 303 KEY `idx_uploads_lca_cc_uid` (`last_commented_at`,`comment_counter`,`user_id`), 304 KEY `index_uploads_on_user_id_and_content_type` (`user_id`,`content_type`) 305 ) ENGINE=MyISAM AUTO_INCREMENT=158142 DEFAULT CHARSET=utf8; 258 306 259 307 CREATE TABLE `users` ( … … 287 335 `created_at` datetime default NULL, 288 336 `modified_at` datetime default NULL, 289 ` last_login_at` datetime default NULL,337 `profile_visibility` int(11) default '0', 290 338 PRIMARY KEY (`id`), 291 339 UNIQUE KEY `users_username_index` (`username`), 292 340 KEY `users_email_index` (`email`), 293 341 KEY `users_created_at_index` (`created_at`) 294 ) ENGINE=MyISAM AUTO_INCREMENT=21879 DEFAULT CHARSET=utf8; 295 296 INSERT INTO schema_info (version) VALUES (46) 342 ) ENGINE=MyISAM AUTO_INCREMENT=46422 DEFAULT CHARSET=utf8; 343 344 INSERT INTO schema_migrations (version) VALUES ('1'); 345 346 INSERT INTO schema_migrations (version) VALUES ('10'); 347 348 INSERT INTO schema_migrations (version) VALUES ('11'); 349 350 INSERT INTO schema_migrations (version) VALUES ('12'); 351 352 INSERT INTO schema_migrations (version) VALUES ('13'); 353 354 INSERT INTO schema_migrations (version) VALUES ('14'); 355 356 INSERT INTO schema_migrations (version) VALUES ('15'); 357 358 INSERT INTO schema_migrations (version) VALUES ('16'); 359 360 INSERT INTO schema_migrations (version) VALUES ('17'); 361 362 INSERT INTO schema_migrations (version) VALUES ('18'); 363 364 INSERT INTO schema_migrations (version) VALUES ('19'); 365 366 INSERT INTO schema_migrations (version) VALUES ('2'); 367 368 INSERT INTO schema_migrations (version) VALUES ('20'); 369 370 INSERT INTO schema_migrations (version) VALUES ('21'); 371 372 INSERT INTO schema_migrations (version) VALUES ('22'); 373 374 INSERT INTO schema_migrations (version) VALUES ('23'); 375 376 INSERT INTO schema_migrations (version) VALUES ('24'); 377 378 INSERT INTO schema_migrations (version) VALUES ('25'); 379 380 INSERT INTO schema_migrations (version) VALUES ('26'); 381 382 INSERT INTO schema_migrations (version) VALUES ('27'); 383 384 INSERT INTO schema_migrations (version) VALUES ('28'); 385 386 INSERT INTO schema_migrations (version) VALUES ('29'); 387 388 INSERT INTO schema_migrations (version) VALUES ('3'); 389 390 INSERT INTO schema_migrations (version) VALUES ('30'); 391 392 INSERT INTO schema_migrations (version) VALUES ('31'); 393 394 INSERT INTO schema_migrations (version) VALUES ('32'); 395 396 INSERT INTO schema_migrations (version) VALUES ('33'); 397 398 INSERT INTO schema_migrations (version) VALUES ('34'); 399 400 INSERT INTO schema_migrations (version) VALUES ('35'); 401 402 INSERT INTO schema_migrations (version) VALUES ('36'); 403 404 INSERT INTO schema_migrations (version) VALUES ('37'); 405 406 INSERT INTO schema_migrations (version) VALUES ('38'); 407 408 INSERT INTO schema_migrations (version) VALUES ('39'); 409 410 INSERT INTO schema_migrations (version) VALUES ('4'); 411 412 INSERT INTO schema_migrations (version) VALUES ('40'); 413 414 INSERT INTO schema_migrations (version) VALUES ('41'); 415 416 INSERT INTO schema_migrations (version) VALUES ('42'); 417 418 INSERT INTO schema_migrations (version) VALUES ('43'); 419 420 INSERT INTO schema_migrations (version) VALUES ('44'); 421 422 INSERT INTO schema_migrations (version) VALUES ('45'); 423 424 INSERT INTO schema_migrations (version) VALUES ('46'); 425 426 INSERT INTO schema_migrations (version) VALUES ('47'); 427 428 INSERT INTO schema_migrations (version) VALUES ('48'); 429 430 INSERT INTO schema_migrations (version) VALUES ('49'); 431 432 INSERT INTO schema_migrations (version) VALUES ('5'); 433 434 INSERT INTO schema_migrations (version) VALUES ('50'); 435 436 INSERT INTO schema_migrations (version) VALUES ('51'); 437 438 INSERT INTO schema_migrations (version) VALUES ('52'); 439 440 INSERT INTO schema_migrations (version) VALUES ('53'); 441 442 INSERT INTO schema_migrations (version) VALUES ('54'); 443 444 INSERT INTO schema_migrations (version) VALUES ('55'); 445 446 INSERT INTO schema_migrations (version) VALUES ('56'); 447 448 INSERT INTO schema_migrations (version) VALUES ('57'); 449 450 INSERT INTO schema_migrations (version) VALUES ('58'); 451 452 INSERT INTO schema_migrations (version) VALUES ('59'); 453 454 INSERT INTO schema_migrations (version) VALUES ('6'); 455 456 INSERT INTO schema_migrations (version) VALUES ('60'); 457 458 INSERT INTO schema_migrations (version) VALUES ('61'); 459 460 INSERT INTO schema_migrations (version) VALUES ('62'); 461 462 INSERT INTO schema_migrations (version) VALUES ('63'); 463 464 INSERT INTO schema_migrations (version) VALUES ('64'); 465 466 INSERT INTO schema_migrations (version) VALUES ('65'); 467 468 INSERT INTO schema_migrations (version) VALUES ('66'); 469 470 INSERT INTO schema_migrations (version) VALUES ('67'); 471 472 INSERT INTO schema_migrations (version) VALUES ('68'); 473 474 INSERT INTO schema_migrations (version) VALUES ('7'); 475 476 INSERT INTO schema_migrations (version) VALUES ('8'); 477 478 INSERT INTO schema_migrations (version) VALUES ('9');
