binda 0.1.1 → 0.1.2

data/app/assets/stylesheets/binda/components/main_table.scss

@@ -2,8 +2,10 @@
 {
   table
   {
+    display: table;
     width: 100%;
     background-color: $color-gray-lightest;
+    box-sizing: border-box;
 
     th
     {
@@ -48,11 +50,6 @@
     {
       border-bottom: 1px solid $color-gray-darker;
     }
-
-    tr.ui-sortable-handle:hover
-    {
-      border: 1px solid transparent;
-    }
   }
 
   .prev

data/app/assets/stylesheets/binda/components/sortable.scss

@@ -16,6 +16,7 @@ ul#sortable
     transition: box-shadow .3s ease, transform .3s ease;
     box-shadow: 0 0 0 0 rgba(0,0,0,.25);
 
+
     img
     {
       width: auto;
@@ -74,8 +75,6 @@ tbody.sortable
   tr
   {
     transition: box-shadow .3s ease, transform .3s ease;
-    margin-bottom: 8px;
-    padding-bottom: 8px;
 
     img
     {

data/app/assets/stylesheets/binda/components/standard-form.scss

@@ -39,12 +39,7 @@
     border-right: none !important;
     border-left: none !important;
   }
-
-  &.table-sort
-  {
-    border: none !important;
-  }
-
+  
   .control-label
   {
     font-weight: bold;
@@ -210,4 +205,8 @@
 .standard-form--hint-on-new-record
 {
   padding: 12px;
+}
+
+.standard-form--choices-header {
+  
 }

data/app/assets/stylesheets/binda/index.scss

@@ -19,7 +19,7 @@
 @import "components/login";
 @import "components/standard-form";
 @import "components/form_item";
-@import "components/form_item_choice";
+@import "components/form_item_choices";
 @import "components/form_item_image";
 @import "components/form_item_video";
 @import "components/sortable";
@@ -28,6 +28,8 @@
 @import "components/select2";
 @import "components/texts";
 @import "components/popup_warning";
+@import "components/main_sortable_table";
+@import "components/field_setting_choices";
 
 // Controllers
 @import "controllers/components_index";

data/app/controllers/binda/field_groups_controller.rb

@@ -35,7 +35,7 @@ module Binda
       # Add nested classes
       add_new_field_settings
       add_new_choices
-      update_choices
+      check_if_needs_to_update_choices
 
       # Update the other ones
       if @field_group.update(field_group_params)
@@ -64,63 +64,11 @@ module Binda
 
       # Only allow a trusted parameter "white list" through.
       def field_group_params
-        params.require(:field_group).permit(
-          :name, 
-          :slug, 
-          :description, 
-          :position, 
-          :layout, 
-          :structure_id, 
-          field_settings_attributes: 
-            [ :id, 
-              :field_group_id, 
-              :field_setting_id, 
-              :name, 
-              :slug, 
-              :description, 
-              :field_type, 
-              :position, 
-              :required,
-              :default_text, 
-              :ancestry, 
-              :default_choice_id, 
-              :allow_null,
-              accepted_structure_ids: [],
-              choices: [], 
-              choices_attributes: 
-              [ :id, 
-                :field_setting_id, 
-                :label, 
-                :value 
-              ]
-            ]
-          )
+        params.require(:field_group).permit(:name, :slug, :description, :position, :layout, :structure_id, field_settings_attributes: [ :id, :field_group_id, :field_setting_id, :name, :slug, :description, :field_type, :position, :required, :default_text, :ancestry, :default_choice_id, :allow_null, accepted_structure_ids: [], choices: [], choices_attributes: [ :id, :field_setting_id, :label, :value ]])
       end
 
       def new_params
-        params.require(:field_group).permit( 
-          new_field_settings:
-            [ :id,
-              :field_group_id, 
-              :field_setting_id, 
-              :name, 
-              :slug, 
-              :description, 
-              :field_type, 
-              :position, 
-              :required, 
-              :ancestry, 
-              :default_choice_id,
-              :allow_null,
-              choices: [] 
-            ],
-          new_choices: 
-            [ :id,
-              :field_setting_id, 
-              :label, 
-              :value 
-            ]
-          )
+        params.require(:field_group).permit( new_field_settings: [ :id, :field_group_id, :field_setting_id, :name, :slug, :description, :field_type, :position, :required, :ancestry, :default_choice_id, :allow_null, choices: [] ],new_choices: [ :id, :field_setting_id, :label, :value ])
       end
 
       def reset_field_settings_cache
@@ -130,24 +78,20 @@ module Binda
       def add_new_field_settings
         # Create new fields if any
         new_params[:new_field_settings].each do |field_setting|
-          unless field_setting[:name].blank?
-            new_field_setting = @field_group.field_settings.create( field_setting )
-            unless new_field_setting
-              return redirect_to edit_structure_field_group_path( @structure.slug, @field_group.slug ), flash: { error: new_field_setting.errors }
-            end
-          end
+          next if field_setting[:name].blank?
+          new_field_setting = @field_group.field_settings.create( field_setting )
+          next if new_field_setting
+          return redirect_to edit_structure_field_group_path( @structure.slug, @field_group.slug ), flash: { error: new_field_setting.errors }
         end
       end
 
       def add_new_choices
         # Create new fields if any
-        unless new_params[:new_choices].nil? 
-          new_params[:new_choices].each do |choice|
-            unless choice[:label].blank? || choice[:value].blank?
-              create_new_choice choice
-            end
-          end
-        end 
+        return if new_params[:new_choices].nil? 
+        new_params[:new_choices].each do |choice|
+          next if choice[:label].blank? || choice[:value].blank?
+          create_new_choice choice
+        end
       end
 
       # Create new choice (depends directly from add_new_choice method)
@@ -158,18 +102,21 @@ module Binda
         end
       end
 
-      def update_choices
+      def check_if_needs_to_update_choices
         return if field_group_params[:field_settings_attributes].nil?
         field_group_params[:field_settings_attributes].each do |_, field_setting_params|
           next if field_setting_params[:choices_attributes].nil?
-          field_setting_params[:choices_attributes].each do |_, choice_params|
-            choice = Choice.find(choice_params[:id])
-            unless choice.update(choice_params)
-              return redirect_to edit_structure_field_group_path( @structure.slug, @field_group.slug ), flash: { error: choice.errors }
-            end
-          end
+          update_field_setting_choices field_setting_params
         end
       end
 
+      def update_field_setting_choices field_setting_params
+        field_setting_params[:choices_attributes].each do |_, choice_params|
+          choice = Choice.find(choice_params[:id])
+          unless choice.update(choice_params)
+            return redirect_to edit_structure_field_group_path( @structure.slug, @field_group.slug ), flash: { error: choice.errors }
+          end
+        end
+      end
   end
 end

data/app/controllers/binda/manage/users_controller.rb

@@ -36,19 +36,18 @@ module Binda
     end
 
     def update
-      if @user.is_superadmin && !current_user.is_superadmin
-        redirect_to manage_users_url, notice: 'Sorry, you cannot edit a super administrator.'
-      else
-        respond_to do |format|
-          if @user.update(user_params)
-            format.html { redirect_to manage_user_path( @user.id ), notice: 'User was successfully updated.' }
-            format.xml  { head :ok }
-            format.json { render :show, status: :ok, location: @user }
-          else
-            format.html { redirect_to edit_manage_user_path( @user.id ), flash: { alert: @user.errors } }
-            format.xml  { head :bad_request }
-            format.json { render json: @user.errors, status: :unprocessable_entity }
-          end
+      # Check if the user to be updated is superadmin and the user which is updating is superadmin
+      check_if_superadmin
+
+      respond_to do |format|
+        if @user.update(user_params)
+          format.html { redirect_to manage_user_path( @user.id ), notice: 'User was successfully updated.' }
+          format.xml  { head :ok }
+          format.json { render :show, status: :ok, location: @user }
+        else
+          format.html { redirect_to edit_manage_user_path( @user.id ), flash: { alert: @user.errors } }
+          format.xml  { head :bad_request }
+          format.json { render json: @user.errors, status: :unprocessable_entity }
         end
       end
     end
@@ -86,5 +85,11 @@ module Binda
           params[:user].delete(:password_confirmation)
         end
       end
+
+      def check_if_superadmin
+        if @user.is_superadmin && !current_user.is_superadmin
+          return redirect_to manage_users_url, notice: 'Sorry, you cannot edit a super administrator.'
+        end
+      end
   end
 end

data/app/controllers/binda/structures_controller.rb

@@ -31,14 +31,7 @@ module Binda
 
     def update
       # Create new fields if any
-      new_params[:new_field_groups].each do |field_group|
-        unless field_group[:name].blank?
-          new_field_group = @structure.field_groups.create( name: field_group[:name] )
-          unless new_field_group
-            return redirect_to structure_path( @structure.slug ), flash: { error: new_field_group.errors }
-          end
-        end
-      end
+      add_new_field_groups
 
       # Update the other ones
       if @structure.update(structure_params)
@@ -61,8 +54,7 @@ module Binda
       params[:structure].each_with_index do |id, i|
         Structure.find( id ).update({ position: i + 1 })
       end
-      render js: "$('.popup-warning').addClass('popup-warning--hidden');"
-      head :ok
+      render js: "$('##{params[:id]}').sortable('option', 'disabled', false); $('.popup-warning').addClass('popup-warning--hidden'); $('.sortable').removeClass('sortable--disabled')"
     end
 
     def sort_index
@@ -81,7 +73,16 @@ module Binda
       end
 
       def new_params
-        params.require(:structure).permit( new_field_groups:[ :name, :structure_id ] )
+        params.require(:structure).permit( new_field_groups:[ :name, :slug, :structure_id ] )
+      end
+
+      def add_new_field_groups
+        new_params[:new_field_groups].each do |field_group|
+          next if field_group[:name].blank?
+          new_field_group = @structure.field_groups.create( name: field_group[:name], slug: field_group[:slug] )
+          next if new_field_group
+          return redirect_to structure_path( @structure.slug ), flash: { error: new_field_group.errors }
+        end
       end
   end
 end

data/app/models/binda/choice.rb

@@ -72,12 +72,17 @@ module Binda
 			selections = Selection.joins(:field_setting).where(binda_field_settings: {id: field_setting.id })
 
 			# Make sure none of the Binda::Selection instances (radios/checkboxes/selects) are left without a choice
-			selections.each do |selection|
-				next if selection.choices.any?
-				selection.choices << Choice.find(self.field_setting.default_choice_id)
-				raise "It hasn't been possible to set the default choice for Binda::Selection with id=#{selection.id}" unless selection.save
-			end
+			update_selection selections
 		end
 
+		private 
+			def update_selection selections
+				selections.each do |selection|
+					next if selection.choices.any?
+					selection.choices << Choice.find(self.field_setting.default_choice_id)
+					raise "It hasn't been possible to set the default choice for Binda::Selection with id=#{selection.id}" unless selection.save
+				end
+			end
+
   end
 end

data/app/models/binda/field_setting.rb

@@ -153,19 +153,29 @@ module Binda
 		def create_field_instances
 			structure = self.field_group.structure
 			field_class = self.field_type.pluralize
+			field_setting_id = self.id
 			case 
 				when structure.components.any?
 					structure.components.each do |component|
-						unless component.send(field_class).where(field_setting_id: self.id).any?
-							component.send(field_class).create!(field_setting_id: self.id)
-						end
+						create_field_instances_for_component( component, field_class, field_setting_id )
 					end
 				when structure.board.present?
-					unless structure.board.send(field_class).where(field_setting_id: self.id).any?
-						structure.board.send(field_class).create!(field_setting_id: self.id)
-					end
+					create_field_instances_for_board( structure.board, field_class, field_setting_id )
+			end
+		end
+
+		# Helper for create_field_instances method
+		def create_field_instances_for_component( component, field_class, field_setting_id )
+			unless component.send(field_class).where(field_setting_id: field_setting_id).any?
+				component.send(field_class).create!(field_setting_id: field_setting_id)
 			end
 		end
 
+		# Helper for create_field_instances method
+		def create_field_instances_for_board ( board, field_class, field_setting_id )
+			unless board.send(field_class).where(field_setting_id: field_setting_id).any?
+				board.send(field_class).create!(field_setting_id: field_setting_id)
+			end
+		end
 	end
 end

data/app/models/concerns/binda/fieldable_associations.rb

@@ -96,12 +96,18 @@ module Binda
 			unless obj.nil?
 				obj.content
 			else
-				you_mean_string = !self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type = 'Binda::String' }.nil?
-				if you_mean_string
-					raise ArgumentError, "This slug (#{field_slug}) is associated to a string not a text. Use get_string() instead on instance (#{self.class.name} ##{self.id}).", caller
-				else
-					raise ArgumentError, "There isn't any text associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller
-				end
+				check_text_error field_slug
+			end
+		end
+
+		# Check why get_text doesn't return a value
+		# This method isn't supposed to be used by anything other than get_text method
+		def check_text_error field_slug
+			you_mean_string = !self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type = 'Binda::String' }.nil?
+			if you_mean_string
+				raise ArgumentError, "This slug (#{field_slug}) is associated to a string not a text. Use get_string() instead on instance (#{self.class.name} ##{self.id}).", caller
+			else
+				raise ArgumentError, "There isn't any text associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller
 			end
 		end
 
@@ -130,12 +136,18 @@ module Binda
 			unless obj.nil?
 				obj.content
 			else
-				you_mean_text = !self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type = 'Binda::Text' }.nil?
-				if you_mean_text
-					raise ArgumentError, "This slug (#{field_slug}) is associated to a text not a string. Use get_text() instead on instance (#{self.class.name} ##{self.id}).", caller
-				else
-					raise ArgumentError, "There isn't any string associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller
-				end
+				check_string_error field_slug
+			end
+		end
+
+		# Check why get_string doesn't return a value
+		# This method isn't supposed to be used by anything other than get_string method
+		def check_string_error field_slug
+			you_mean_text = !self.strings.find{ |t| t.field_setting_id == FieldSetting.get_id( field_slug ) && t.type = 'Binda::Text' }.nil?
+			if you_mean_text
+				raise ArgumentError, "This slug (#{field_slug}) is associated to a text not a string. Use get_text() instead on instance (#{self.class.name} ##{self.id}).", caller
+			else
+				raise ArgumentError, "There isn't any string associated to the current slug (#{field_slug}) on instance (#{self.class.name} ##{self.id}).", caller
 			end
 		end
 

data/app/views/binda/components/sort_index.html.erb

@@ -17,30 +17,26 @@
       </div>
       <p><%= t 'binda.sort_items_loader', { arg1: t('binda.components').downcase } %></p>
   </div>
-  <div class="main-table--container">
-
-      <h5 class="text-muted"><%= t('binda.sort_index_hint', { arg1: @structure.name.humanize.split.join(' ').pluralize }).html_safe %></h5>
-
-      <table class="standard-form--container table-sort">
-        <thead  class="standard-form--header">
-          <tr>
-            <th style="width: 50%;">Title</th>
-            <th style="width: 50%;">Publish state</th>
-            <th></th>
-          </tr>
-        </thead>
-        <tbody id="<%= @structure.slug %>-components--sort-index" class="sortable" data-update-url="<%= structure_components_sort_path( @structure.slug ) %>">
-          <% @components.order( :position, :name ).each do |component| %>
-            <tr id="component_<%= component.id %>">
-              <td><%= link_to component.name, structure_component_path( @structure.slug, component ) %></td>
-              <td><%= component.publish_state %></td>
-              <td></td>
-            </tr>
-          <% end %>
-        <tbody>
-      </table>
-
-    <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }".html_safe, new_structure_component_path, class: 'main-header--link b-btn b-btn-primary', action: "new" %>
-        
+
+  <div class="main-sortable-table">
+
+    <div class="main-sortable-table--header-row">
+      <div class="main-sortable-table--header-title"><p>Title</p></div>
+      <div class="main-sortable-table--header-title"><p>Publish State</p></div>
+    </div>
+
+    <div id="<%= @structure.slug %>-components--sort-index" class="sortable" data-update-url="<%= structure_components_sort_path( @structure.slug ) %>">
+      <% @components.order( :position, :name ).each do |component| %>
+        <div class="main-sortable-table--row ui-sortable-handle" id="component_<%= component.id %>">
+          <div class="main-sortable-table--row-cell"><%= link_to component.name, structure_component_path( @structure.slug, component ) %></div>
+          <div class="main-sortable-table--row-cell"><%= component.publish_state %></div>
+        </div>
+      <% end %>
+    </div>
+
   </div>
+
+  <%= link_to "<i class=\"fa fa-plus\" aria-hidden=\"true\"></i> New #{ @structure.name.humanize.split.map(&:capitalize).join(' ') }".html_safe, new_structure_component_path, class: 'main-header--link b-btn b-btn-primary', action: "new" %>
+
+
 <% end %>

data/app/views/binda/field_groups/_form_body.html.erb

@@ -43,10 +43,11 @@
         
         <%= render "form_section", f: f %>
         
-        <div class="clearfix"></div>
       </div>
+    </div>
 
-      <% @field_group.field_settings.where( field_type: 'repeater' ).order( :position, :id ).each do |repeater| %>
+    <% @field_group.field_settings.where( field_type: 'repeater' ).order( :position, :id ).each do |repeater| %>
+      <div class="standard-form--container">
         <div id="form-section--repeater-<%= repeater.id %>" class="form-section--wide-container">
           <div class="form-section">
 
@@ -56,12 +57,11 @@
 
             <%= render "form_section_repeater", f: f, repeater: repeater %>
 
-            <div class="clearfix"></div>
           </div>
         </div>
-      <% end %>
+      </div>
+    <% end %>
 
-    </div>
 
   </div>