scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-10 23:25:31 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #377 from Ducz0r/lm-sci-820-fix

Browse source 
Fix 2 bugs with comments editing [SCI-820]
This commit is contained in:
Luka Murn 2017-01-04 10:47:29 +01:00 • committed by GitHub
commit 6402acc102
9 changed files with 48 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/javascripts/comments.js.erb
View file

@ -310,8 +310,11 @@ var Comments = (function() {
.on('ajax:send', function() {
input.attr('readonly', true);
})
.on('ajax:success', function() {
.on('ajax:success', function(ev, data) {
var newMessage = input.val();
if (!_.isUndefined(data.comment)) {
newMessage = data.comment;
}
oldMessage.html(newMessage);
form.off('ajax:send ajax:success ajax:error ajax:complete');

10
app/controllers/my_module_comments_controller.rb
View file

@ -1,4 +1,6 @@
class MyModuleCommentsController < ApplicationController
include ActionView::Helpers::TextHelper
before_action :load_vars
before_action :check_view_permissions, only: :index
before_action :check_add_permissions, only: [:create]
@ -112,7 +114,13 @@ class MyModuleCommentsController < ApplicationController
module: @my_module.name
)
)
render json: {}, status: :ok
render json: {
comment: auto_link(
simple_format(@comment.message),
link: :urls,
html: { target: '_blank' }
)
}, status: :ok
else
render json: { errors: @comment.errors.to_hash(true) },
status: :unprocessable_entity

10
app/controllers/project_comments_controller.rb
View file

@ -1,4 +1,6 @@
class ProjectCommentsController < ApplicationController
include ActionView::Helpers::TextHelper
before_action :load_vars
before_action :check_view_permissions, only: :index
before_action :check_add_permissions, only: [:create]
@ -109,7 +111,13 @@ class ProjectCommentsController < ApplicationController
project: @project.name
)
)
render json: {}, status: :ok
render json: {
comment: auto_link(
simple_format(@comment.message),
link: :urls,
html: { target: '_blank' }
)
}, status: :ok
else
render json: { errors: @comment.errors.to_hash(true) },
status: :unprocessable_entity

10
app/controllers/result_comments_controller.rb
View file

@ -1,4 +1,6 @@
class ResultCommentsController < ApplicationController
include ActionView::Helpers::TextHelper
before_action :load_vars
before_action :check_view_permissions, only: [:index]
@ -110,7 +112,13 @@ class ResultCommentsController < ApplicationController
result: @result.name
)
)
render json: {}, status: :ok
render json: {
comment: auto_link(
simple_format(@comment.message),
link: :urls,
html: { target: '_blank' }
)
}, status: :ok
else
render json: { errors: @comment.errors.to_hash(true) },
status: :unprocessable_entity

10
app/controllers/step_comments_controller.rb
View file

@ -1,4 +1,6 @@
class StepCommentsController < ApplicationController
include ActionView::Helpers::TextHelper
before_action :load_vars
before_action :check_view_permissions, only: [:index]
@ -115,7 +117,13 @@ class StepCommentsController < ApplicationController
)
)
end
render json: {}, status: :ok
render json: {
comment: auto_link(
simple_format(@comment.message),
link: :urls,
html: { target: '_blank' }
)
}, status: :ok
else
render json: { errors: @comment.errors.to_hash(true) },
status: :unprocessable_entity

4
app/views/my_module_comments/_comment.html.erb
View file

@ -39,7 +39,7 @@
</div>
<strong><%= comment.user.full_name %>:</strong>
<div data-role="comment-message-container">
<p data-role="comment-message"><%= auto_link(simple_format(comment.message),
<div data-role="comment-message"><%= auto_link(simple_format(comment.message),
link: :urls,
html: { target: '_blank' }) %></p>
html: { target: '_blank' }) %></div>
</div>

4
app/views/project_comments/_comment.html.erb
View file

@ -39,7 +39,7 @@
</div>
<strong><%= comment.user.full_name %>:</strong>
<div data-role="comment-message-container">
<p data-role="comment-message"><%= auto_link(simple_format(comment.message),
<div data-role="comment-message"><%= auto_link(simple_format(comment.message),
link: :urls,
html: { target: '_blank' }) %></p>
html: { target: '_blank' }) %></div>
</div>

4
app/views/result_comments/_comment.html.erb
View file

@ -40,7 +40,7 @@
<% end %>
</div>
<div data-role="comment-message-container">
<p data-role="comment-message"><%= auto_link(simple_format(comment.message),
<div data-role="comment-message"><%= auto_link(simple_format(comment.message),
link: :urls,
html: { target: '_blank' }) %></p>
html: { target: '_blank' }) %></div>
</div>

4
app/views/step_comments/_comment.html.erb
View file

@ -40,7 +40,7 @@
<% end %>
</div>
<div data-role="comment-message-container">
<p data-role="comment-message"><%= auto_link(simple_format(comment.message),
<div data-role="comment-message"><%= auto_link(simple_format(comment.message),
link: :urls,
html: { target: '_blank' }) %></p>
html: { target: '_blank' }) %></div>
</div>