foreman_datacenter 1.16.7 → 1.16.8

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: a1fd925a86ff13a3822f2e3dfc41845ededd3ab561c9416930ec2ec64411cd4e
4
- data.tar.gz: de1912a4a53ca6c5b0fd9bdb8dc3d4e2c3b1211cba41f75e5fd10ebabe5f0bb9
3
+ metadata.gz: 3e75dd583e1a71adb8a8754c58a72c1b2b71cde19aaadac57413fbbeeba906c1
4
+ data.tar.gz: 485c9e5335bd397e5df0a538096df3d7b00f2e8c9bbc8e851f239a04bced6907
5
5
  SHA512:
6
- metadata.gz: 07eacefff58dd7fe1b1e39733c5216694ba442de16ad786a195669f6fc21e8cbbc183d5388a307d0074c06d06983df2262d114c3ac9700db466ad95bd9854d50
7
- data.tar.gz: 93af2f70d018208a1fb380c1d328654f6601e6a5a21334065f899987a19102e87c37d006dd0a023f782b6b453c539a94f655290a36941b9fd3a41941897b4d3c
6
+ metadata.gz: 75fd9b3862257f6275abd548f41c2c81954e7230d475c0ec03736d3588df4ab2211595f46994270d54e14e3a7ec5ca0317e5edb0a9955f887473e95f1287fec7
7
+ data.tar.gz: 91f57fe420b02dae0a091143e804198f3e66534f446e62e9eb73c0581d0a6ca01b22c96a36af5fd624e4d4ca2e746c9df7a31ae2bb6e67daf999c507cd28135d
@@ -19,6 +19,12 @@ $(window).click(function(event) {
19
19
  pathname = pathname + str
20
20
  }
21
21
 
22
+ var move = "<p></p>"
23
+ if (object_type == "device" || object_type == "site" || object_type == "rack" || object_type == "rack_group") {
24
+ move = '<p>You also can move associated object to another <strong>' + object_type + '</strong> before you destroy it.</p> \
25
+ <a class="btn btn-block btn-primary modal-btn modal-btn-primary marginbottomsixteen" href="/datacenter/' + object_type + 's/' + object_id + '/move">Move associated objects</a>'
26
+ }
27
+
22
28
  var form = '<div id="myModal" class="modal"> \
23
29
  <div class="modal-content"> \
24
30
  <div class="modal-header"> \
@@ -34,7 +40,7 @@ $(window).click(function(event) {
34
40
  be undone. By unselecting checkbox you will permanently delete the \
35
41
  <strong>' + object_name + '</strong> \
36
42
  with \
37
- <strong>all</strong> \
43
+ <strong>ALL</strong> \
38
44
  associated objects' + ao + ' \
39
45
  </p> \
40
46
  <form class="modal-form nonpaddingbottom" action=' + pathname + ' accept-charset="UTF-8" method="post"> \
@@ -44,8 +50,7 @@ $(window).click(function(event) {
44
50
  <label>' + checkbox_label + '</label> \
45
51
  <input type="submit" name="commit" value="I understand the consequences, delete this ' + object_type + '" class="btn btn-block btn-danger modal-btn modal-btn-danger"> \
46
52
  </form> \
47
- <p>You also can move associated object to another <strong>' + object_type + '</strong> before you destroy it.</p> \
48
- <a class="btn btn-block btn-primary modal-btn modal-btn-primary marginbottomsixteen" href="/datacenter/' + object_type + 's/' + object_id + '/move">Move associated objects</a> \
53
+ '+ move +' \
49
54
  </div> \
50
55
  </div> \
51
56
  </div>'
@@ -14,6 +14,11 @@
14
14
  <td>
15
15
  <%= h interface.connected_interface.name %>
16
16
  </td>
17
+ <td>
18
+ <%= h interface.connection.id %>
19
+ -
20
+ <%= h interface.form_factor %>
21
+ </td>
17
22
  <td></td>
18
23
  <td class="text-right">
19
24
  <% if interface.connection.planned? %>
@@ -56,6 +61,7 @@
56
61
  <td></td>
57
62
  <td class="text-muted">Not connected</td>
58
63
  <td></td>
64
+ <td></td>
59
65
  <td class="text-right">
60
66
  <%= link_to new_device_interface_device_interface_connection_path(interface),
61
67
  class: 'btn btn-success btn-xs', title: 'Connect' do %>
@@ -1,3 +1,3 @@
1
1
  module ForemanDatacenter
2
- VERSION = '1.16.7'.freeze
2
+ VERSION = '1.16.8'.freeze
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: foreman_datacenter
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.16.7
4
+ version: 1.16.8
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Ivanov
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2019-06-24 00:00:00.000000000 Z
12
+ date: 2019-06-25 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: prawn