TheDude
/
openproject
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Remove relations

Browse Source
pull/3818/head
Oliver Günther 9 years ago
parent 9774e4790b
commit b64ef39986
4 changed files with 0 additions and 203 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 73
      app/controllers/work_package_relations_controller.rb
  2. 58
      app/views/work_package_relations/_form.html.erb
  3. 39
      app/views/work_package_relations/create.js.erb
  4. 33
      app/views/work_package_relations/destroy.js.erb

73
app/controllers/work_package_relations_controller.rb
Unescape View File

@ -1,73 +0,0 @@
#-- encoding: UTF-8
#-- copyright
# OpenProject is a project management system.
# Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License version 3.
#
# OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
# Copyright (C) 2006-2013 Jean-Philippe Lang
# Copyright (C) 2010-2013 the ChiliProject Team
#
# This program is free software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 2
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
#
# See doc/COPYRIGHT.rdoc for more details.
#++
class WorkPackageRelationsController < ApplicationController
before_filter :find_work_package, :find_project_from_association, :authorize
def create
@relation = @work_package.new_relation.tap do |r|
r.to = WorkPackage.visible.find_by(id: params[:relation][:to_id].match(/\d+/).to_s)
r.relation_type = params[:relation][:relation_type]
r.delay = params[:relation][:delay]
end
@relation.save
respond_to do |format|
format.html do redirect_to work_package_path(@work_package) end
format.js do
render action: 'create', locals: { work_package: work_package,
relation: @relation }
end
end
end
def destroy
@relation = @work_package.relation(params[:id])
@relation.destroy
respond_to do |format|
format.html do redirect_to work_package_path(@work_package) end
format.js
end
end
def work_package
@work_package
end
private
def find_work_package
@work_package = @object = WorkPackage.find(params[:work_package_id])
rescue ActiveRecord::RecordNotFound
render_404
end
end

58
app/views/work_package_relations/_form.html.erb
Unescape View File

@ -1,58 +0,0 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.
OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
Copyright (C) 2006-2013 Jean-Philippe Lang
Copyright (C) 2010-2013 the ChiliProject Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
<%= error_messages_for 'relation' %>
<div class="choice">
<div class="choice--select">
<span class="inline-label">
<%= f.select :relation_type, collection_for_relation_type_select, {},
onchange: "setPredecessorFieldsVisibility();",
class: 'form--select' %>
<span class="form-label"><%= WorkPackage.model_name.human %> #</span>
<%= f.text_field :to_id, size: 10, class: 'form--text-field'%>
</span>
<span id="predecessor_fields" class="inline-label" style="display:none;">
<span class="form-label"><%= Relation.human_attribute_name(:delay) %>:</span>
<%= f.text_field :delay, size: 3, class: 'form--text-field' %>
<span class="form-label"><%= l(:label_day_plural) %></span>
</span>
</div>
<div class="choice--button">
<%= styled_button_tag l(:button_add), class: '-highlight -with-icon icon-yes' %>
</div>
<div class="choice--button">
<%= toggle_link l(:button_cancel), 'new-relation-form', {}, class: 'button' %>
</div>
</div>
<div class="clearfix"></div>
<div id="related_issue_candidates" class="autocomplete"></div>
<%= javascript_tag "observeRelatedIssueField('#{work_packages_auto_complete_path(id: controller.work_package, project_id: @project, escape: false) }')" %>
<%= javascript_tag "setPredecessorFieldsVisibility();" %>

39
app/views/work_package_relations/create.js.erb
Unescape View File

@ -1,39 +0,0 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.
OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
Copyright (C) 2006-2013 Jean-Philippe Lang
Copyright (C) 2010-2013 the ChiliProject Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
jQuery('#relations #errorExplanation').remove();
<% if relation.errors.empty? %>
jQuery('#work-package-relations-table').removeClass('-hidden');
jQuery('#relations tbody').append("<%= escape_javascript(render partial: 'work_packages/relation', locals: { relation: relation, work_package: work_package }) %>");
jQuery('#relation_to_id').val('');
<% else %>
jQuery('#relations table').after("<%= escape_javascript(error_messages_for(relation)) %>");
<% end %>

33
app/views/work_package_relations/destroy.js.erb
Unescape View File

@ -1,33 +0,0 @@
<%#-- copyright
OpenProject is a project management system.
Copyright (C) 2012-2015 the OpenProject Foundation (OPF)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License version 3.
OpenProject is a fork of ChiliProject, which is a fork of Redmine. The copyright follows:
Copyright (C) 2006-2013 Jean-Philippe Lang
Copyright (C) 2010-2013 the ChiliProject Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
as published by the Free Software Foundation; either version 2
of the License, or (at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
See doc/COPYRIGHT.rdoc for more details.
++#%>
jQuery('#work_package_relation_<%= @relation.id %>').remove();
var relationsTable = jQuery('#work-package-relations-table');
if (relationsTable.find('tbody tr').length === 0) relationsTable.addClass('hidden');
Write Preview
Loading…
Cancel
Save