Fix updating with no previous linked work package

[ci skip]
pull/6964/head
Oliver Günther 6 years ago
parent 65c1e01696
commit 2549956755
No known key found for this signature in database
GPG Key ID: A3A8BDAD7C0C552C
  1. 5
      modules/bim/app/assets/stylesheets/bim/bim.sass
  2. 4
      modules/bim/app/models/bim/bcf_issue.rb
  3. 1
      modules/bim/app/views/bim/linked_issues/index.html.erb
  4. 14
      modules/bim/app/views/bim/linked_issues/prepare_import.html.erb

@ -13,3 +13,8 @@
.bcf--import-listing .bcf--import-listing
margin-bottom: 50px margin-bottom: 50px
table.attributes-table
td,th
padding: 5px
text-align: center

@ -15,7 +15,9 @@ module Bim
extract_xml('/Markup/Topic/Title/text()', 'title'), extract_xml('/Markup/Topic/Title/text()', 'title'),
extract_xml('/Markup/Topic/Description/text()', 'description'), extract_xml('/Markup/Topic/Description/text()', 'description'),
extract_xml('/Markup/Topic/Priority/text()', 'priority_text'), extract_xml('/Markup/Topic/Priority/text()', 'priority_text'),
extract_xml('/Markup/Topic/@TopicStatus', 'status_text') extract_xml('/Markup/Topic/@TopicStatus', 'status_text'),
extract_xml('/Markup/Topic/AssignedTo/text()', 'assignee_text'),
extract_xml('/Markup/Topic/DueDate/text()', 'due_date_text')
end end
private private

@ -35,7 +35,6 @@
<p> <p>
<strong><%= issue.title %></strong> <strong><%= issue.title %></strong>
<br/> <br/>
<span><%= issue.description %></span>
<% if issue.work_package %> <% if issue.work_package %>
<%= link_to_work_package(issue.work_package) %> <%= link_to_work_package(issue.work_package) %>
<br/> <br/>

@ -23,20 +23,20 @@
</thead> </thead>
<tbody> <tbody>
<tr> <tr>
<% if issue %> <% if issue && issue.work_package %>
<td><%= link_to_work_package issue.work_package %></td> <td><%= link_to_work_package issue.work_package %></td>
<% else %> <% else %>
<td>(will be created)</td> <td>(will be created)</td>
<% end %> <% end %>
<td><%= entry[:title] %></td> <td><%= entry[:title] || '-' %></td>
<td><%= entry[:status] %></td> <td><%= entry[:status] || '-' %></td>
<td><%= entry[:priority] %></td> <td><%= entry[:priority] || '-' %></td>
<td><%= entry[:assignee] %></td> <td><%= entry[:assignee] || '-' %></td>
<td><%= format_date(entry[:due_date]) %></td> <td><%= format_date(entry[:due_date]) || '-' %></td>
<td><%= entry[:viewpoint_count] %></td> <td><%= entry[:viewpoint_count] %></td>
<td><%= entry[:comments_count] %></td> <td><%= entry[:comments_count] %></td>
</tr> </tr>
<% if issue %> <% if issue&.work_package %>
<td></td> <td></td>
<td><%= issue.work_package.subject %></td> <td><%= issue.work_package.subject %></td>
<td><%= issue.work_package.status.name %></td> <td><%= issue.work_package.status.name %></td>

Loading…
Cancel
Save