redmine_plugins/redmine_dmsf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fast links - code review

Browse Source
This commit is contained in:
Karel Pičman 2018-09-21 08:18:22 +02:00
parent 23af00fb83
commit ba1dad5991
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/dmsf_links_controller.rb
View File

@ -46,7 +46,7 @@ class DmsfLinksController < ApplicationController
def new def new
@dmsf_link = DmsfLink.new @dmsf_link = DmsfLink.new
member = Member.find_by_project_id_and_user_id(params[:project_id], User.current.id) member = Member.find_by(project_id: params[:project_id], user_id: User.current.id)
@fast_links = member && member.dmsf_fast_links @fast_links = member && member.dmsf_fast_links
@dmsf_link.project_id = params[:project_id] @dmsf_link.project_id = params[:project_id]
@dmsf_link.dmsf_folder_id = params[:dmsf_folder_id] @dmsf_link.dmsf_folder_id = params[:dmsf_folder_id]
@ -121,7 +121,7 @@ class DmsfLinksController < ApplicationController
if params[:dmsf_link][:target_project_id].present? if params[:dmsf_link][:target_project_id].present?
@dmsf_link.project_id = params[:dmsf_link][:target_project_id] @dmsf_link.project_id = params[:dmsf_link][:target_project_id]
else else
target_folder = DmsfFolder.find_by_id(params[:dmsf_link][:target_folder_id]) target_folder = DmsfFolder.find_by(id: params[:dmsf_link][:target_folder_id])
unless target_folder unless target_folder
render_404 render_404
return return

6
app/views/dmsf_links/_form.html.erb
View File

@ -50,7 +50,7 @@
<%= late_javascript_tag do %> <%= late_javascript_tag do %>
$('#dmsf_link_target_project_id').change(function(){ $('#dmsf_link_target_project_id').change(function(){
$.ajax({ $.ajax({
url: '<%= autocomplete_for_project_dmsf_link_path(@project, :format => 'js') %>', url: '<%= escape_javascript autocomplete_for_project_dmsf_link_path(@project, :format => 'js') %>',
type: 'get', type: 'get',
data: $('#new_dmsf_link').serialize() data: $('#new_dmsf_link').serialize()
}); });
@ -70,14 +70,14 @@
<%= text_field_tag 'dmsf_link[target_folder_id]', '', :required => true, :max_length => 255 %> <%= text_field_tag 'dmsf_link[target_folder_id]', '', :required => true, :max_length => 255 %>
<% end %> <% end %>
<% end %> <% end %>
<% unless @fast_links && (@type == 'link_to') %> <% if !@fast_links || (@type != 'link_to') %>
<%= select_tag('dmsf_link[target_folder_id]', <%= select_tag('dmsf_link[target_folder_id]',
folder_tree_options_for_select(DmsfFolder.directory_tree(@dmsf_link.target_project), folder_tree_options_for_select(DmsfFolder.directory_tree(@dmsf_link.target_project),
:selected => @target_folder_id)) %> :selected => @target_folder_id)) %>
<%= late_javascript_tag do %> <%= late_javascript_tag do %>
$('#dmsf_link_target_folder_id').change(function(){ $('#dmsf_link_target_folder_id').change(function(){
$.ajax({ $.ajax({
url: '<%= autocomplete_for_folder_dmsf_link_path(@project, :format => 'js') %>', url: '<%= escape_javascript autocomplete_for_folder_dmsf_link_path(@project, :format => 'js') %>',
type: 'get', type: 'get',
data: $('#new_dmsf_link').serialize() data: $('#new_dmsf_link').serialize()
}); });

1
db/migrate/20180903132101_fast_links.rb
View File

@ -21,7 +21,6 @@
class FastLinks < ActiveRecord::Migration class FastLinks < ActiveRecord::Migration
def self.up def self.up
add_column :members, :dmsf_fast_links, :boolean, :default => false, :null => false add_column :members, :dmsf_fast_links, :boolean, :default => false, :null => false
Member.update_all(:dmsf_fast_links => false)
end end
def self.down def self.down