Merge pull request #16 from AhmedKamal1432/amahi-8

Fix forget choosing options
amahi · Aug 26, 2015 · ce4417f · ce4417f
2 parents f2fa84a + 1ace576
commit ce4417f
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/controllers/disk_wizard_controller.rb b/app/controllers/disk_wizard_controller.rb
@@ -80,7 +80,11 @@ def confirmation
      partition_divider = params[:partition_divider].to_i
      self.user_selections = {fs_type: fs_type, partition_divider: partition_divider}
     end
-    option = params[:option]
+    if params[:option].blank?
+      option = [""]
+    else
+      option = params[:option]
+    end
     label = params[:label].blank? ? nil : params[:label]
     if not( label.blank? ) and label.size > 11 and user_selections['fs_type'].eql?(3)
       redirect_to disk_wizards_engine.manage_path, :flash => {:error => "label have to be less than 12 character in FAT32"}

diff --git a/app/views/disk_wizard/confirmation.html.erb b/app/views/disk_wizard/confirmation.html.erb
@@ -81,7 +81,7 @@
             </li>
           <% end %>
           <li class="list-group-item text-right">
-            <a style="float: left" class="btn btn-default" href=<%= defined?(disk_wizards_engine) ? disk_wizards_engine.manage_path : manage_path %>>
+            <a style="float: left" class="btn btn-default" href=<%= defined?(disk_wizards_engine) ? disk_wizards_engine.file_system_path : file_system_path %>>
               <span class="glyphicon glyphicon-arrow-left"></span> Back</a>
             <label style="cursor: pointer" id="debug" class="text-warning" data-toggle="tooltip" data-placement="left" title="No executions takeplace,only list the commands which get executed."> <%= check_box_tag(:debug, 1, false, class: 'format') %>
               Debug </label>