kuppayam 0.1.5dev4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85f6707e4fd3e6cc5fb402e489820c8a9251be63
-  data.tar.gz: 789034cf9ba14f8aba6513cd9707bb026c4277b7
+  metadata.gz: 4676b3dd1e5b1e1aa4cdfb38d0f58ac27b4663db
+  data.tar.gz: e9b098bb964226ce769cdf72a457ec32edd5fabe
 SHA512:
-  metadata.gz: 4095f94e3bd48b0b18dcf010b71681ef4139c47daceb8fffe4dae6ac8feeb804c25bac4a5dbbdb87f0ef0912477ac0160b72dd54ba57ccfd2735b445d28ec958
-  data.tar.gz: 55417a161f925d62f0a1ec61d8705af7b830b71c2522bcbc06560d83ea11d4605bdee227b1bdef78e89e99c18bf5648f713c51fd1277395cc2d84c5071c9b1ff
+  metadata.gz: 9ecdb776c31b557709fee68bb6d7c1decf1d85329c4e11af9caa92f369ccdd56e8eeef81a48c4b1c72ae48ba94827991d6b3608759dbfa7125109b2748cbbf60
+  data.tar.gz: 3cab488cff39fc704688367d3e83bd4c553a38dcac07a1032f346c9bb884cf4332476d84df366cee978c2afbd9e0623f73dbd01272e8965929863f31acc33cf8

data/app/assets/javascripts/kuppayam.js

@@ -12,7 +12,6 @@
 //
 //= require kuppayam/utilities.js
 //= require bootstrap.min.js
-//= require moment.min.js
 //= require TweenMax.min.js
 //= require resizeable.js
 //= require joinable.js
@@ -22,7 +21,5 @@
 //= require wysihtml5/lib/js/wysihtml5-0.3.0.js
 //= require wysihtml5/src/bootstrap-wysihtml5.js
 //= require toastr/toastr.min.js
-//= require daterangepicker/daterangepicker.js
-//= require multiselect/js/jquery.multi-select.js
 
 

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

@@ -10,31 +10,10 @@ 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){
@@ -93,13 +72,6 @@ function showMessageModal(heading, message, modalId){
   }, 1000);
 }
 
-function closeImageUploadModal(modalId){
-  $('#' + imageUploadModalId).modal('hide');  
-
-  showAndHideModals();
-}
-
-
 function closeGenericModal(modalId){
   $('#' + genericModalId).modal('hide');  
 

data/app/assets/stylesheets/kuppayam.css

@@ -20,5 +20,4 @@
  *= require kuppayam/handycss.css
  *= require kuppayam/custom.css
  *= require wysihtml5/src/bootstrap-wysihtml5.css
- *= require multiselect/css/multi-select.css
  */

data/app/controllers/kuppayam/base_controller.rb

@@ -3,15 +3,13 @@ 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
     
@@ -46,14 +44,6 @@ 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,10 +12,6 @@ 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/breadcrumbs_helper.rb

@@ -21,7 +21,7 @@ module BreadcrumbsHelper
   # Initialize @links in your controller action
   def breadcrumb
     if @breadcrumbs && @breadcrumbs.has_key?(:links) && @breadcrumbs[:links].any?
-      content_tag(:div, class: "breadcrumb-env hidden-xs") do
+      content_tag(:div, class: "breadcrumb-env") do
         content_tag(:ol, class: "breadcrumb bc-1") do
           li_array = []
           @breadcrumbs[:links].each do |item|

data/app/helpers/filter_helper.rb

@@ -3,6 +3,7 @@ module FilterHelper
   
   def configure_filters
     configure_filter_settings
+    configure_filter_ui_settings
     configure_filter_param_mapping
   end
 
@@ -97,8 +98,6 @@ module FilterHelper
       options = rpf[:options] || {}
       parse_reference_filter_from_params(rpf[:filter_name], rpf[:filter_class], options)
     end if filter_settings.has_key?(:reference_filters)
-
-    configure_filter_ui_settings
   end
   
   # Use this method to create a filter if the value is in a variable
@@ -330,15 +329,10 @@ module FilterHelper
     end
     selected_text = filter_options[:select_label] unless selected_text
 
-    # Clone the existing filters first
+    # Clone the existing filters firs
     # remove the filters which are to be removed and add which are to be added
     # Also remove the filter which is currently selected
-
-    unless filter_options[:current_filters].blank?
-      temp_filters = {}
-    else
-      temp_filters = filter_options[:current_filters].clone
-    end
+    temp_filters = filter_options[:current_filters].clone
     temp_filters.merge!(filter_options[:filters_to_add])
     temp_filters.reject!{|k,v| filter_options[:filters_to_remove].include?(k)}
     temp_filters.reject!{|k,v| k == filter_name.to_sym }

data/app/helpers/render_helper.rb

@@ -7,9 +7,6 @@ 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")
@@ -18,10 +15,7 @@ module RenderHelper
       notifyError('#{heading}','#{message}');
     eos
     respond_to do |format|
-      format.html { 
-        #redirect_to root_path
-        render template: '/kuppayam/404', layout: 'kuppayam/blank', :status => 404
-      }
+      format.html { render :status => 404 }
       format.js { render text: js_message }
     end
   end
@@ -44,10 +38,7 @@ module RenderHelper
 
   def render_accordingly
     respond_to do |format|
-      format.html { 
-        get_collections
-        render :index
-      }
+      format.html { get_collections and render params[:action].to_sym }
       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(true, I18n.t('status.success'), I18n.t('success.deleted', item: default_item_name.titleize))
+        set_notification(false, 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,11 +114,7 @@ module ResourceHelper
   end
 
   def default_collection_name
-    begin
-      params[:controller].split("/").last
-    rescue
-      :items
-    end
+    params[:controller].split("/").last
   end
 
   def default_item_name
@@ -126,11 +122,7 @@ module ResourceHelper
   end
 
   def default_class
-    begin
-      default_collection_name.singularize.camelize.constantize
-    rescue
-      nil
-    end
+    default_collection_name.singularize.camelize.constantize
   end
 
   def resource_controller_configuration
@@ -145,8 +137,6 @@ module ResourceHelper
       item_name: default_item_name,
       class: default_class,
       layout: :table,
-      show_modal_after_create: 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,8 +1,5 @@
 module Kuppayam
 	class ApplicationRecord < ActiveRecord::Base
 	  self.abstract_class = true
-
-	  extend Kuppayam::Importer
-	  extend Kuppayam::Validators
 	end
 end

data/app/uploaders/document_uploader.rb

@@ -1,13 +1,13 @@
 # encoding: utf-8
 
-class DocumentUploader < CarrierWave::Uploader::Base
+class ImageUploader < 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
-   "#{Rails.root}/uploads/#{model.class.to_s.underscore}/#{model.id}"
+   "uploads/#{Rails.env}/#{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.closeDocumentUploadModal();
+    this.parent.closeGenericModal();
 
     //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, true);
+showGenericModal(heading, bodyContent);
 
 // 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, true);
+showGenericModal(heading, bodyContent);
 
 // 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, true);
+    // this.parent.showGenericModal(heading, bodyContent);
     // this.parent.cropDocument("form_crop_photo");
 
     this.parent.$(".<%= @resource.id %>-large-document").attr("src", "<%= @document.document.large.url %>");

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

@@ -11,7 +11,7 @@
 
 			var bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
 
-			this.parent.showImageUploadModal(heading, bodyContent, true);
+			this.parent.showGenericModal(heading, bodyContent);
 
 			<%
 		    text = "You have few errors. They have been highlighted."
@@ -22,7 +22,7 @@
 
   	<% else %>
 
-	    this.parent.closeImageUploadModal();
+	    this.parent.closeGenericModal();
 
 	    //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.closeImageUploadModal();
+    this.parent.closeGenericModal();
 
     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 %>
-	var heading = "Edit <%= @image_type.split('::').last.titleize %>";
+	heading = "Edit <%= @image_type.split('::').last.titleize %>";
 <% else %>
-	var heading = "Edit Image";
+	heading = "Edit Image";
 <% end %>
 
 bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
-showImageUploadModal(heading, bodyContent, true);
+showGenericModal(heading, bodyContent);

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

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

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

@@ -11,7 +11,7 @@
 
 			bodyContent = "<%= escape_javascript(render(:partial=>'form')) %>";
 
-			this.parent.showImageUploadModal(heading, bodyContent);
+			this.parent.showGenericModal(heading, bodyContent);
 
 			<%
 		    text = "You have few errors. They have been highlighted."
@@ -22,11 +22,11 @@
 
   	<% else %>
 
-	    this.parent.closeImageUploadModal();
+	    this.parent.closeGenericModal();
 
 	    // var heading = "Crop Image";
 	    // var bodyContent = "<%#= escape_javascript(render(:partial=>'crop_form')) %>";
-	    // this.parent.showGenericModal(heading, bodyContent, true);
+	    // this.parent.showGenericModal(heading, bodyContent);
 	    // 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, true);
+showGenericModal(heading, bodyContent);
 
 // 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, true);
+    // this.parent.showGenericModal(heading, bodyContent);
     // 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,18 +1,13 @@
 <% 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");
 
-  <% 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 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);
 
   // Showing Growl Like Message
   notifySuccess("<%= escape_javascript(@notification[:title]) %>", "<%= escape_javascript(@notification[:message]) %>");
@@ -22,7 +17,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, true);
+	showGenericModal(heading, bodyContent);
 
   // 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, true);
+showGenericModal(heading, bodyContent);
 
 // 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].to_s.titleize %>";
+var heading = "Add <%= @resource_options[:collection_name] %>";
 var bodyContent = "<%= escape_javascript(render(:partial=>"#{@resource_options[:view_path]}/form")) %>";
-showGenericModal(heading, bodyContent, true);
+showGenericModal(heading, bodyContent);
 
 // Initialize WYSIHTML Editor
 $(".wysihtml5").wysihtml5(