kuppayam 0.1.4 → 0.1.5dev

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 010cd4163a70c1045f7c09ce9e74c0f3902fa657
-  data.tar.gz: 4c1b0b8d2009939b0b60b584fbc6d7573fa9dd53
+  metadata.gz: fff25b3a1858e13c0a72ee9861fa55f751105138
+  data.tar.gz: 7783a9884305b36e07f684ad1e4714d5b0213bde
 SHA512:
-  metadata.gz: 3a862691aa5c6eacc14fa9f34935618165e898a9e332c4f1297ba07d2752f1f9d6d76c4624bec85d501b58d5f6f9d7bcb3b92c4cb3e384a4dad25a870b035efb
-  data.tar.gz: a85a021f0b4eb4d2e723fe9cbc3a1df4f877d33c1f5b1869b44a91d89f4dc575c8e4ccc5eeda2831f9eb07ccb54902c987ad96d6e7e9e3696344e0763e5794e6
+  metadata.gz: e9429774ce4e5947e544bf4d1790ff7d91618bbf4b5d9f96f0ce831f9af66241948e0bc8294ff9f347ae24c7f4477d5d0bbd0df26171fa5c6abb0043ecbd1b9f
+  data.tar.gz: 353c1658f2722045525eb57431a3e924429c3254c6b515e24288f1c7163d0dffc75c24dae8d9c7eba923be7804650f22cfe76a3a13ded23c4d4fae1971d5b693

data/app/assets/javascripts/kuppayam/utilities.js

@@ -10,10 +10,31 @@ function sendAjaxRequest(url, mType){
   jQuery.ajax({type: methodType, dataType:"script", url:url});
 }
 
+var imageUploadModalId = "div_modal_image_upload";
 var genericModalId = "div_modal_generic";
 var largeModalId = "div_modal_large";
 var messageModalId = "div_modal_message";
 
+// Call this function by passing  model Id, heading and a bodyContent.
+// it will pop up bootstrap 3 modal.
+function showImageUploadModal(heading, bodyContent, showHeading){
+  $('#' + imageUploadModalId + ' .modal-header .modal-title').text(heading);
+  $('#' + imageUploadModalId + ' div.modal-body-main').html(bodyContent);
+  $('#' + imageUploadModalId).modal({show: true, backdrop: 'static', keyboard: false});
+  
+  if(showHeading){
+    $('#' + imageUploadModalId + ' .modal-header').show();
+  }
+  else {
+    $('#' + imageUploadModalId + ' .modal-header').hide();
+  }
+
+  setTimeout(function() {
+    $('#' + imageUploadModalId).modal('handleUpdate'); //Update backdrop on modal show
+    $('#' + imageUploadModalId).scrollTop(0); //reset modal to top position
+  }, 1000);
+}
+
 // Call this function by passing  model Id, heading and a bodyContent.
 // it will pop up bootstrap 3 modal.
 function showGenericModal(heading, bodyContent, showHeading){
@@ -72,6 +93,13 @@ function showMessageModal(heading, message, modalId){
   }, 1000);
 }
 
+function closeImageUploadModal(modalId){
+  $('#' + imageUploadModalId).modal('hide');  
+
+  showAndHideModals();
+}
+
+
 function closeGenericModal(modalId){
   $('#' + genericModalId).modal('hide');  
 

data/app/assets/stylesheets/kuppayam/custom.css

@@ -52,4 +52,11 @@
 .btn.btn-secondary.btn-only-hover:hover{
   background-color: #68b828 !important;
   color: #fff !important;
-}
+}
+
+// Fix for overriding fa-class conflicts
+
+.fade-in-effect {
+  display:block !important;
+}
+

data/app/controllers/kuppayam/base_controller.rb

@@ -3,13 +3,15 @@ module Kuppayam
     
     protect_from_forgery with: :exception
     rescue_from ActionController::InvalidAuthenticityToken, :with => :handle_invalid_authenticity_token
-
+    
     layout 'kuppayam/admin'
 
+    before_action :get_nested_resource_objects
     before_action :set_locale, :stylesheet_filename, :javascript_filename,
                   :set_default_title, :set_navs, :parse_pagination_params,
                   :configure_filters, :configure_notification, :configure_breadcrumbs
 
+
     include ParamsParserHelper
     include RenderHelper
     
@@ -44,6 +46,14 @@ module Kuppayam
       { locale: I18n.locale }
     end
 
+    # This is more like a hooker method which is called 
+    # before all other before_action method.
+    # This method can be overriden by inherited controller classes
+    # An e.g: would be to call a method to get @store object from params[:store_id]
+    # The object @store has to be initiated before the breadcrumbs or set_title methods are called
+    def get_nested_resource_objects
+    end
+
     def stylesheet_filename
       @stylesheet_filename = "kuppayam"
     end

data/app/controllers/kuppayam/documents_controller.rb

@@ -12,6 +12,10 @@ module Kuppayam
       @document = @document_class.find(params[:id])
     end
 
+    def download
+      @document = @document_class.find(params[:id])
+    end
+
     def new
       @document = @document_class.new
     end

data/app/helpers/flash_helper.rb

@@ -39,7 +39,7 @@ module FlashHelper
 
     message = message.strip if message
 
-    content_tag(:div, class: "alert #{cls_name} fade in mb-10", "data-alert" => "alert") do
+    content_tag(:div, class: "alert #{cls_name} mb-10", "data-alert" => "alert") do
       raw(link_to("×", "#", class: "close", "data-dismiss" => "alert") + content_tag(:p, message))
     end unless message.blank?
   end

data/app/helpers/render_helper.rb

@@ -7,6 +7,9 @@ module RenderHelper
     end
   end
 
+  # TODO - This is still not fixed.
+  # May be it will work on Ajax Request and show sign in pop up.
+  # This is not working for HTTP direct requests
   def handle_invalid_authenticity_token
     heading = I18n.t("status.invalid_token.heading")
     message = I18n.t("status.invalid_token.message")
@@ -15,7 +18,10 @@ module RenderHelper
       notifyError('#{heading}','#{message}');
     eos
     respond_to do |format|
-      format.html { render :status => 404 }
+      format.html { 
+        #redirect_to root_path
+        render template: '/kuppayam/404', layout: 'kuppayam/blank', :status => 404
+      }
       format.js { render text: js_message }
     end
   end
@@ -38,7 +44,10 @@ module RenderHelper
 
   def render_accordingly
     respond_to do |format|
-      format.html { get_collections and render params[:action].to_sym }
+      format.html { 
+        get_collections
+        render :index
+      }
       format.js  { 
         view_path = @resource_options && @resource_options[:view_path] ? "#{@resource_options[:js_view_path]}/#{params[:action]}" : params[:action].to_sym
         render view_path

data/app/helpers/resource_helper.rb

@@ -64,7 +64,7 @@ module ResourceHelper
         @r_object.destroy
         get_collections
         set_flash_message(I18n.t('success.deleted'), :success)
-        set_notification(false, I18n.t('status.success'), I18n.t('success.deleted', item: default_item_name.titleize))
+        set_notification(true, I18n.t('status.success'), I18n.t('success.deleted', item: default_item_name.titleize))
         @destroyed = true
       else
         message = I18n.t('errors.failed_to_delete', item: default_item_name.titleize)
@@ -114,7 +114,11 @@ module ResourceHelper
   end
 
   def default_collection_name
-    params[:controller].split("/").last
+    begin
+      params[:controller].split("/").last
+    rescue
+      :items
+    end
   end
 
   def default_item_name
@@ -122,7 +126,11 @@ module ResourceHelper
   end
 
   def default_class
-    default_collection_name.singularize.camelize.constantize
+    begin
+      default_collection_name.singularize.camelize.constantize
+    rescue
+      nil
+    end
   end
 
   def resource_controller_configuration
@@ -137,6 +145,8 @@ module ResourceHelper
       item_name: default_item_name,
       class: default_class,
       layout: :table,
+      show_modal_after_update: true,
+      show_modal_after_update: true,
       view_path: "/kuppayam/workflows/peacock",
       js_view_path: "/kuppayam/workflows/peacock"
     }

data/app/models/kuppayam/application_record.rb

@@ -1,5 +1,9 @@
 module Kuppayam
 	class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
+
+	  require 'kuppayam/importer.rb'
+	  extend Kuppayam::Importer
+	  extend KuppayamValidators
 	end
 end

data/app/uploaders/document_uploader.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
-class ImageUploader < CarrierWave::Uploader::Base
+class DocumentUploader < CarrierWave::Uploader::Base
 
   # Override the directory where uploaded files will be stored.
   # This is a sensible default for uploaders that are meant to be mounted:
   def store_dir
-   "uploads/#{Rails.env}/#{model.class.to_s.underscore}/#{model.id}"
+   "#{Rails.root}/uploads/#{model.class.to_s.underscore}/#{model.id}"
   end
-  
+
   def cache_dir
    Rails.root.join 'tmp/uploads'
   end

data/app/views/kuppayam/documents/create.html.erb

@@ -1,6 +1,6 @@
 <%= content_for :javascript_footer do %>
   <script type="text/javascript">
-    this.parent.closeGenericModal();
+    this.parent.closeDocumentUploadModal();
 
     //var heading = "Crop Document";
     //var bodyContent = "<%#= escape_javascript(render(:partial=>"crop_form")) %>";

data/app/views/kuppayam/documents/edit.js.erb

@@ -1,7 +1,7 @@
 // Show the new form in the right box.
 heading = "Upload Document";
 bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
-showGenericModal(heading, bodyContent);
+showGenericModal(heading, bodyContent, true);
 
 // When the document upload form is submitted, the server response will appear in this iframe -->
 var $div = $('<iframe id="iframe_document" name="iframe_document" width="100%" style="display:none"></iframe>').appendTo('body');

data/app/views/kuppayam/documents/new.js.erb

@@ -1,7 +1,7 @@
 // Show the new form in the right box.
 heading = "Upload Document";
 bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
-showGenericModal(heading, bodyContent);
+showGenericModal(heading, bodyContent, true);
 
 // When the document upload form is submitted, the server response will appear in this iframe -->
 var $div = $('<iframe id="iframe_document" name="iframe_document" width="100%" style="display:none"></iframe>').appendTo('body');

data/app/views/kuppayam/documents/update.html.erb

@@ -4,7 +4,7 @@
 
     // var heading = "Crop Document";
     // var bodyContent = "<%#= escape_javascript(render(:partial=>'crop_form')) %>";
-    // this.parent.showGenericModal(heading, bodyContent);
+    // this.parent.showGenericModal(heading, bodyContent, true);
     // this.parent.cropDocument("form_crop_photo");
 
     this.parent.$(".<%= @resource.id %>-large-document").attr("src", "<%= @document.document.large.url %>");

data/app/views/kuppayam/http_status/404.html.erb

@@ -0,0 +1 @@
+Temporary

data/app/views/kuppayam/images/create.html.erb

@@ -11,7 +11,7 @@
 
 			var bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
 
-			this.parent.showGenericModal(heading, bodyContent);
+			this.parent.showImageUploadModal(heading, bodyContent, true);
 
 			<%
 		    text = "You have few errors. They have been highlighted."
@@ -22,7 +22,7 @@
 
   	<% else %>
 
-	    this.parent.closeGenericModal();
+	    this.parent.closeImageUploadModal();
 
 	    //var heading = "Crop Image";
 	    //var bodyContent = "<%#= escape_javascript(render(:partial=>"crop_form")) %>";

data/app/views/kuppayam/images/crop.html.erb

@@ -1,6 +1,6 @@
 <%= content_for :javascript_footer do %>
   <script type="text/javascript">
-    this.parent.closeGenericModal();
+    this.parent.closeImageUploadModal();
 
     this.parent.$(".<%= @resource.id %>-large-image").attr("src", "<%= @image.image.large.url %>");
     this.parent.$(".<%= @resource.id %>-small-image").attr("src", "<%= @image.image.small.url %>");

data/app/views/kuppayam/images/edit.js.erb

@@ -1,8 +1,8 @@
 <% if @image_type %>
-	heading = "Edit <%= @image_type.split('::').last.titleize %>";
+	var heading = "Edit <%= @image_type.split('::').last.titleize %>";
 <% else %>
-	heading = "Edit Image";
+	var heading = "Edit Image";
 <% end %>
 
 bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
-showGenericModal(heading, bodyContent);
+showImageUploadModal(heading, bodyContent, true);

data/app/views/kuppayam/images/new.js.erb

@@ -5,4 +5,4 @@
 <% end %>
 
 bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
-showGenericModal(heading, bodyContent);
+showImageUploadModal(heading, bodyContent);

data/app/views/kuppayam/images/update.html.erb

@@ -11,7 +11,7 @@
 
 			bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
 
-			this.parent.showGenericModal(heading, bodyContent);
+			this.parent.showImageUploadModal(heading, bodyContent);
 
 			<%
 		    text = "You have few errors. They have been highlighted."
@@ -22,11 +22,11 @@
 
   	<% else %>
 
-	    this.parent.closeGenericModal();
+	    this.parent.closeImageUploadModal();
 
 	    // var heading = "Crop Image";
 	    // var bodyContent = "<%#= escape_javascript(render(:partial=>'crop_form')) %>";
-	    // this.parent.showGenericModal(heading, bodyContent);
+	    // this.parent.showGenericModal(heading, bodyContent, true);
 	    // this.parent.cropImage("form_crop_photo");
 
 	    this.parent.$(".<%= @resource.id %>-large-image").attr("src", "<%= @image.image.large.url %>");

data/app/views/kuppayam/import_data/new.js.erb

@@ -5,7 +5,7 @@
 	heading = "Import Data";
 <% end %>
 bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
-showGenericModal(heading, bodyContent);
+showGenericModal(heading, bodyContent, true);
 
 // When the document upload form is submitted, the server response will appear in this iframe -->
 var $div = $('<iframe id="iframe_document" name="iframe_document" width="100%" style="display:none"></iframe>').appendTo('body');

data/app/views/kuppayam/import_data/update.html.erb

@@ -4,7 +4,7 @@
 
     // var heading = "Crop Document";
     // var bodyContent = "<%#= escape_javascript(render(:partial=>'crop_form')) %>";
-    // this.parent.showGenericModal(heading, bodyContent);
+    // this.parent.showGenericModal(heading, bodyContent, true);
     // this.parent.cropDocument("form_crop_photo");
 
     this.parent.$(".<%= @resource.id %>-large-document").attr("src", "<%= @document.document.large.url %>");

data/app/views/kuppayam/workflows/parrot/create.js.erb

@@ -1,13 +1,18 @@
 <% if @r_object.errors.blank? %>
   
   // Inserting the row on top of the table and highlighting it
-  $('#div_<%= @resource_options[:item_name] %>_index table > tbody').prepend("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: {@resource_options[:item_name].to_sym => @r_object, i: -1})) %>")
+  $('#div_<%= @resource_options[:item_name] %>_index table > tbody').prepend("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: {@resource_options[:item_name].to_sym => @r_object, i: -1})) %>");
   $("#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>").css("background-color", "#fffddd");
 
-  // Showing the saved data in the modal
-  var heading = "<%= raw @r_object.try(:display_name) %>";
-  var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
-  showGenericModal(heading, bodyContent, false);
+  <% if @resource_options[:show_modal_after_create] %>
+    // Showing the saved data in the modal
+    var heading = "<%= raw @r_object.try(:display_name) %>";
+    var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
+    showGenericModal(heading, bodyContent, false);
+  <% else %>
+    // Closing the modal if it is opened
+    closeGenericModal();
+  <% end %>
 
   // Showing Growl Like Message
   notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
@@ -17,7 +22,7 @@
   // Reload the form with errors
 	var heading = "Add an <%= @resource_options[:collection_name] %>";
 	var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
-	showGenericModal(heading, bodyContent);
+	showGenericModal(heading, bodyContent, true);
 
   // Show Main Error Message on the form
   <% error_message = content_tag(:div, I18n.t('errors.errors_highlighted'), class: "alert alert-danger mt-20") %>

data/app/views/kuppayam/workflows/parrot/edit.js.erb

@@ -1,7 +1,7 @@
 // Load the form
 var heading = "Edit '<%= raw @r_object.try(:display_name) %>'";
 var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
-showGenericModal(heading, bodyContent);
+showGenericModal(heading, bodyContent, true);
 
 // Initialize WYSIHTML Editor
 $(".wysihtml5").wysihtml5(

data/app/views/kuppayam/workflows/parrot/new.js.erb

@@ -1,7 +1,7 @@
 // Load the form
-var heading = "Add <%= @resource_options[:collection_name] %>";
+var heading = "Add <%= @resource_options[:collection_name].to_s.titleize %>";
 var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
-showGenericModal(heading, bodyContent);
+showGenericModal(heading, bodyContent, true);
 
 // Initialize WYSIHTML Editor
 $(".wysihtml5").wysihtml5(

data/app/views/kuppayam/workflows/parrot/row.js.erb

@@ -1,7 +1,7 @@
 <% if @r_object && @r_object.errors.blank? %>
 	
 	// Updating the edited row and highlighting it
-	$("#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>").replaceWith("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: { @resource_options[:item_name].to_sym => @r_object, i: -1})) %>")
+	$("#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>").replaceWith("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: { @resource_options[:item_name].to_sym => @r_object, i: -1})) %>");
 	$("#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>").css("background-color", "#fffddd");
   
   // Refresh the modal content if it is open

data/app/views/kuppayam/workflows/parrot/update.js.erb

@@ -4,10 +4,15 @@
   $('#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>').replaceWith("<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/row", locals: { @resource_options[:item_name].to_sym => @r_object, i: -1})) %>");
   $("#tr_<%= @resource_options[:item_name] %>_<%= @r_object.id %>").css("background-color", "#fffddd");
   
-  // Showing the saved data in the modal
-  var heading = "<%= raw @r_object.try(:display_name) %>";
-  var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
-  showGenericModal(heading, bodyContent, false);
+  <% if @resource_options[:show_modal_after_update] %>
+    // Showing the saved data in the modal
+    var heading = "<%= raw @r_object.try(:display_name) %>";
+    var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/show")) %>";
+    showGenericModal(heading, bodyContent, false);
+  <% else %>
+    // Closing the modal if it is opened
+    closeGenericModal();
+  <% end %>
 
   // Showing Growl Like Message
   notifySuccess("<%= @notification[:title] %>", "<%= @notification[:message] %>");
@@ -17,7 +22,7 @@
 	// Reload the form with errors
 	var heading = "Edit '<%= raw @r_object.try(:display_name) %>'";
 	var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
-	showGenericModal(heading, bodyContent);
+	showGenericModal(heading, bodyContent, true);
 
 	// Show Main Error Message on the form
   <% error_message = content_tag(:div, I18n.t('errors.errors_highlighted'), class: "alert alert-danger mt-20") %>