|
|
|
@ -432,12 +432,12 @@ class IssuesController < ApplicationController
|
|
|
|
|
|
|
|
|
|
def add_journal
|
|
|
|
|
if User.current.logged?
|
|
|
|
|
jour = Journal.new
|
|
|
|
|
jour.user_id = User.current.id
|
|
|
|
|
jour.notes = params[:notes]
|
|
|
|
|
jour.journalized = @issue
|
|
|
|
|
jour.save_attachments(params[:attachments])
|
|
|
|
|
jour.save
|
|
|
|
|
@jour = Journal.new
|
|
|
|
|
@jour.user_id = User.current.id
|
|
|
|
|
@jour.notes = params[:notes]
|
|
|
|
|
@jour.journalized = @issue
|
|
|
|
|
@jour.save_attachments(params[:attachments])
|
|
|
|
|
@jour.save
|
|
|
|
|
update_user_activity(@issue.class,@issue.id)
|
|
|
|
|
update_forge_activity(@issue.class,@issue.id)
|
|
|
|
|
@allowed_statuses = @issue.new_statuses_allowed_to(User.current)
|
|
|
|
@ -493,7 +493,7 @@ class IssuesController < ApplicationController
|
|
|
|
|
update_forge_activity(@issue.class,@issue.id)
|
|
|
|
|
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js
|
|
|
|
|
format.html{redirect_to issue_url(@issue)}
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
@ -503,7 +503,7 @@ class IssuesController < ApplicationController
|
|
|
|
|
@issue = Issue.find(params[:id])
|
|
|
|
|
Journal.destroy(params[:journal_id])
|
|
|
|
|
respond_to do |format|
|
|
|
|
|
format.js
|
|
|
|
|
format.html{redirect_to issue_url(@issue)}
|
|
|
|
|
end
|
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|