kirgudu_base 0.0.3 → 0.0.4

data/app/helpers/kirgudu_base/controllers/{basic_actions_with_parent.rb → OLD_basic_actions.rb}

@@ -2,7 +2,7 @@
 
 module KirguduBase
 	module Controllers
-		module BasicActionsWithParent
+		module BasicActions
 
 			################################################################################################################
 			#########################################       Base and Ajax Modules     ######################################
@@ -21,57 +21,48 @@ module KirguduBase
 						end
 
 						local_data = {}
-
+						#getting page info
 						local_page = self.class.get_kb_page(:index)
-
 						unless local_page
 							respond_to do |format|
-								format.html { render_html1 self.get_view_path_for_page_404 }
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :page_404) }
 								format.json { render_json_page_404 }
 							end
 							return
 						end
-
 						local_data[:page] = local_page
 
+
 						filters = self.get_filters_for_list(local_page.lists[:entries_list], params)
+						filters[:page] = params[:page]
 
-						self.fill_obligatory_filters(filters)
+						begin
+							filters[:per_page] = params[:per_page].to_i
+						rescue
+						end
 
+						logger.info("PER PAGE: #{filters[:per_page]}")
+						filters[:per_page] = 30 if filters[:per_page] == 0
+						filters[:per_page] ||= 30
+						self.fill_obligatory_filters(filters)
 						options = {
 							logger: string_logger
 						}
+						# filling fitters data
+						page_filters = self.load_data_for_filters_controls(local_page.lists[:entries_list], params)
+						local_data[:filters_data] = page_filters
+						# filling entries list
+						local_entries_list = self.entry_class.get_entries(nil, filters, options)
+						local_data[:entries] = local_entries_list
 
-						local_filters_data = self.load_data_for_filters_controls(local_page.lists[:entries_list], params)
-
-						local_data[:filters_data] = local_filters_data
-
-						local_data[:parent_elements] = {}
-
-						controllers_hierarchy = ::ChupakabraTools::ClassHelper.get_controller_hierarchy(self.class)
-
-						controllers_hierarchy.each do |ctrler|
-							if ctrler.respond_to?(:get_kb_option)
-								parent_controller_class = ctrler.get_kb_option(:parent_controller)
-								parent_id = ctrler.get_kb_option(:parent_id)
-								if parent_controller_class && parent_id
-									local_data[:parent_elements][parent_id] = parent_controller_class.entry_class.get_entry_by_id(params[parent_id], filters, {logger: string_logger})
-								else
-									break
-								end
-							else
-								break
-							end
-						end
-
-						local_data[:entries_list] = self.entry_class.get_entries(nil, filters, options)
-
+						view_path = self.class.get_method_latest_result(:get_kb_view_path, :index)
 
 						respond_to do |format|
-							format.html { render_html1 self.get_view_path_for_page_index, locals: {data: local_data} }
+							format.html { render_html1 view_path , locals: {data: local_data} }
 							format.json { render_json_ok(local_entries_list) }
 						end
 					end
+
 				end
 
 				module ShowActions
@@ -86,7 +77,7 @@ module KirguduBase
 
 						if local_page.nil?
 							respond_to do |format|
-								format.html { render_html1 self.get_view_path_for_page_404 }
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :page_404) }
 								format.json { render_json_page_404 }
 							end
 							return
@@ -94,24 +85,18 @@ module KirguduBase
 
 						filters = {}
 						self.fill_obligatory_filters(filters)
-
-						local_entry = self.entry_class.get_entry_by_id(self, params[:id], filters, {logger: string_logger})
-
+						local_entry = self.entry_class.get_entry_by_id(params[:id], filters, {logger: string_logger})
 
 						unless local_entry
 							respond_to do |format|
 								flash[:error] = I18n.t("#{self.to_i18n}.messages.not_found", entry_id: params[:id])
-								format.html { render_html1 get_not_found_view_path,
-								                           locals: {
-									                           entry: local_entry
-								                           }
-								}
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :entry_not_found), locals: { entry: local_entry } }
 								format.json { render json: local_entry.errors, status: :unprocessable_entity }
 							end
 							return
 						end
 						respond_to do |format|
-							format.html { render_html1 self.get_view_path_for_page_show, locals: {entry: local_entry, page: local_page} }
+							format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :show), locals: {entry: local_entry, page: local_page} }
 							format.json { render json: local_entry }
 						end
 					end
@@ -127,7 +112,7 @@ module KirguduBase
 						local_page = self.class.get_kb_page(:new)
 						unless local_page
 							respond_to do |format|
-								format.html { render_html1 self.get_view_path_for_page_404 }
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :page_404) }
 								format.json { render_json_page_404 }
 							end
 							return
@@ -138,7 +123,7 @@ module KirguduBase
 						local_controls_data = self.load_data_for_entry_controls(local_page.forms[:changes], local_entry)
 
 						respond_to do |format|
-							format.html { render_html1 self.get_view_path_for_page_new,
+							format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :new),
 							                           locals:
 								                           {
 									                           entry: local_entry,
@@ -158,7 +143,7 @@ module KirguduBase
 						local_page = self.class.get_kb_page(:new)
 						unless local_page
 							respond_to do |format|
-								format.html { render_html1 self.get_view_path_for_page_404 }
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :page_404) }
 								format.json { render_json_page_404 }
 							end
 							return
@@ -202,7 +187,7 @@ module KirguduBase
 								# loading data for select-like controls
 								local_controls_data = self.load_data_for_entry_controls(local_page.forms[:changes], local_entry)
 								local_entry.errors[:form] << I18n.t("#{self.to_i18n}.messages.create_error")
-								format.html { render_html1 self.get_view_path_for_page_new,
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :new),
 								                           locals:
 									                           {
 										                           entry: local_entry,
@@ -229,7 +214,7 @@ module KirguduBase
 
 						unless local_page
 							respond_to do |format|
-								format.html { render_html1 get_view_path_for_page_404 }
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :page_404) }
 								format.json { render_json_page_404 }
 							end
 							return
@@ -238,12 +223,12 @@ module KirguduBase
 						filters = {}
 						self.fill_obligatory_filters(filters)
 
-						local_entry = self.entry_class.get_entry_by_id(self, params[:id], filters, {logger: string_logger})
+						local_entry = self.entry_class.get_entry_by_id(params[:id], filters, {logger: string_logger})
 
 						unless local_entry
 							respond_to do |format|
 								flash[:error] = I18n.t("#{self.to_i18n}.messages.not_found", entry_id: params[:id])
-								format.html { render_html1 self.get_not_found_view_path, locals: {entry: local_entry} }
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :entry_not_found), locals: {entry: local_entry} }
 								format.json { render json: local_entry.errors, status: :unprocessable_entity }
 							end
 							return
@@ -252,7 +237,7 @@ module KirguduBase
 						local_controls_data = self.load_data_for_entry_controls(local_page.forms[:changes], local_entry)
 
 						respond_to do |format|
-							format.html { render_html1 self.get_view_path_for_page_edit,
+							format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :edit),
 							                           locals:
 								                           {
 									                           entry: local_entry,
@@ -275,20 +260,20 @@ module KirguduBase
 
 						unless local_page
 							respond_to do |format|
-								format.html { render_html1 self.get_view_path_for_page_404 }
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :page_404) }
 								format.json { render_json_page_404 }
 							end
 							return
 						end
 
 
-						local_entry = self.entry_class.get_entry_by_id(self, params[:id], nil, {logger: string_logger})
+						local_entry = self.entry_class.get_entry_by_id(params[:id], nil, {logger: string_logger})
 
 						# Render NOT FOUND Form
 						unless local_entry
 							respond_to do |format|
 								flash[:error] = I18n.t("#{self.to_i18n}.messages.not_found", entry_id: params[:id])
-								format.html { render_html1 self.get_not_found_view_path, locals: {entry: local_entry} }
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :entry_not_found), locals: {entry: local_entry} }
 								format.json { render json: nil, status: :unprocessable_entity }
 							end
 							return
@@ -331,7 +316,7 @@ module KirguduBase
 								# loading data for select-like controls
 								local_controls_data = self.load_data_for_entry_controls(local_page.forms[:changes], local_entry)
 								local_entry.errors[:form] << I18n.t("#{self.to_i18n}.messages.update_error")
-								format.html { render_html1 self.get_view_path_for_page_edit,
+								format.html { render_html1 self.class.get_method_latest_result(:get_kb_view_path, :edit),
 								                           locals:
 									                           {
 										                           entry: local_entry,
@@ -428,7 +413,7 @@ module KirguduBase
 						end
 
 
-						local_entry = self.entry_class.get_entry_by_id(self, params[:id], nil, {logger: string_logger})
+						local_entry = self.entry_class.get_entry_by_id(params[:id], nil, {logger: string_logger})
 						if local_entry
 							result_string = ''
 							begin