redmine_extensions 0.1.04 → 0.1.05

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 91db9f8871e2bd980dcfd0ade7540b9506ba2f63
-  data.tar.gz: 8941936776dc0c4bdfafa8017fdd48685f2d3e8c
+  metadata.gz: 5db9a307843534efd5b78eb74983f18ed76bb6e4
+  data.tar.gz: b4d307b3969ea6ba5d8f9547054ed5e3dda480b2
 SHA512:
-  metadata.gz: 6a6d4453f052613fa10c42059d40b3c41913915811cdcc5f251c25e0779b2073ec48e4f2d9a2124d83f2cfa508063ee87d6574bf5d18386c6c13ef2773ad24f1
-  data.tar.gz: 5e9f37b10d63761c6e68538eb51823e0223d833929fc1b8e7da187797eef8c9414e2cacd4b48df8d090e97b2644a02aa1e8e33dc3fb817549b3a2eb12f1feda9
+  metadata.gz: f60499c0b0c62af6d2964afdb42a543dd3095bcb50fe8b936fcfa15a1e7f02a5f41da520577d736e27bf8c8b7a873cd1a769fe9b76d01674725792baf8aa00cb
+  data.tar.gz: 3ce2eb9ca5e081fd5f4da418c365ba1aae7c3b1c52aae0d36affd15a9622d4b70b77cd9fb2aa5631ac575edc49bb581341a396684f4454847873722d5335d882

data/app/views/common/_closing_modal.html.erb

@@ -0,0 +1,3 @@
+<p>
+  <%= l(:text_modal_is_closing) %>
+</p>

data/app/views/common/close_modal.js.erb

@@ -0,0 +1,5 @@
+$("#ajax-modal").html("<%= j render(:partial => 'common/closing_modal', :formats => [:html]) %>");
+$("#ajax-modal").dialog('option', {
+  buttons: []
+});
+window.location = "<%= j params[:back_url] %>";

data/config/locales/en.yml

@@ -1,3 +1,4 @@
 en:
   nothing: Nothing
   button_update_easy_settings: Update settings
+  text_modal_is_closing: This modal dialog will be closed automatically, please wait.

data/lib/generators/redmine_extensions/entity/templates/controller.rb.erb

@@ -37,6 +37,7 @@ class <%= controller_class %>Controller < ApplicationController
 
     respond_to do |format|
       format.html
+      format.js
     end
   end
 
@@ -46,7 +47,9 @@ class <%= controller_class %>Controller < ApplicationController
     @<%= model_name_underscored %>.project = @project
     <%- end -%>
     @<%= model_name_underscored %>.safe_attributes = params[:<%= model_name_underscored %>]
+    <%- if acts_as_attachable? -%>
     @<%= model_name_underscored %>.save_attachments(params[:attachments] || (params[:<%= model_name_underscored %>] && params[:<%= model_name_underscored %>][:uploads]))
+    <%- end -%>
 
     if @<%= model_name_underscored %>.save
       respond_to do |format|
@@ -55,11 +58,13 @@ class <%= controller_class %>Controller < ApplicationController
           redirect_back_or_default <%= model_name_underscored %>_path(@<%= model_name_underscored %>)
         }
         format.api { render :action => 'show', :status => :created, :location => <%= model_name_underscored %>_url(@<%= model_name_underscored %>) }
+        format.js { render :template => 'common/close_modal' }
       end
     else
       respond_to do |format|
         format.html { render :action => 'new' }
         format.api { render_validation_errors(@<%= model_name_underscored %>) }
+        format.js { render :action => 'new' }
       end
     end
   end
@@ -69,12 +74,15 @@ class <%= controller_class %>Controller < ApplicationController
 
     respond_to do |format|
       format.html
+      format.js
     end
   end
 
   def update
     @<%= model_name_underscored %>.safe_attributes = params[:<%= model_name_underscored %>]
+    <%- if acts_as_attachable? -%>
     @<%= model_name_underscored %>.save_attachments(params[:attachments] || (params[:<%= model_name_underscored %>] && params[:<%= model_name_underscored %>][:uploads]))
+    <%- end -%>
 
     if @<%= model_name_underscored %>.save
       respond_to do |format|
@@ -83,11 +91,13 @@ class <%= controller_class %>Controller < ApplicationController
           redirect_back_or_default <%= model_name_underscored %>_path(@<%= model_name_underscored %>)
         }
         format.api { render_api_ok }
+        format.js { render :template => 'common/close_modal' }
       end
     else
       respond_to do |format|
         format.html { render :action => 'edit' }
         format.api { render_validation_errors(@<%= model_name_underscored %>) }
+        format.js { render :action => 'edit' }
       end
     end
   end

data/lib/generators/redmine_extensions/entity/templates/edit.html.erb.erb

@@ -1,15 +1,17 @@
 <%%= title l(:heading_<%= model_name_underscored %>_edit) %>
 
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular'}) do |f| %>
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
   <%%= error_messages_for @<%= model_name_underscored %> %>
 
   <div class="box">
     <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
   </div>
 
+  <%% if !request.xhr? %>
   <p>
     <%%= submit_tag l(:button_update), title: l(:button_update) %>
   </p>
+  <%% end %>
 <%% end %>
 <%% ### PAGE CUSTOMS ########################################################## %>
 <%% content_for :sidebar do %>

data/lib/generators/redmine_extensions/entity/templates/edit.js.erb.erb

@@ -0,0 +1,17 @@
+$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/edit', :formats => [:html]) %>");
+showModal('ajax-modal', '60%');
+var submitButton = {
+  text:"<%=j l(:button_update) -%>",
+  title:"<%=j l(:button_update) -%>",
+  click: function() {$(this).find('form').submit()},
+  'class': 'button-positive'
+}
+var closeButton = {
+  text: "<%=j l(:button_close) -%>",
+  title: "<%=j l(:button_close) -%>",
+  click: function() {$(this).dialog('close');},
+  'class': 'button'
+}
+$("#ajax-modal").dialog('option', {
+  buttons: [closeButton, submitButton]
+});

data/lib/generators/redmine_extensions/entity/templates/new.html.erb.erb

@@ -1,15 +1,17 @@
 <%%= title l(:heading_<%= model_name_underscored %>_new) %>
 
-<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular'}) do |f| %>
+<%%= form_for([@project, @<%= model_name_underscored %>], html: {multipart: <%= acts_as_attachable? %>, id: '<%= model_name_underscored %>_form', class: 'tabular', remote: request.xhr?}) do |f| %>
   <%%= error_messages_for @<%= model_name_underscored %> %>
 
   <div class="box">
     <%%= render partial: 'form', locals: {<%= model_name_underscored %>: @<%= model_name_underscored %>} %>
   </div>
 
+  <%% if !request.xhr? %>
   <p>
     <%%= submit_tag l(:button_create), title: l(:button_create) %>
   </p>
+  <%% end %>
 <%% end %>
 <%% ### PAGE CUSTOMS ########################################################## %>
 <%% content_for :sidebar do %>

data/lib/generators/redmine_extensions/entity/templates/new.js.erb.erb

@@ -0,0 +1,17 @@
+$("#ajax-modal").html("<%%= j render(:template => '<%= model_name_pluralize_underscored %>/new', :formats => [:html]) %>");
+showModal('ajax-modal', '60%');
+var submitButton = {
+  text:"<%=j l(:button_create) -%>",
+  title:"<%=j l(:button_create) -%>",
+  click: function() {$(this).find('form').submit()},
+  'class': 'button-positive'
+}
+var closeButton = {
+  text: "<%=j l(:button_close) -%>",
+  title: "<%=j l(:button_close) -%>",
+  click: function() {$(this).dialog('close');},
+  'class': 'button'
+}
+$("#ajax-modal").dialog('option', {
+  buttons: [closeButton, submitButton]
+});

data/lib/redmine_extensions/version.rb

@@ -1,3 +1,3 @@
 module RedmineExtensions
-  VERSION = '0.1.04'
+  VERSION = '0.1.05'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: redmine_extensions
 version: !ruby/object:Gem::Version
-  version: 0.1.04
+  version: 0.1.05
 platform: ruby
 authors:
 - Easy Software Ltd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-27 00:00:00.000000000 Z
+date: 2016-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -116,7 +116,9 @@ files:
 - app/presenters/easy_query_adapter_presenter.rb
 - app/presenters/redmine_extensions/base_presenter.rb
 - app/presenters/redmine_extensions/easy_setting_presenter.rb
+- app/views/common/_closing_modal.html.erb
 - app/views/common/_collapsible_module_layout.html.erb
+- app/views/common/close_modal.js.erb
 - app/views/easy_entity_assignments/_assignments_container.html.erb
 - app/views/easy_entity_assignments/_query_index.html.erb
 - app/views/easy_queries/_easy_query_tile.html.erb
@@ -137,6 +139,7 @@ files:
 - lib/generators/redmine_extensions/entity/templates/controller.rb.erb
 - lib/generators/redmine_extensions/entity/templates/custom_field.rb.erb
 - lib/generators/redmine_extensions/entity/templates/edit.html.erb.erb
+- lib/generators/redmine_extensions/entity/templates/edit.js.erb.erb
 - lib/generators/redmine_extensions/entity/templates/en.yml.erb
 - lib/generators/redmine_extensions/entity/templates/helper.rb.erb
 - lib/generators/redmine_extensions/entity/templates/hooks.rb.erb
@@ -150,6 +153,7 @@ files:
 - lib/generators/redmine_extensions/entity/templates/migration.rb.erb
 - lib/generators/redmine_extensions/entity/templates/model.rb.erb
 - lib/generators/redmine_extensions/entity/templates/new.html.erb.erb
+- lib/generators/redmine_extensions/entity/templates/new.js.erb.erb
 - lib/generators/redmine_extensions/entity/templates/query.rb.erb
 - lib/generators/redmine_extensions/entity/templates/routes.rb.erb
 - lib/generators/redmine_extensions/entity/templates/show.api.rsb.erb