staypuft 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 933da629ddd68ffc038d02e3e909b3ce3e8ca362
-  data.tar.gz: 07c8406be09ba9d36ebe62effbeba503b3cb799f
+  metadata.gz: 96268aa2d192eb421898423d6559a5d3344855a8
+  data.tar.gz: 045c68a430a1375198f3ea52a95c6dbd41ab90a0
 SHA512:
-  metadata.gz: eeae968090fb2e99f66a1502e060c7955d43d41bb052cb23b55e5510667c8ebcbb0200cba95d24cc75854c266d991b55093b47cee13ab973aca3bf05a6a463d3
-  data.tar.gz: 057a540aaf0956f9c6adf5da4a6f864bad1a92659267483149eb750b83ea1a46f228a896b487730145fd1b8148412d559ab6cf1a20deba00a76d7d120b824136
+  metadata.gz: cbb30bec65a2635dc2f347af6cb183331b540976ff79a0b79d8a742f82fd1a284d023a9a6ee643639245ce93ca8ffbe97aac1eeed0e75ff1acbfb6c18a9cd61c
+  data.tar.gz: 3d84e07780685aa36f75d48c5ed9e1f81d4b8465e057ea2678496c98c884add023d62c04bd2fb078f1c807bf94ce1b8c08a265845b060da6b378a42c332793c4

data/app/assets/javascripts/staypuft/staypuft.js

@@ -170,6 +170,12 @@ $(function () {
     window.location.hash = "#overview";
   });
 
+  $('#role_modal').on('shown.bs.modal', function(e) {
+    $('#sub-navigation a[href="#hosts"]').tab('show');
+    $('#hosts-navigation a[href="#free-hosts"]').tab('show');
+    window.location.hash = "#hosts";
+  });
+
   var scrolled = false;
 
   $(window).scroll(function(){
@@ -180,4 +186,20 @@ $(function () {
     $(window).scrollTop( 0 );
   }
 
+  var free_host_checkboxes = $('#free-hosts table input:checkbox');
+  free_host_checkboxes.click(function(){
+    $("#assign_hosts_modal").attr("disabled", !free_host_checkboxes.is(":checked"));
+  });
+
+  var assigned_host_checkboxes = $('#assigned-hosts table input:checkbox');
+  assigned_host_checkboxes.click(function(){
+    $("#unassign_hosts_button").attr("disabled", !assigned_host_checkboxes.is(":checked"));
+  });
+
+  var deployed_host_checkboxes = $('#deployed-hosts table input:checkbox');
+  deployed_host_checkboxes.click(function(){
+    $("#undeploy_hosts_modal").attr("disabled", !deployed_host_checkboxes.is(":checked"));
+  });
+
+
 });

data/app/controllers/staypuft/deployments_controller.rb

@@ -111,7 +111,6 @@ module Staypuft
 
     def unassign_host
       deployment             = Deployment.find(params[:id])
-      hostgroup              = ::Hostgroup.find params[:hostgroup_id]
       deployment_in_progress = ForemanTasks::Lock.locked?(deployment, nil)
 
       hosts_to_unassign = ::Host::Base.find Array(params[:host_ids])

data/app/models/staypuft/deployment/cinder_service.rb

@@ -107,7 +107,7 @@ module Staypuft
     # ASCII, Unicode
     validates :eqlx_pool,
               :presence => true,
-              :format   => /\A[[^\p{Z}\p{C}!"#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~\.\-:]][[^\p{Z}\p{C}!"#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~]]+[[^\p{Z}\p{C}!"#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~\.\-:]]\z/,
+              :format   => /\A[[^\p{Z}\p{C}!"\#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~\.\-:]][[^\p{Z}\p{C}!"\#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~]]+[[^\p{Z}\p{C}!"\#$%&'\(\)\*\+,\/;<=>\?@\[\]\\\^\{\}|~\.\-:]]\z/,
               :length   => { maximum: 63,
                              too_long: "Too long: max length is %{count} bytes. Using multibyte characters reduces the maximum number of characters allowed.",
                              tokenizer: lambda {|str| str.bytes.to_a } },

data/app/views/staypuft/deployments/_assigned_hosts.html.erb

@@ -1,9 +1,9 @@
 <% if hosts.any? %>
 <div class="" id="table_assigned_hosts">
-  <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal association') do |f| %>
+  <%= form_tag(unassign_host_deployment_path(id: @deployment), class: 'form-horizontal association', method: 'post') do |f| %>
     <div class="pull-right top_actions">
       <%= submit_tag _("Configure Networks"), :class => "btn btn-default btn-sm", :style => "visibility: hidden" %>
-      <%= submit_tag _("Unassign Hosts"), :class => "btn btn-primary btn-sm", :style => "visibility: hidden" %>
+      <%= submit_tag _("Unassign Hosts"), :class => "btn btn-primary btn-sm", :disabled => true, :id => "unassign_hosts_button" %>
     </div>
     <h4 class="pull-left"><%= _("Assigned Hosts") %></h4>
     <p class="clearfix"></p>

data/app/views/staypuft/deployments/_deployed_hosts.html.erb

@@ -2,8 +2,13 @@
 <div class="" id="table_deployed_hosts">
   <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal association') do |f| %>
     <div class="pull-right top_actions">
-      <%= submit_tag _("Undeploy Hosts"), :class => "btn btn-primary btn-smt",
-          :style => "visibility: hidden" %>
+      <%= submit_tag _("Unassign Hosts"),
+          :class => "btn btn-danger btn-sm pull-right",
+          :'data-toggle' => "tooltip",
+          :'data-placement' => "left",
+          :id => "undeploy_hosts_modal",
+          :disabled => true,
+          :title => _("Unassigning deployed hosts may lead to unexpected problems.") %>
     </div>
     <h4 class="pull-left"><%= _("Deployed Hosts") %></h4>
     <p class="clearfix"></p>

data/app/views/staypuft/deployments/_free_hosts.html.erb

@@ -3,8 +3,9 @@
   <%= form_tag(associate_host_deployment_path(id: @deployment), class: 'form-horizontal association') do |f| %>
     <div class="pull-right top_actions">
       <%= submit_tag _("Configure Networks"), :class => "btn btn-default btn-sm", :style => "visibility: hidden" %>
-      <%= submit_tag _("Assign Hosts"), :class => "btn btn-primary btn-sm",
-                     :style => "visibility: hidden" %>
+      <button type="button" class= "btn btn-primary btn-sm"
+              id="assign_hosts_modal" data-toggle = "modal"
+              data-target = "#role_modal" disabled="true"><%= _("Assign Hosts") %></button>
     </div>
     <h4 class="pull-left"><%= _("Free Hosts") %></h4>
     <p class="clearfix"></p>
@@ -45,6 +46,34 @@
         <% end %>
       </tbody>
     </table>
+    <div class="modal fade" id="role_modal" tabindex="-1" role="dialog" aria-labelledby="Deployment Roles" aria-hidden="true">
+      <div class="modal-dialog">
+        <div class="modal-content">
+          <div class="modal-header">
+            <button type="button" class="close" data-dismiss="modal" aria-hidden="true">&times;</button>
+            <h2 class="modal-title" id="deploy_modal_label">
+              <span class="glyphicon glyphicon-th-list">
+              </span> <%= _("Deployment Roles") %>
+            </h2>
+          </div>
+          <div class="modal-body">
+            <h3><%= _("Choose a deployment role to assign these to:") %></h3>
+            <div>
+              <% @deployment.child_hostgroups.each do |child_hostgroup| %>
+                <div class="form-inline">
+                  <%= radio_button_tag(:hostgroup_id, child_hostgroup.id, false) %>
+                  <%= label_tag(child_hostgroup.id, child_hostgroup.name) %>
+                </div>
+              <% end %>
+            </div>
+          </div>
+          <div class="modal-footer">
+            <button type="button" class="btn btn-default" data-dismiss="modal"><%= _("Cancel") %></button>
+            <%= submit_tag _("Assign Hosts"), :class => "btn btn-primary btn-sm" %>
+          </div>
+        </div>
+      </div>
+    </div>
   <% end %>
 </div>
 <% else %>

data/lib/staypuft/version.rb

@@ -1,3 +1,3 @@
 module Staypuft
-  VERSION = '0.2.4'
+  VERSION = '0.2.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: staypuft
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Staypuft team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-11 00:00:00.000000000 Z
+date: 2014-08-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: foreman-tasks