diff options
| author | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-04-28 14:42:01 +0400 |
|---|---|---|
| committer | Jacob Vosmaer <contact@jacobvosmaer.nl> | 2014-04-28 14:42:01 +0400 |
| commit | 285926918b95f1d771bf4e9c84972d4e55b41ea9 (patch) | |
| tree | f49cb42a094fbe5e3de08c549349fd99cb567465 | |
| parent | 7ec5ff4dbae71d147f413da5cea64116e7eb305d (diff) | |
Serialize last_fetched_at as a string with seconds
| -rw-r--r-- | app/controllers/projects/notes_controller.rb | 2 | ||||
| -rw-r--r-- | app/finders/notes_finder.rb | 2 | ||||
| -rw-r--r-- | app/views/projects/notes/_notes_with_form.html.haml | 2 | ||||
| -rw-r--r-- | spec/finders/notes_finder_spec.rb | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/projects/notes_controller.rb b/app/controllers/projects/notes_controller.rb index 3826515d227..b5b0446b43f 100644 --- a/app/controllers/projects/notes_controller.rb +++ b/app/controllers/projects/notes_controller.rb @@ -5,7 +5,7 @@ class Projects::NotesController < Projects::ApplicationController before_filter :authorize_admin_note!, only: [:update, :destroy] def index - current_fetched_at = Time.now + current_fetched_at = Time.now.to_i @notes = NotesFinder.new.execute(project, current_user, params) notes_json = { notes: [], last_fetched_at: current_fetched_at } diff --git a/app/finders/notes_finder.rb b/app/finders/notes_finder.rb index 38d78f3a2d5..0b9affb716c 100644 --- a/app/finders/notes_finder.rb +++ b/app/finders/notes_finder.rb @@ -4,7 +4,7 @@ class NotesFinder def execute(project, current_user, params) target_type = params[:target_type] target_id = params[:target_id] - last_fetched_at = params.fetch(:last_fetched_at) + last_fetched_at = Time.at(params.fetch(:last_fetched_at).to_i) notes = case target_type when "commit" diff --git a/app/views/projects/notes/_notes_with_form.html.haml b/app/views/projects/notes/_notes_with_form.html.haml index bdcecd8a39a..052661962e4 100644 --- a/app/views/projects/notes/_notes_with_form.html.haml +++ b/app/views/projects/notes/_notes_with_form.html.haml @@ -7,4 +7,4 @@ = render "projects/notes/form" :javascript - new Notes("#{project_notes_path(target_id: @noteable.id, target_type: @noteable.class.name.underscore)}", #{@notes.map(&:id).to_json}, Time.now) + new Notes("#{project_notes_path(target_id: @noteable.id, target_type: @noteable.class.name.underscore)}", #{@notes.map(&:id).to_json}, #{Time.now.to_i}) diff --git a/spec/finders/notes_finder_spec.rb b/spec/finders/notes_finder_spec.rb index 80d6a36c311..4f8a5f909df 100644 --- a/spec/finders/notes_finder_spec.rb +++ b/spec/finders/notes_finder_spec.rb @@ -12,7 +12,7 @@ describe NotesFinder do end describe :execute do - let(:params) { { target_id: commit.id, target_type: 'commit', last_fetched_at: 1.hour.ago } } + let(:params) { { target_id: commit.id, target_type: 'commit', last_fetched_at: 1.hour.ago.to_i } } before do note1 |