kms_models 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 424033f3b06425377a0f0219d397dd0a60d0389f
-  data.tar.gz: fc7d53423262bfcb12f0934a19904b356e3b7600
+  metadata.gz: c7d0df8ff5a3477c6d524949f0e152cb74fbc066
+  data.tar.gz: bbc91ff5304078d8551b9fb2b687e13ec16b42ce
 SHA512:
-  metadata.gz: f4a851a816ccd513a2d16336d02525c218a22d3535689b31b6c43f8c038d159039b78fd8b325a507879c221cee9912fde05b191f2355702f77ae44fa6a68ab36
-  data.tar.gz: e88abe7c4d3198264d7d5f197c57d805333775700da3134a6ec668ec87ef2e825e148a95f8ade82f6a530e9225f7a1324acd3f265ac6ecdfaca51c586b7d1b4b
+  metadata.gz: ee61d66f62c0b91ed9a69660d429b11149a7f64faa55bf8e90661fd799585d35988df9ae4332fc61fa58528ae8e322456bf1c0998914740c376435df3d6aec13
+  data.tar.gz: 4ebc68f98c34e1a86da3fe86caac321c128a8236958189a5ec56afc2552bb8597c8a1322cfb167c4d32fba22ad67345eb85c72ddae8cc0b06a93b11164d89151

data/app/assets/javascripts/kms_models/application/controllers/entries_controller.coffee.erb

@@ -3,6 +3,7 @@ EntriesController = ($scope, $state, Restangular, $stateParams, Alertify, Errors
   $scope.store = Restangular.one("models", $stateParams.modelId).all("entries")
   $scope.editorOptions =
     filebrowserUploadUrl: '/kms/assets/ckeditor'
+    language: '<%= I18n.locale.to_s %>'
 
   #Restangular.all('users').customGET('kms_user').then (current_user) ->
     #$scope.currentUser = current_user

data/app/assets/javascripts/kms_models/application/controllers/fields_controller.coffee.erb

@@ -1,11 +1,12 @@
 FieldsController = ($scope, $state, Restangular, $stateParams, TransliterationService) ->
   $scope.types = [
-    { id: 'Kms::StringField', name: "<%= I18n.t("field_types.string") %>"},
-    { id: 'Kms::TextField', name: "<%= I18n.t("field_types.text") %>"},
-    { id: 'Kms::CheckboxField', name: "<%= I18n.t("field_types.checkbox") %>"},
-    { id: 'Kms::FileField', name: "<%= I18n.t("field_types.file") %>"},
-    { id: 'Kms::HasManyField', name: "<%= I18n.t("field_types.has_many") %>"},
-    { id: 'Kms::BelongsToField', name: "<%= I18n.t("field_types.belongs_to") %>"},
+    { id: 'Kms::StringField', name: "<%= I18n.t("field_types.string") %>", icon: 'fa-font'},
+    { id: 'Kms::TextField', name: "<%= I18n.t("field_types.text") %>", icon: 'fa-file-text-o'},
+    { id: 'Kms::CheckboxField', name: "<%= I18n.t("field_types.checkbox") %>", icon: 'fa-check-square-o'},
+    { id: 'Kms::DateField', name: "<%= I18n.t("field_types.date") %>", icon: 'fa-calendar'},
+    { id: 'Kms::FileField', name: "<%= I18n.t("field_types.file") %>", icon: 'fa-image'},
+    { id: 'Kms::HasManyField', name: "<%= I18n.t("field_types.has_many") %>", icon: 'fa-sitemap'},
+    { id: 'Kms::BelongsToField', name: "<%= I18n.t("field_types.belongs_to") %>", icon: 'fa-leaf'},
   ]
 
   $scope.fieldsSortableOptions =
@@ -29,8 +30,11 @@ FieldsController = ($scope, $state, Restangular, $stateParams, TransliterationSe
     if newValue? and !$scope.field.id
       $scope.field.liquor_name = _.snakeCase TransliterationService.translit(newValue, 5).replace(/`/g, '')
 
-  $scope.formatType = (field)->
-    fieldType = _.find $scope.types, (type) -> type.id == field.type
+  $scope.findTypeByField = (field) ->
+    _.find $scope.types, (type) -> type.id == field.type
+
+  $scope.formatType = (field) ->
+    fieldType = $scope.findTypeByField(field)
     if $scope.isAssociationField(field) then "#{fieldType.name} (#{$scope.getDisplayableTemplatableType(field)})" else fieldType.name
 
   $scope.getDisplayableTemplatableType = (field)->
@@ -40,8 +44,11 @@ FieldsController = ($scope, $state, Restangular, $stateParams, TransliterationSe
   $scope.isAssociationField = (field)->
     field.type == 'Kms::HasManyField' or field.type == 'Kms::BelongsToField'
 
+  $scope.isValidField = ->
+    $scope.field.name and $scope.field.liquor_name and $scope.field.type
+
   $scope.addField = ->
-    if $scope.field.name and $scope.field.type
+    if $scope.isValidField()
       $scope.model.fields_attributes.push($scope.field)
       $scope.field = {}
 

data/app/assets/javascripts/templates/entries/index.html.slim

@@ -3,7 +3,7 @@
     .widget
       .widget-header
         i.fa.fa-list
-        = Kms::Entry.model_name.human(count: 1.1)
+        | {{ model.description || model.kms_model_name }}
         a.btn.btn-sm.btn-primary.pull-right ui-sref="models.entries.new({modelId: model.id})"
           = I18n.t("add_entry")
       .widget-body.no-padding

data/app/assets/javascripts/templates/fields/date_field.html.slim

@@ -0,0 +1,3 @@
+label for="{{ field.liquor_name }}"
+  | {{ field.name }}
+input.form-control datepicker-popup="" is-open="field.datepickerOpened" show-button-bar="false" ng-click="field.datepickerOpened = true" type="text" ng-model="entry.values[field.liquor_name]" ng-attr-id="{{field.liquor_name}}"

data/app/assets/javascripts/templates/models/fields.html.slim

@@ -2,7 +2,8 @@
   table.table
     thead
       tr
-        th colspan="4" = Kms::Model.human_attribute_name(:fields)
+        th colspan="4"
+          h4 = Kms::Model.human_attribute_name(:fields)
     tbody as-sortable="fieldsSortableOptions" ng-model="model.fields_attributes"
       tr ng-repeat="field in model.fields_attributes" ng-hide="field._destroy" as-sortable-item=""
         td
@@ -11,7 +12,8 @@
         td
           | {{ field.liquor_name }}
         td
-          | {{ formatType(field) }}
+          i.fa ng-class="findTypeByField(field).icon"
+          |  {{ formatType(field) }}
         td
           | {{ field.required }}
         td
@@ -27,8 +29,13 @@
     .col-lg-3
       input.form-control type="text" required="" placeholder=Kms::Field.human_attribute_name(:liquor_name) ng-model="field.liquor_name"
     .col-lg-2
-      select#field_type.form-control ng-model="field.type" ng-options="type.id as type.name for type in types" required="" placeholder=Kms::Field.human_attribute_name(:type)
-        option value="" disabled="" selected="" = I18n.t(:select_field_type)
+      ui-select ng-model="field.type" theme="bootstrap"
+        ui-select-match placeholder=I18n.t(:select_field_type)
+          i.fa ng-class="$select.selected.icon"
+          |  {{ $select.selected.name }}
+        ui-select-choices repeat="type.id as type in types"
+          i.fa ng-class="type.icon"
+          |  {{ type.name | highlight: $select.search }}
     .col-lg-2 ng-show="isAssociationField(field)"
       select#field_class_name.form-control ng-model="field.class_name" ng-options="templatable_type.type as templatable_type.title for templatable_type in templatable_types" required="" placeholder=Kms::Field.human_attribute_name(:class_name)
         option value="" disabled="" selected="" = I18n.t(:select_model)

data/app/assets/javascripts/templates/models/form.html.slim

@@ -1,15 +1,41 @@
-.form-group
-  label for="kms_model_name" = Kms::Model.human_attribute_name(:kms_model_name)
-  input#kms_model_name.form-control type="text" ng-model="model.kms_model_name"
-.form-group
-  label for="collection_name" = Kms::Model.human_attribute_name(:collection_name)
-  input#collection_name.form-control type="text" ng-model="model.collection_name"
-  small.help-block = I18n.t(:collection_name_field_hint)
-.form-group
-  label for="label_field" = Kms::Model.human_attribute_name(:label_field)
-  select#label_field.form-control ng-model="model.label_field" ng-options="field.liquor_name as field.name for field in model.fields_attributes"
-.form-group
-  label for="allow_creation_using_form" style="margin-right:10px;"
-    = Kms::Model.human_attribute_name(:allow_creation_using_form)
-  toggle-switch ng-model="model.allow_creation_using_form" on-label=I18n.t(:yes_word) off-label=I18n.t(:no_word)
-  small.help-block = I18n.t(:allow_creation_using_form_field_hint)
+.row
+  .col-md-6.col-sm-12
+    .form-group
+      label for="kms_model_name" = Kms::Model.human_attribute_name(:kms_model_name)
+      input#kms_model_name.form-control type="text" ng-model="model.kms_model_name"
+    .form-group
+      label for="collection_name" = Kms::Model.human_attribute_name(:collection_name)
+      input#collection_name.form-control type="text" ng-model="model.collection_name"
+      small.help-block = I18n.t(:collection_name_field_hint)
+    .form-group
+      label for="description" = Kms::Model.human_attribute_name(:description)
+      textarea#description.form-control ng-model="model.description"
+      small.help-block = I18n.t(:description_field_hint)
+    .form-group
+      label for="label_field" = Kms::Model.human_attribute_name(:label_field)
+      select#label_field.form-control ng-model="model.label_field" ng-options="field.liquor_name as field.name for field in model.fields_attributes"
+      small.help-block = I18n.t(:label_field_hint)
+    .form-group
+      label for="allow_creation_using_form" style="margin-right:10px;"
+        = Kms::Model.human_attribute_name(:allow_creation_using_form)
+      toggle-switch ng-model="model.allow_creation_using_form" on-label=I18n.t(:yes_word) off-label=I18n.t(:no_word)
+      small.help-block = I18n.t(:allow_creation_using_form_field_hint)
+  .col-md-6.col-sm-12
+    .widget.model-iteration-code-snippet
+      .widget-body
+        .widget-content
+          .widget-icon.pull-left
+            i class="fa fa-clipboard"
+          .title Model iteration hint
+          .comment Use sample code below for iterating your model entries in Template, Page or Snippet:
+          br
+          pre
+            | {% for element in: models.{{ model.collection_name }} do: %}
+            br
+            code ng-non-bindable=""
+              |   <p>{{
+            |  element.{{ model.label_field }}
+            code ng-non-bindable=""
+              |  }}</p>
+            br
+            | {% end for %}

data/app/assets/stylesheets/kms_models/application.css

@@ -16,3 +16,9 @@
  .as-sortable-dragging td {
    padding: 0 10px;
  }
+ .widget.model-iteration-code-snippet {
+   margin-top: 23px;
+ }
+ .widget.model-iteration-code-snippet .widget-icon {
+   background: #ff5274;
+ }

data/app/controllers/kms/models/entries_controller.rb

@@ -19,7 +19,7 @@ module Kms
         if @entry.save
           render json: @entry, root: false
         else
-          render json: @entry.to_json(methods: :errors), status: :unprocessable_entity
+          render json: { errors: @entry.errors.full_messages }.to_json, status: :unprocessable_entity
         end
       end
 
@@ -29,7 +29,7 @@ module Kms
         if @entry.update_attributes(entry_params)
           render json: @entry, root: false
         else
-          render json: @entry.to_json(methods: :errors), status: :unprocessable_entity
+          render json: { errors: @entry.errors.full_messages }.to_json, status: :unprocessable_entity
         end
       end
 

data/app/controllers/kms/models/models_controller.rb

@@ -1,7 +1,7 @@
 module Kms
   module Models
     class ModelsController < ApplicationController
-      wrap_parameters :model, include: [:kms_model_name, :collection_name, :label_field, :fields_attributes, :allow_creation_using_form]
+      wrap_parameters :model, include: [:kms_model_name, :collection_name, :description, :label_field, :fields_attributes, :allow_creation_using_form]
 
       def index
         render json: Model.all, root: false
@@ -18,14 +18,14 @@ module Kms
           Kms::ResourceService.register(:models, @model, "fa-tasks")
           Kms::ModelsWrapperDrop.register_model @model.collection_name
         else
-          render json: {errors: @model.errors}.to_json, status: :unprocessable_entity
+          render json: { errors: @model.errors.full_messages }.to_json, status: :unprocessable_entity
         end
       end
 
       def update
         @model = Model.find(params[:id])
         unless @model.update_attributes(model_params)
-          render json: {errors: @model.errors}.to_json, status: :unprocessable_entity
+          render json: { errors: @model.errors.full_messages }.to_json, status: :unprocessable_entity
         end
       end
 
@@ -38,7 +38,7 @@ module Kms
       protected
 
       def model_params
-        params.require(:model).permit(:kms_model_name, :collection_name, :label_field, :allow_creation_using_form, fields_attributes: [:id, :name, :liquor_name, :type, :class_name, :_destroy])
+        params.require(:model).permit(:kms_model_name, :collection_name, :description, :label_field, :allow_creation_using_form, fields_attributes: [:id, :name, :liquor_name, :type, :class_name, :_destroy])
       end
 
     end

data/app/models/kms/checkbox_field.rb

@@ -1,4 +1,7 @@
 module Kms
   class CheckboxField < Field
+    def get_value(entry)
+      entry.values[liquor_name] == 'true'
+    end
   end
 end

data/app/models/kms/date_field.rb

@@ -0,0 +1,4 @@
+module Kms
+  class DateField < Field
+  end
+end

data/app/models/kms/field.rb

@@ -3,6 +3,7 @@ module Kms
     belongs_to :model
     scope :file_fields, -> { where(type: Kms::FileField.name) }
     scope :checkbox_fields, -> { where(type: Kms::CheckboxField.name) }
+    scope :date_fields, -> { where(type: Kms::DateField.name) }
 
     def get_value(entry)
       # OVERRIDE in subclasses if needed

data/app/serializers/kms/entry_serializer.rb

@@ -17,6 +17,10 @@ module Kms
       object.model.fields.checkbox_fields.each do |checkbox_field|
         values_with_urls[checkbox_field.liquor_name] = values_with_urls[checkbox_field.liquor_name] == 'true'
       end
+      # prepare checkbox fields - cause PostgreSQL json stored as strings
+      object.model.fields.date_fields.each do |date_field|
+        values_with_urls[date_field.liquor_name] = Date.parse(values_with_urls[date_field.liquor_name])
+      end
       values_with_urls
     end
   end

data/app/serializers/kms/model_serializer.rb

@@ -1,6 +1,6 @@
 module Kms
   class ModelSerializer < ActiveModel::Serializer
-    attributes :id, :kms_model_name, :collection_name, :label_field, :allow_creation_using_form, :fields_attributes
+    attributes :id, :kms_model_name, :collection_name, :description, :label_field, :allow_creation_using_form, :fields_attributes
 
     has_many :fields_attributes, serializer: Kms::FieldSerializer
 

data/config/locales/en.yml

@@ -12,6 +12,8 @@ en:
   select_field_type: "Select field type"
   select_model: "Select Model"
   collection_name_field_hint: "You can access model collection like this: models.your_collection_name (ex., models.services)"
+  description_field_hint: "Optional field. Just write some description so everyone would be aware what's the purpose of this Model"
+  label_field_hint: "Add at least one Field below. And then you could choose one that would be used for item permalink generation and entries list displaying"
   allow_creation_using_form_field_hint: "On website you can place a form allowing to create model entries"
   has_many_field_placeholder: "Select related objects..."
   belongs_to_field_placeholder: "Select related object..."
@@ -23,6 +25,7 @@ en:
     string: "String"
     text: "Text"
     checkbox: "Checkbox"
+    date: "Date"
     file: "File"
     has_many: "Has many"
     belongs_to: "Belongs to"
@@ -53,6 +56,7 @@ en:
       kms/model:
         kms_model_name: "Name"
         collection_name: "Collection name (for Liquor)"
+        description: "Description"
         fields: "Fields"
         label_field: "Label field (used for URL/slug generating)"
         allow_creation_using_form: "Allow creation using form"

data/config/locales/ru.yml

@@ -12,6 +12,8 @@ ru:
   select_field_type: "Выберите тип свойства"
   select_model: "Выберите модель"
   collection_name_field_hint: "К коллекции можно будет обратиться так: models.your_collection_name (напр., models.services)"
+  description_field_hint: "Необязательное поле. Напишите небольшое описание, чтобы было понятно назначение данной Модели"
+  label_field_hint: "Добавьте хотя бы одно Свойство ниже. И затем вы можете выбрать свойство для генерации ссылки на элемент, а так же для отображения элементов в списке"
   allow_creation_using_form_field_hint: "На сайте можно будет разместить форму для создания элементов модели"
   has_many_field_placeholder: "Выберите связанные объекты..."
   belongs_to_field_placeholder: "Выберите связанный объект..."
@@ -23,6 +25,7 @@ ru:
     string: "Строка"
     text: "Текст"
     checkbox: "Чекбокс"
+    date: "Дата"
     file: "Файл"
     has_many: "Имеет много"
     belongs_to: "Связано с"
@@ -52,6 +55,7 @@ ru:
       kms/model:
         kms_model_name: "Название"
         collection_name: "Название коллекции (для Liquor)"
+        description: "Описание"
         fields: "Свойства"
         label_field: "Поле, используемое для генерации ссылок на объекты"
         allow_creation_using_form: "Разрешить создание элементов с помощью форм"

data/db/migrate/20180122135245_add_description_to_kms_models.rb

@@ -0,0 +1,5 @@
+class AddDescriptionToKmsModels < ActiveRecord::Migration[5.1]
+  def change
+    add_column :kms_models, :description, :text
+  end
+end

data/lib/kms/models/version.rb

@@ -1,5 +1,5 @@
 module Kms
   module Models
-    VERSION = '1.0.1'
+    VERSION = '1.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kms_models
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Igor Petrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-09 00:00:00.000000000 Z
+date: 2018-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_id
@@ -120,6 +120,7 @@ files:
 - app/assets/javascripts/templates/entries/new.html.slim
 - app/assets/javascripts/templates/fields/belongs_to_field.html.slim
 - app/assets/javascripts/templates/fields/checkbox_field.html.slim
+- app/assets/javascripts/templates/fields/date_field.html.slim
 - app/assets/javascripts/templates/fields/file_field.html.slim
 - app/assets/javascripts/templates/fields/has_many_field.html.slim
 - app/assets/javascripts/templates/fields/string_field.html.slim
@@ -139,6 +140,7 @@ files:
 - app/helpers/kms_models/application_helper.rb
 - app/models/kms/belongs_to_field.rb
 - app/models/kms/checkbox_field.rb
+- app/models/kms/date_field.rb
 - app/models/kms/entry.rb
 - app/models/kms/field.rb
 - app/models/kms/file_field.rb
@@ -172,6 +174,7 @@ files:
 - db/migrate/20170209125819_add_allow_creation_using_form_to_models.rb
 - db/migrate/20170802063046_change_values_column_to_jsonb.rb
 - db/migrate/20170802085121_add_position_to_kms_fields.rb
+- db/migrate/20180122135245_add_description_to_kms_models.rb
 - lib/drops/kms/entry_drop.rb
 - lib/drops/kms/models_wrapper_drop.rb
 - lib/generators/kms_models/install/install_generator.rb
@@ -199,7 +202,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Extension for KMS