Download as
Browse Code »

Commit cd4a0e0672eb59c07726feaf7e19a708c6beecfb

Authored by Daniela Feitosa
2 parents 88faac2b 60fc7b7b
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

Merge branch 'stable' 

Conflicts:
	app/views/content_viewer/view_page.rhtml
	public/stylesheets/application.css
Showing 5 changed files with 24 additions and 13 deletions   Show diff stats
app/models/external_feed.rb
  Diff comments   View file @cd4a0e0
... ... @@ -19,9 +19,15 @@ class ExternalFeed < ActiveRecord::Base
19 19 article.valid?
20 20 end
21 21  
  22 + def address=(new_address)
  23 + self.fetched_at = nil unless address == new_address
  24 + super(new_address)
  25 + end
  26 +
22 27 def clear
23 28 # do nothing
24 29 end
  30 +
25 31 def finish_fetch
26 32 if self.only_once && self.update_errors.zero?
27 33 self.enabled = false
... ...
app/views/profile/_common.rhtml
  Diff comments   View file @cd4a0e0
1   -
2   -<script type="text/javascript">
3   - jQuery( function() {
4   - var parent_selector = '.profile-wall-description, .profile-activity-description, .profile-network-description';
5   - var child_selector = '.icon-delete, .icon-reply';
6   - jQuery(parent_selector).live('mouseover', function () { jQuery(this).find(child_selector).css('visibility', 'visible'); });
7   - jQuery(parent_selector).live('mouseout', function () { jQuery(this).find(child_selector).css('visibility', 'hidden'); });
8   - });
9   -</script>
10   -
11 1 <% unless @action %>
12 2 <% cache_timeout(profile.cache_key + '-profile-general-info', 4.hours) do %>
13 3 <tr>
... ...
public/stylesheets/application.css
  Diff comments   View file @cd4a0e0
... ... @@ -5234,8 +5234,8 @@ li.profile-activity-item.upload_image .activity-gallery-images-count-1 img {
5234 5234 display: none;
5235 5235 }
5236 5236  
5237   -#profile-wall .profile-wall-activities-comments .article-comment:hover .button-bar,
5238   -#profile-network .profile-wall-activities-comments .article-comment:hover .button-bar {
  5237 +#profile-wall .profile-wall-activities-comments .comment-content:hover .button-bar,
  5238 +#profile-network .profile-wall-activities-comments .comment-content:hover .button-bar {
5239 5239 display: block;
5240 5240 }
5241 5241  
... ...
public/stylesheets/search.css
  Diff comments   View file @cd4a0e0
... ... @@ -675,10 +675,14 @@ li.search-product-item hr {
675 675 height: 34px;
676 676 display: inline-block;
677 677 }
678   -.search-field .formfield input {
  678 +.box-1 .search-field .formfield input {
679 679 height: 25px;
680 680 width: 530px;
681 681 }
  682 +.box-2 .search-field .formfield input,
  683 +.box-3 .search-field .formfield input {
  684 + width: 165px;
  685 +}
682 686 #public-profile-search .search-field .formfield input {
683 687 height: 25px;
684 688 width: 395px;
... ...
test/unit/external_feed_test.rb
  Diff comments   View file @cd4a0e0
... ... @@ -83,6 +83,7 @@ class ExternalFeedTest &lt; ActiveSupport::TestCase
83 83 should 'have empty fetch date by default' do
84 84 assert_nil ExternalFeed.new.fetched_at
85 85 end
  86 +
86 87 should 'set fetch date when finishing fetch' do
87 88 feed = ExternalFeed.new
88 89 feed.stubs(:save!)
... ... @@ -90,6 +91,16 @@ class ExternalFeedTest &lt; ActiveSupport::TestCase
90 91 assert_not_nil feed.fetched_at
91 92 end
92 93  
  94 + should 'have empty fetch when change address' do
  95 + feed = ExternalFeed.new
  96 + feed.stubs(:save!)
  97 + feed.address = 'http://localhost/example_feed'
  98 + feed.finish_fetch
  99 + assert_not_nil feed.fetched_at
  100 + feed.address = 'http://localhost/other_example_feed'
  101 + assert_nil feed.fetched_at
  102 + end
  103 +
93 104 should 'expire feeds after a certain period' do
94 105 # save current time
95 106 now = Time.now
... ...