kirgudu_base 0.0.3 → 0.0.4

data/app/controllers/kirgudu_base/admin_controller.rb

@@ -18,52 +18,9 @@ module KirguduBase
 			@entry
 		end
 
-		def base_entry
-			#@current_portal
-		end
-
 
 		include KirguduBase::GuiHelper
 
-		#before_action :update_url_with_ajax_referer_url
-
-		#def create_breadcrumbs
-		#
-		#	#if self.class == ::Admin::DashboardController
-		#	#	add_new_breadcrumb(I18n.t("#{::Admin::DashboardController.to_i18n}.index.title"))
-		#	#	return
-		#	#end
-		#	#
-		#	#add_new_breadcrumb(
-		#	#	I18n.t("#{::Admin::DashboardController.to_i18n}.index.title"),
-		#	#	::Admin::DashboardController.to_url_for
-		#	#)
-		#	#
-		#	#if self.action_name == "index"
-		#	#	add_new_breadcrumb(I18n.t("#{self.to_i18n}.index.title"))
-		#	#else
-		#	#	add_new_breadcrumb(
-		#	#		I18n.t("#{self.to_i18n}.index.title"),
-		#	#		url_for(controller: ::ChupakabraTools::ClassHelper.controller_underscore(self), action: "index")
-		#	#	)
-		#	#
-		#	#	if ['new', 'create'].include?(self.action_name)
-		#	#		add_new_breadcrumb(I18n.t("#{self.to_i18n}.new.title"))
-		#	#	elsif ['edit', 'update', 'show'].include?(self.action_name)
-		#	#		entry = self.current_entry
-		#	#
-		#	#		if entry
-		#	#			if entry.respond_to?(:name_for_breadcrumbs)
-		#	#				add_new_breadcrumb(entry.name_for_breadcrumbs)
-		#	#			else
-		#	#				add_new_breadcrumb(entry.id)
-		#	#			end
-		#	#		else
-		#	#			add_new_breadcrumb(params[:id])
-		#	#		end
-		#	#	end
-		#	#end
-		#end
 
 		protected
 
@@ -75,7 +32,7 @@ module KirguduBase
 			end
 		end
 
-		private
+		protected
 
 		def before_entry_create(entry, filter_params, options)
 			entry.creator = @current_user if entry.respond_to?(:creator)

data/app/controllers/kirgudu_base/application_controller.rb

@@ -31,11 +31,15 @@ module KirguduBase
 		end
 
 
+		def entry_class
+			self.class.get_kb_entry_class
+		end
+
 		def global_values_register
 
 			@current_user = get_current_user
 
-			@settings_manager = ::System::Settings::SettingsManager.new
+			@settings_manager = ::KirguduBase::Settings::SettingsManager.new
 
 			default_host_to_set = request.host
 			default_host_to_set += ":#{request.port}" if  request.port && request.port != 80
@@ -62,7 +66,7 @@ module KirguduBase
 				#params[:back_url] = request.path
 				respond_to do |format|
 					#format.js { render partial: "sessions/login", layout: false}
-					format.html { redirect_to security_login_url, flash: {alert: I18n.t("admin.security.authentications.messages.please_login")} }
+					format.html { redirect_to ::KirguduBase.authentications_controller.to_url_for(:login) }
 				end
 			end
 		end
@@ -108,8 +112,8 @@ module KirguduBase
 			#end
 		end
 
-		def add_new_breadcrumb(name, path = nil)
-			self.breadcrumbs << {label: name, url: path}
+		def add_new_breadcrumb(label, path = nil)
+			self.breadcrumbs << {label: label, url: path}
 		end
 
 
@@ -126,71 +130,6 @@ module KirguduBase
 		end
 
 
-		#########################################################################################################################
-		##################################             Views Default Paths             ##########################################
-		#########################################################################################################################
-
-
-		def get_view_path_for_page_new
-			view_path = "/shared/entry_new_form_renderer"
-
-			if self.respond_to?(:views_paths_new)
-				view_path = self.views_paths_new
-			end
-			view_path
-		end
-
-
-		def get_view_path_for_page_edit
-			view_path = "/shared/entry_edit_form_renderer"
-
-			if self.respond_to?(:views_paths_edit)
-				view_path = self.views_paths_edit
-			end
-			view_path
-		end
-
-
-		def get_view_path_for_page_index
-			view_path = "/shared/entry_index_renderer"
-
-			if self.respond_to?(:views_paths_index)
-				view_path = self.views_paths_index
-			end
-			view_path
-		end
-
-
-		def get_view_path_for_page_show
-			view_path = "/shared/entry_show_renderer"
-
-			if self.respond_to?(:views_paths_show)
-				view_path = self.views_paths_show
-			end
-			view_path
-		end
-
-
-		def get_not_found_view_path
-			view_path = "/shared/entry_not_found_renderer"
-
-			if self.respond_to?(:views_paths_entry_not_found)
-				view_path = self.views_paths_entry_not_found
-			end
-			view_path
-		end
-
-
-		def get_view_path_for_page_404
-			view_path = "/shared/404"
-
-			if self.respond_to?(:views_paths_404_page)
-				view_path = self.views_paths_404_page
-			end
-			view_path
-		end
-
-
 		#########################################################################################################################
 		#############################            I18n String Generator  Methods             #####################################
 		#########################################################################################################################
@@ -223,18 +162,24 @@ module KirguduBase
 		#include ActionDispatch::Routing
 		#include Rails.application.routes.url_helpers
 
-		def self.to_url_for(action = nil, options = {})
+		def self.to_url_for(action, options = {})
 			options ||= {}
 			options.merge!(
 				only_path: true,
 				controller: self.to_route_path,
-				action: action || :index
+				action: action
 			)
 			Rails.application.routes.url_helpers.url_for(options)
 		end
 
 		def to_url_for(action = nil, options = {})
 			self.class.to_url_for(action, options)
+			#options ||= {}
+			#options.merge!(
+			#	controller: self.to_route_path,
+			#	action: action || :index
+			#)
+			#Rails.application.routes.url_helpers.url_for(options)
 		end
 
 
@@ -246,7 +191,7 @@ module KirguduBase
 		def class_strong_params(form)
 			prms = []
 			if form.properties
-				form.properties.each do |property|
+				form.properties.each_pair do |key, property|
 					unless property.read_only == :true
 						prms << property.name
 					end
@@ -285,14 +230,45 @@ module KirguduBase
 				result[filter.name] = source_value if source_value
 			end if list.filters
 
-			source_value = source[:page]
-			result[:page] = source_value if source_value
-			source_value = source[:per_page]
-			result[:per_page] = source_value if source_value
+			begin
+				source_value = source[:page]
+				result[:page] = source_value.to_i if source_value
+			rescue
+			end
+
+			begin
+				source_value = source[:per_page]
+				result[:per_page] = source_value.to_i if source_value
+			rescue
+			end
 			result
 		end
 
 
+		#########################################################################################################################
+		##################################             Class Hierarchy Methods           ########################################
+		#########################################################################################################################
+
+		def get_class_hierarchy
+			self.class.get_class_hierarchy
+		end
+
+		def self.get_class_hierarchy
+			::ChupakabraTools::ClassHelper.get_controller_hierarchy(self)
+		end
+
+		def get_class_variable(name)
+			self.class.get_class_variable(name)
+		end
+
+		def self.get_method_latest_result(method_name, *method_args)
+			method_result = nil
+			self.get_class_hierarchy.each do |controller_class|
+				method_result = controller_class.send(method_name, *method_args) if controller_class.respond_to?(method_name)
+				return method_result if method_result
+			end
+		end
+
 		#########################################################################################################################
 		###################################             Dynamic Transactions            #########################################
 		#########################################################################################################################
@@ -302,17 +278,16 @@ module KirguduBase
 
 			transaction_is_ok = true
 
-			classes_to_process = ::ChupakabraTools::ClassHelper.get_controller_hierarchy(self.class)
-
+			classes_to_process = self.get_class_hierarchy
 			classes_to_process.each do |controller_klass|
-				available_injections = controller_klass.respond_to?(:get_kb_transaction_injections) ? controller_klass.get_kb_transaction_injections(action, flow_position) : []
-				# raise "Available Transaction Injections: #{available_injections.to_json}" if flow_position == :before_save
-
-				available_injections.each do |injection|
-					#raise "Processing Transaction Injection"
-					if self.send(injection.method, entry, filter_params, options) == false
-						transaction_is_ok &= false
-					end
+				if controller_klass.respond_to?(:get_kb_transaction_injections)
+					available_injections = controller_klass.get_kb_transaction_injections(action, flow_position)
+					available_injections.each do |injection|
+						#raise "Processing Transaction Injection"
+						if self.send(injection.method, entry, filter_params, options) == false
+							transaction_is_ok &= false
+						end
+					end if available_injections
 				end
 			end
 			transaction_is_ok
@@ -342,7 +317,7 @@ module KirguduBase
 		def fill_obligatory_filters(filters, options = {})
 			options ||= {}
 
-			classes_to_process = ::ChupakabraTools::ClassHelper.get_controller_hierarchy(self.class)
+			classes_to_process = self.get_class_hierarchy
 
 			classes_to_process.each do |kontroller_klass|
 				kontroller_klass.get_kb_obligatory_filters.each do |filter|
@@ -377,26 +352,29 @@ module KirguduBase
 		def load_data_for_entry_controls(form, entry, options = {})
 			controls_data = {}
 
-			form.properties.select { |p| !p.data_source.nil? }.each do |property|
+
+			form.properties.values.select { |p| !p.data_source.nil? }.each do |property|
 				if property.data_source
 					controls_data[property.name] = if property.data_source.type == :db || property.data_source.type == :jquery_db
 						                               filters = {}
+						                               parent_value = nil
 						                               if property.parent
 							                               parent_value = entry[property.parent]
-							                               filters[property.parent] = entry[property.parent] if parent_value
+							                               filters[property.parent] = parent_value
 						                               end
-						                               fill_obligatory_filters(filters, options)
+
+						                               self.fill_obligatory_filters(filters, options)
 						                               filters.merge!({
 							                                              per_page: 9999999,
 							                                              page: 1
 						                                              })
-						                               property.data_source.model.get_entries(nil, filters, options).map { |u| [u.send(property.data_source.label_property), u.send(property.data_source.value_property)] }
+						                               property.data_source.model.get_entries(nil, filters, options).map { |u| [u.send(property.data_source.label_property), u.send(property.data_source.value_property)] } if property.parent.nil? || parent_value
 						                           elsif property.data_source.type == :i18n
 
 						                           elsif property.data_source.type == :enum
 							                           property.data_source.model.to_select
 						                           elsif property.data_source.type == :array
-							                           property.data_source.model
+							                           property.data_source.model.map { |i| i.is_a?(Array) ? [i[0], i[0]] : [i, i] }
 						                           end
 				end
 			end if form.properties
@@ -433,6 +411,70 @@ module KirguduBase
 		end
 
 
+		#def fill_parents_for_local_data(local_data, filters)
+		#	if local_data && local_data.is_a?(Hash)
+		#		controllers_hierarchy = ::ChupakabraTools::ClassHelper.get_controller_hierarchy(self.class)
+		#
+		#		local_data[:parent_elements] = {}
+		#
+		#		controllers_hierarchy.each do |ctrler|
+		#			if ctrler.respond_to?(:get_kb_parents)
+		#				parent_controllers = ctrler.get_kb_parents
+		#				parent_controllers.each do |pk|
+		#					local_data[:parent_elements][pk[:id]] = pk[:controller].get_kb_entry_class.get_entry_by_id(params[pk[:id]], filters, {logger: string_logger})
+		#				end if parent_controllers
+		#			else
+		#				break
+		#			end
+		#		end
+		#
+		#		#raise "Parent Elements: #{local_data[:parent_elements]}"
+		#
+		#		local_data[:parent_ids] = {}
+		#
+		#
+		#		local_data[:parent_elements].each_pair do |key, element|
+		#			local_data[:parent_ids][key] = element.id
+		#		end
+		#	end
+		#end
+
+
+		def fill_parents_for_local_data(local_data, filters)
+			local_data[:parents] = []
+			local_data[:parent_elements] = {}
+			local_data[:parent_ids] = {}
+
+			if local_data && local_data.is_a?(Hash)
+				controllers_hierarchy = ::ChupakabraTools::ClassHelper.get_controller_hierarchy(self.class)
+
+				controllers_hierarchy.each do |ctrler|
+					if ctrler.respond_to?(:get_kb_parents)
+						parent_controllers = ctrler.get_kb_parents
+						parent_controllers.each do |pk|
+							parent_entry = pk[:controller].get_kb_entry_class.get_entry_by_id(params[pk[:id]], filters, {logger: string_logger})
+							parent_hash = {
+								controller: pk[:controller],
+								entry: parent_entry,
+								id_param: pk[:id],
+								id_value: parent_entry.id
+							}
+							local_data[:parents] << parent_hash
+						end if parent_controllers
+
+						parent_controllers.each do |pk|
+							local_data[:parent_elements][pk[:id]] = pk[:controller].get_kb_entry_class.get_entry_by_id(params[pk[:id]], filters, {logger: string_logger})
+						end if parent_controllers
+
+					end
+				end
+				#raise "Parent Elements: #{local_data[:parent_elements]}"
+				local_data[:parent_elements].each_pair do |key, element|
+					local_data[:parent_ids][key] = element.id
+				end
+			end
+		end
+
 		#########################################################################################################################
 		######################################            Locale Methods            #############################################
 		#########################################################################################################################
@@ -825,5 +867,6 @@ module KirguduBase
 
 		end
 
+
 	end
 end

data/app/controllers/kirgudu_base/cabinet_controller.rb

@@ -13,9 +13,9 @@ module KirguduBase
 		before_action :authenticate_user
 
 
-		def left_menu_path
-			"/admin/kirgudu_base/left_menu"
-		end
+		# def left_menu_path
+		# 	"/admin/kirgudu_base/left_menu"
+		# end
 
 		def current_entry
 			@entry
@@ -30,38 +30,38 @@ module KirguduBase
 
 		#before_action :update_url_with_ajax_referer_url
 
-		def create_breadcrumbs
-
-			#if @current_user.user_at_portals.count > 1
-			#add_new_breadcrumb I18n.t("select_portal.index.title"), url_for(controller: ::ErpZone::SelectPortalController.to_route_path, action: :index)
-			#end
-
-			#add_new_breadcrumb @current_portal.name, url_for(controller: ::AdminZone::DashboarController.to_route_path) if @current_portal
-			#
-			#
-			#if self.class.to_s == ::AdminZone::DashboardController
-			#	add_new_breadcrumb(I18n.t("#{self.to_i18n}.index.title"))
-			#	return
-			#end
-			#
-			#if self.action_name == "index"
-			#	add_new_breadcrumb(I18n.t("#{self.to_i18n}.index.title"))
-			#else
-			#	add_new_breadcrumb(
-			#		I18n.t("#{self.to_i18n}.index.title"),
-			#		url_for(controller: ::ChupakabraTools::ClassHelper.controller_underscore(self), action: "index", id: @container))
-			#
-			#	if ['new', 'create'].include?(self.action_name)
-			#		add_new_breadcrumb(I18n.t("#{self.to_i18n}.new.title"))
-			#	elsif ['edit', 'update', 'show'].include?(self.action_name)
-			#		entry = self.current_entry
-			#
-			#		if entry && entry.respond_to?(:name_for_breadcrumbs)
-			#			add_new_breadcrumb(entry.name_for_breadcrumbs)
-			#		end
-			#	end
-			#end
-		end
+		# def create_breadcrumbs
+		#
+		# 	if @current_user.user_at_portals.count > 1
+		# 	add_new_breadcrumb I18n.t("select_portal.index.title"), url_for(controller: ::ErpZone::SelectPortalController.to_route_path, action: :index)
+		# 	end
+		#
+		# 	add_new_breadcrumb @current_portal.name, url_for(controller: ::AdminZone::DashboarController.to_route_path) if @current_portal
+		#
+		#
+		# 	if self.class.to_s == ::AdminZone::DashboardController
+		# 		add_new_breadcrumb(I18n.t("#{self.to_i18n}.index.title"))
+		# 		return
+		# 	end
+		#
+		# 	if self.action_name == "index"
+		# 		add_new_breadcrumb(I18n.t("#{self.to_i18n}.index.title"))
+		# 	else
+		# 		add_new_breadcrumb(
+		# 			I18n.t("#{self.to_i18n}.index.title"),
+		# 			url_for(controller: ::ChupakabraTools::ClassHelper.controller_underscore(self), action: "index", id: @container))
+		#
+		# 		if ['new', 'create'].include?(self.action_name)
+		# 			add_new_breadcrumb(I18n.t("#{self.to_i18n}.new.title"))
+		# 		elsif ['edit', 'update', 'show'].include?(self.action_name)
+		# 			entry = self.current_entry
+		#
+		# 			if entry && entry.respond_to?(:name_for_breadcrumbs)
+		# 				add_new_breadcrumb(entry.name_for_breadcrumbs)
+		# 			end
+		# 		end
+		# 	end
+		# end
 
 		protected