c80_estate 0.1.0.7 → 0.1.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51be21dfc7b817fbf3c99cad584bfa7c2aec9336
-  data.tar.gz: d1a7db257d0b45d4d2d390cfe0ac782b5bdbfefc
+  metadata.gz: ef45a0734f727ca6c28d890cacc0f5b90d137f77
+  data.tar.gz: 95cf465ec2c7414913fb91bcd7f27653851bb714
 SHA512:
-  metadata.gz: d5d01cbf64293131e35ce9a26a012a1ef0b537725ca363c5e77486fd777effbed15c5b9f3bdc2aa41acc487c8c8c955056c2b118ac82566eb4c775509991506e
-  data.tar.gz: 292badf21737ac6f62a7b5155005437249179fbb73cb3e31057973026f9712110bed46a1280320c66f0c14233b74a832e2d5b2d75db39fbb2d16440f67cd0bb1
+  metadata.gz: c343480a6bfe00c558a894e34bab39bbb56c9f9d8d4f347aea72cf87e930450132a90df7645166cc0388194aceba22b2e74aa84e37c633e9bd22deb26eddf938
+  data.tar.gz: 4eb510782d6a2bda0d9218c0b22bad51104c4586e241ce6a1dde9f9747cea881413ce448d6082e8f00f68648a90b000c7c48c33d6009cbf828c08e3f3fe5d56c

data/app/admin/c80_estate/admin_user.rb

@@ -0,0 +1,64 @@
+ActiveAdmin.register AdminUser do
+
+  permit_params :email,
+                :password,
+                :password_confirmation,
+                :roles_attributes => [:id, :role_type_id]
+
+  batch_action :destroy, false
+
+  controller do
+
+    def update
+      if params[:admin_user][:password].blank?
+        params[:admin_user].delete('password')
+        params[:admin_user].delete('password_confirmation')
+      end
+      super
+    end
+
+  end
+
+  # menu :if => proc {current_admin_user.email == "tz007@mail.ru"}
+  menu label: 'Пользователи', :if => proc { current_admin_user.can_view_users? }
+  index do
+    selectable_column
+    id_column
+    column :email
+    column :current_sign_in_at
+    column :sign_in_count
+    column :created_at
+    column :role do |user|
+      user.role_type_title
+    end
+    actions
+  end
+
+  filter :email
+  filter :current_sign_in_at
+  filter :sign_in_count
+  filter :created_at
+
+  form do |f|
+    f.inputs "Свойства" do
+      f.input :email
+
+      if f.object.new_record?
+        f.input :password
+        f.input :password_confirmation
+      else
+        # f.input :password
+        # f.input :password_confirmation
+      end
+
+      # f.input :roles
+      f.has_many :roles,
+                 new_record: true,
+                 allow_destroy: false do |r|
+        r.input :role_type
+      end
+    end
+    f.actions
+  end
+
+end

data/app/admin/c80_estate/areas.rb

@@ -13,21 +13,72 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
                 :atype_id,
                 :property_id,
                 :astatus_ids => [],
-                :aphotos_attributes => [:id,:image,:_destroy],
+                :aphotos_attributes => [:id, :image, :_destroy],
                 :item_props_attributes => [:value, :_destroy, :prop_name_id, :id]
 
+  batch_action :destroy, false
+
+  batch_action 'Задать цену', form: {
+                                # type: %w[Offensive Spam Other],
+                                val: :text,
+                                # notes:  :textarea,
+                                # hide:   :checkbox,
+                                # date:   :datepicker
+                            } do |ids, inputs|
+    # inputs is a hash of all the form fields you requested
+    redirect_to collection_path, notice: [ids, inputs].to_s
+
+  end
+
+  batch_action 'Задать объём площади', form: {
+                                         # type: %w[Offensive Spam Other],
+                                         val: :text,
+                                         # notes:  :textarea,
+                                         # hide:   :checkbox,
+                                         # date:   :datepicker
+                                     } do |ids, inputs|
+    # inputs is a hash of all the form fields you requested
+    redirect_to collection_path, notice: [ids, inputs].to_s
+  end
+
+  config.clear_action_items!
+
+  action_item :new_model, :only => :index do
+    if current_admin_user.can_create_areas?
+      link_to I18n.t("active_admin.new_model"), '/admin/areas/new', method: :get
+    end
+  end
+
+  action_item only: [:show] do
+    if current_admin_user.can_edit_area?(resource)
+      link_to I18n.t("active_admin.edit_model"), edit_admin_area_path(resource)
+    end
+  end
+
+  action_item only: [:show] do
+    if current_admin_user.can_delete_area?
+      link_to I18n.t("active_admin.delete_model"),
+              admin_area_path(resource),
+              data: {
+                  confirm: 'Вы уверены, что хотите удалить это?',
+                  method: 'delete'
+              }
+      # <a class="delete_link member_link" data-confirm="Вы уверены, что хотите удалить это?" rel="nofollow" data-method="delete" href="/admin/areas/1">Удалить</a>
+    end
+  end
+
   config.sort_order = 'id_asc'
 
   filter :atype_id,
          :label => 'Тип площади',
          :as => :select,
-         :collection => -> {C80Estate::Atype.all.map { |p| ["#{p.title}", p.id]}},
-         :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+         :collection => -> { C80Estate::Atype.all.map { |p| ["#{p.title}", p.id] } },
+         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
   filter :property_id,
          :label => 'Объект недвижимости',
          :as => :select,
-         :collection => -> {C80Estate::Property.all.map { |p| ["#{p.title}", p.id]}},
-         :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+         :collection => -> { C80Estate::Property.all.map { |p| ["#{p.title}", p.id] } },
+         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
 
   # filter :item_prop_square_val_in,
   #        :as => :string,
@@ -36,10 +87,10 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
   filter :item_prop_square_val_in,
          :as => :string,
          :label => 'Площадь (м.кв.)',
-         :input_html => { data: {
+         :input_html => {data: {
              provide: 'slider',
-             slider_ticks: C80Estate::ItemProp.all_uniq_values(9).to_json,   #'[0, 1, 2, 3]',
-             slider_labels: C80Estate::ItemProp.all_uniq_values(9).to_json,  #'["none", short", "medium","long"]',
+             slider_ticks: C80Estate::ItemProp.all_uniq_values(9).to_json, #'[0, 1, 2, 3]',
+             slider_labels: C80Estate::ItemProp.all_uniq_values(9).to_json, #'["none", short", "medium","long"]',
              slider_min: C80Estate::ItemProp.all_uniq_values(9).last,
              slider_max: C80Estate::ItemProp.all_uniq_values(9).first,
              slider_step: 1,
@@ -50,41 +101,41 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
   filter :item_prop_price_val_in,
          :as => :string,
          :label => 'Цена (руб/м.кв в месяц)',
-         :input_html => { data: {
-              provide: 'slider',
-              slider_ticks: C80Estate::ItemProp.all_uniq_values(1).to_json,   #'[0, 1, 2, 3]',
-              slider_labels: C80Estate::ItemProp.all_uniq_values(1).to_json,  #'["none", short", "medium","long"]',
-              slider_min: C80Estate::ItemProp.all_uniq_values(1).last,
-              slider_max: C80Estate::ItemProp.all_uniq_values(1).first,
-              slider_step: 1,
-              slider_value: 0,
-              slider_range: true
+         :input_html => {data: {
+             provide: 'slider',
+             slider_ticks: C80Estate::ItemProp.all_uniq_values(1).to_json, #'[0, 1, 2, 3]',
+             slider_labels: C80Estate::ItemProp.all_uniq_values(1).to_json, #'["none", short", "medium","long"]',
+             slider_min: C80Estate::ItemProp.all_uniq_values(1).last,
+             slider_max: C80Estate::ItemProp.all_uniq_values(1).first,
+             slider_step: 1,
+             slider_value: 0,
+             slider_range: true
          }}
 
   filter :item_prop_oenter_in,
          :as => :select,
-         :collection => [['Есть',11],['Нет',10]],
+         :collection => [['Есть', 11], ['Нет', 10]],
          :label => 'Отдельный вход с улицы',
-         :input_html => { :class => 'selectpicker', 'data-size' => "3", 'data-width' => '100%'}
+         :input_html => {:class => 'selectpicker', 'data-size' => "3", 'data-width' => '100%'}
 
   filter :item_prop_floor_val_in,
          :as => :select,
          :collection => -> { C80Estate::ItemProp.all_uniq_values(5) },
          :label => 'Этаж',
-         :input_html => { :class => 'selectpicker', 'data-size' => "3", 'data-width' => '100%'}
+         :input_html => {:class => 'selectpicker', 'data-size' => "3", 'data-width' => '100%'}
 
   # filter :title
   filter :assigned_person_id,
          :label => 'Назначенный пользователь',
          :as => :select,
-         :collection => -> {AdminUser.all.map{|u| ["#{u.email}", u.id]}},
-         :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+         :collection => -> { AdminUser.all.map { |u| ["#{u.email}", u.id] } },
+         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
   filter :created_at
   filter :updated_at
 
-  scope  "All", :all_areas
-  scope  "Free", :free_areas
-  scope  "Busy", :busy_areas
+  scope "All", :all_areas
+  scope "Free", :free_areas
+  scope "Busy", :busy_areas
 
   index do
     selectable_column
@@ -93,29 +144,40 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
       area.atype_title
     end
     column :property do |area|
-      area.property_title
+      "<div class='image_vertical properties_index_logo'>
+      <span></span><img src='#{image_path(area.property.logo_path)}'>
+      </div><span class='properties_index_logo_title'>#{area.property_title}</span>".html_safe
+
     end
     column :astatuses do |area|
-      area.astatus_title
+      "<span class='status_#{area.astatus_tag}'>#{area.astatus_title}</span>".html_safe
     end
     column :assigned_person do |area|
       area.assigned_person_title
     end
-    actions
+    # actions
+    column '' do |area|
+      link_to I18n.t("active_admin.view"), "/admin/areas/#{area.id}", class: 'member_link'
+    end
+    column '' do |area|
+      if current_admin_user.can_edit_area?(area)
+        link_to I18n.t("active_admin.edit"), "/admin/areas/#{area.id}/edit", class: 'member_link'
+      end
+    end
   end
 
   form(:html => {:multipart => true}) do |f|
 
     f.inputs 'Свойства' do
       f.input :title
-      f.input :atype, :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'}
-      f.input :property, :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'}
+      f.input :atype, :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'}
+      f.input :property, :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'}
       f.input :assigned_person,
-              :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
-              :collection => AdminUser.all.map{|u| ["#{u.email}", u.id]}
-      f.input :assigned_person_type, :input_html => { :value => "AdminUser" }, as: :hidden
+              :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px'},
+              :collection => AdminUser.all.map { |u| ["#{u.email}", u.id] }
+      f.input :assigned_person_type, :input_html => {:value => "AdminUser"}, as: :hidden
       f.input :astatuses,
-              :input_html => { :class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px', :multiple => false}
+              :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '400px', :multiple => false}
       f.input :desc, :as => :ckeditor
 
       f.inputs "Свойства" do
@@ -133,8 +195,11 @@ ActiveAdmin.register C80Estate::Area, as: 'Area' do
                  :hint => image_tag(gp.object.image.thumb512)
       end
 
-      f.input :owner_id, :input_html => { :value => current_admin_user.id }, as: :hidden
-      f.input :owner_type, :input_html => { :value => "AdminUser" }, as: :hidden
+      if f.object.new_record?
+        f.input :owner_id, :input_html => {:value => current_admin_user.id}, as: :hidden
+        f.input :owner_type, :input_html => {:value => "AdminUser"}, as: :hidden
+      end
+
     end
 
     f.actions

data/app/admin/c80_estate/astatuses.rb

@@ -1,7 +1,7 @@
 # ПОДкатегории строительных материалов
 ActiveAdmin.register C80Estate::Astatus, :as => 'Astatus' do
 
-  menu :label => "Статусы", :parent => "Настройки"
+  menu :label => "Статусы", :parent => "Настройки", :if => proc { current_admin_user.can_view_settings? }
 
   permit_params :title
 

data/app/admin/c80_estate/atypes.rb

@@ -1,7 +1,7 @@
 # ПОДкатегории строительных материалов
 ActiveAdmin.register C80Estate::Atype, :as => 'Atype' do
 
-  menu :label => "Типы", :parent => "Настройки"
+  menu :label => "Типы", :parent => "Настройки", :if => proc { current_admin_user.can_view_settings? }
 
   permit_params :title,
                 :slug,

data/app/admin/c80_estate/comments.rb

@@ -0,0 +1,25 @@
+ActiveAdmin.register ActiveAdmin::Comment, :as => 'Comment' do
+
+  menu label: 'Комментарии', :if => proc { current_admin_user.can_view_comments? }
+
+  batch_action :destroy, false
+
+  config.clear_action_items!
+
+  index do
+    # selectable_column
+    id_column
+    column :author
+    column :resource
+    column :body
+    column :created_at
+  end
+
+  filter :author_id,
+         :label => 'Автор',
+         :as => :select,
+         :collection => -> { AdminUser.all.map { |u| ["#{u.email}", u.id] } },
+         :input_html => {:class => 'selectpicker', 'data-size' => "10", 'data-width' => '100%'}
+  filter :created_at
+
+end

data/app/admin/c80_estate/prop_names.rb

@@ -1,6 +1,6 @@
 ActiveAdmin.register C80Estate::PropName, as: 'PropName' do
 
-  menu :label => "Имена свойств", :parent => "Настройки"
+  menu :label => "Имена свойств", :parent => "Настройки", :if => proc { current_admin_user.can_view_settings? }
 
   permit_params :title,
                 :uom_id,

data/app/admin/c80_estate/properties.rb

@@ -17,6 +17,16 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
                 :pphotos_attributes => [:id,:image,:_destroy],
                 :plogos_attributes => [:id,:image,:_destroy]
 
+  batch_action :destroy, false
+
+  config.clear_action_items!
+
+  action_item :new_model, :only => :index do
+    if current_admin_user.can_create_properties?
+      link_to I18n.t("active_admin.new_model"), '/admin/properties/new', method: :get
+    end
+  end
+
   config.sort_order = 'id_asc'
 
   filter :title
@@ -29,6 +39,11 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
 
   index do
     selectable_column
+    column '' do |prop|
+      "<div class='image_vertical properties_index_logo'>
+      <span></span><img src='#{image_path(prop.logo_path)}'>
+      </div>".html_safe
+    end
     column :title
     column :address
     column :gps do |prop|
@@ -40,7 +55,17 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
     # column :atype do |prop|
     #   prop.atype.title
     # end
-    actions
+    # actions
+
+    column '' do |property|
+      link_to I18n.t("active_admin.view"), "/admin/properties/#{property.id}", class: 'member_link'
+    end
+    column '' do |property|
+      if current_admin_user.can_edit_property?(property)
+        link_to I18n.t("active_admin.edit"), "/admin/properties/#{property.id}/edit", class: 'member_link'
+      end
+    end
+
   end
 
   form(:html => {:multipart => true}) do |f|
@@ -52,8 +77,12 @@ ActiveAdmin.register C80Estate::Property, as: 'Property' do
               :collection => AdminUser.all.map{|u| ["#{u.email}", u.id]}
       f.input :assigned_person_type, :input_html => { :value => "AdminUser" }, as: :hidden
       # f.input :atype, :input_html => { :class => 'selectpicker', 'data-size' => "5", 'data-width' => '400px'}
-      f.input :owner_id, :input_html => { :value => current_admin_user.id }, as: :hidden
-      f.input :owner_type, :input_html => { :value => "AdminUser" }, as: :hidden
+
+      if f.object.new_record?
+        f.input :owner_id, :input_html => { :value => current_admin_user.id }, as: :hidden
+        f.input :owner_type, :input_html => { :value => "AdminUser" }, as: :hidden
+      end
+
       f.input :address
       f.input :latitude
       f.input :longitude

data/app/admin/c80_estate/pstats.rb

@@ -2,7 +2,7 @@ ActiveAdmin.register C80Estate::Pstat, as: 'Pstat' do
 
   # scope_to :current_admin_user, association_method: :sites_list
 
-  menu :label => "Объекты", :parent => 'Статистика'
+  menu :label => "Объекты", :parent => 'Статистика', if: proc{ current_admin_user.can_view_statistics? }
 
   config.sort_order = 'id_asc'
 

data/app/admin/c80_estate/role_types.rb

@@ -1,7 +1,7 @@
 # ПОДкатегории строительных материалов
 ActiveAdmin.register C80Estate::RoleType, :as => 'RoleType' do
 
-  menu :label => "Роли", :parent => "Настройки"
+  menu :label => "Роли", :parent => "Настройки", :if => proc { current_admin_user.can_view_settings? }
 
   permit_params :title,
                 :desc

data/app/admin/c80_estate/sevents.rb

@@ -2,7 +2,7 @@ ActiveAdmin.register C80Estate::Sevent, as: 'Sevent' do
 
   # scope_to :current_admin_user, association_method: :sites_list
 
-  menu :label => "Площади", :parent => 'Статистика'
+  menu :label => "Площади", :parent => 'Статистика', if: proc{ current_admin_user.can_view_statistics? }
 
   permit_params :area_id,
                 :atype_id,

data/app/admin/c80_estate/uoms.rb

@@ -1,7 +1,7 @@
 # единицы измерения
 ActiveAdmin.register C80Estate::Uom, :as => 'Uom' do
 
-  menu :label => "Единицы измерения", :parent => "Настройки"
+  menu :label => "Единицы измерения", :parent => "Настройки", :if => proc { current_admin_user.can_view_settings? }
 
   permit_params :title, :comment, :is_number
 

data/app/assets/javascript/c80_estate/backend/admin/areas.js

@@ -417,7 +417,37 @@ var fEdit = function () {
     fLoadingShow();
 };
 
+var fAreasIndex = function () {
+
+    //var $input_square_min = $('<input type="text" class="min_text_input"/>')
+    //    .appendTo($("#q_item_prop_square_val_in").parent());
+    //
+    //var $input_square_max = $('<input type="text" class="max_text_input"/>')
+    //    .appendTo($("#q_item_prop_square_val_in").parent());
+
+    // переведём scope надписи
+
+    var $li, $a, $a_span;
+
+    $li = $('li.scope.all');
+    $a = $li.find(".table_tools_button");
+    $a_span = $a.find('span');
+    $a.html('Все <span class="count">' + $a_span.text() + '</span>');
+
+    $li = $('li.scope.free');
+    $a = $li.find(".table_tools_button");
+    $a_span = $a.find('span');
+    $a.html('Свободные <span class="count">' + $a_span.text() + '</span>');
+
+    $li = $('li.scope.busy');
+    $a = $li.find(".table_tools_button");
+    $a_span = $a.find('span');
+    $a.html('Занятые <span class="count">' + $a_span.text() + '</span>');
+
+};
+
 YOUR_APP.areas = {
     edit: fEdit,
-    "new": jsinit.go
+    "new": jsinit.go,
+    index: fAreasIndex
 };

data/app/assets/stylesheets/c80_estate/backend/admin_areas.scss

@@ -107,10 +107,6 @@ body.admin_areas {
 
   }
 
-  a.delete_link {
-    display: none;
-  }
-
   .slider.slider-horizontal {
     width: 227px !important;
   }
@@ -123,5 +119,65 @@ body.admin_areas {
     margin-top: 0 !important;
   }
 
+  &.index {
+
+    .min_text_input {
+      margin-top: 15px;
+      width: 45% !important;
+    }
+
+    .max_text_input {
+      margin-top: 15px;
+      width: 45% !important;
+      margin-left: 10%;
+    }
+
+    a.delete_link {
+      /*display: none;*/
+    }
+
+    span.status_free {
+      display: block;
+      position: relative;
+      padding: 0 0 0 17px;
+
+      &:after {
+        display: block;
+        position: absolute;
+        top:0;
+        left:0;
+        width: 20px;
+        height: 20px;
+        font-family: FontAwesome;
+        content: '\f059';
+        color: #51e471;
+      }
+
+    }
+
+    span.status_busy {
+      display: block;
+      position: relative;
+      padding: 0 0 0 17px;
+
+      &:after {
+        display: block;
+        position: absolute;
+        top:0;
+        left:0;
+        width: 20px;
+        height: 20px;
+        font-family: FontAwesome;
+        content: '\f058';
+        color: #ff2d2d;
+      }
+
+    }
+
+  }
+
+  &.show {
+
+  }
 
 }

data/app/assets/stylesheets/c80_estate/backend/admin_properties.scss

@@ -0,0 +1,15 @@
+div.properties_index_logo {
+  height: 30px;
+  width: 30px;
+  float: left;
+  margin-right: 10px;
+
+  img {
+    max-width: 100%;
+    width: 100%;
+  }
+
+}
+
+span.properties_index_logo_title {
+}

data/app/assets/stylesheets/c80_estate/backend/common.scss

@@ -1,3 +1,18 @@
 #admin_user_1 {
   display: none;
+}
+
+.image_vertical {
+  text-align: center;         /*!*/
+  white-space: nowrap;        /*!*/
+
+  > span {
+    display: inline-block;      /*!*/
+    vertical-align: middle;     /*!*/
+    height: 100%;               /*!*/
+  }
+
+  > img {
+    vertical-align: middle;     /*!*/
+  }
 }

data/app/models/c80_estate/area.rb

@@ -141,6 +141,14 @@ module C80Estate
       res
     end
 
+    def astatus_tag
+      res = -1
+      if astatuses.count > 0
+        res = astatuses.first.tag
+      end
+      res
+    end
+
     def assigned_person_title
       res = "-"
       if assigned_person.present?

data/app/models/c80_estate/owner.rb

@@ -48,6 +48,64 @@ module C80Estate
             roles << r
           end
 
+          def can_view_statistics?
+            r1 = roles.where(role_type: 1)
+            r2 = roles.where(role_type: 2)
+            r1.count > 0 || r2.count > 0
+          end
+
+          def can_view_comments?
+            r1 = roles.where(role_type: 1)
+            r2 = roles.where(role_type: 2)
+            r1.count > 0 || r2.count > 0
+          end
+
+          def can_view_settings?
+            r1 = roles.where(role_type: 1)
+            r1.count > 0
+          end
+
+          def can_view_users?
+            r1 = roles.where(role_type: 1)
+            r1.count > 0
+            # true
+          end
+
+          def can_edit_area?(area)
+            r1 = roles.where(role_type: 1)
+            # mark_is_owner = area.owner.id == id
+            mark_is_assigned = area.assigned_person.id == id
+            r1.count > 0 || mark_is_assigned # || mark_is_owner
+            # true
+          end
+
+
+          def can_edit_property?(property)
+            r1 = roles.where(role_type: 1)
+            # mark_is_owner = property.owner.id == id
+            mark_is_assigned = property.assigned_person.id == id
+            r1.count > 0 || mark_is_assigned # || mark_is_owner
+            # true
+          end
+
+          def can_create_areas?
+            r1 = roles.where(role_type: 1)
+            r1.count > 0
+            # true
+          end
+
+          def can_create_properties?
+            r1 = roles.where(role_type: 1)
+            r1.count > 0
+            # true
+          end
+
+          def can_delete_area?
+            r1 = roles.where(role_type: 1)
+            r1.count > 0
+            # true
+          end
+
         end
       end
     end

data/config/locales/ru.yml

@@ -4,7 +4,7 @@ ru:
       area:
         one: "площадь"
         other: "Площади"
-      c80_news_tz/nphoto: ""
+      c80_estate/aphoto: "изображение"
       c80_news_tz/gallery: ""
       c80_news_tz/gphoto: "картинку"
       c80_news_tz/cphoto: ""
@@ -31,15 +31,36 @@ ru:
       admin_user:
         one: 'пользователя'
         other: 'Пользователи'
+        email: 'Email'
+        password: 'Пароль'
+        password_confirmation: 'Пароль ещё раз'
+        role: 'роль'
     attributes:
       c80_estate/area:
         title: "Название"
         atype: 'Тип'
         property: 'Объект'
+        desc: 'Описание'
         astatus: 'Статус'
         assigned_person: 'Ответственный'
         created_at: 'Время создания'
         updated_at: 'Изменён'
+        owner: 'Создатель'
+        astatuses: 'Статус'
+      c80_estate/property:
+        title: "Название"
+        address: 'Адрес'
+        gps: 'GPS'
+        desc: 'Описание'
+        latitude: 'Широта'
+        longitude: 'Долгота'
+        assigned_person: 'Ответственный'
+        created_at: 'Время создания'
+        updated_at: 'Изменён'
+        owner: 'Создатель'
+        astatuses: 'Статус'
+      c80_estate/aphoto:
+        image: 'Файл'
       c80_news_tz/nphoto:
         image: 'Файл'
       c80_news_tz/adress:

data/lib/c80_estate/version.rb

@@ -1,3 +1,3 @@
 module C80Estate
-  VERSION = "0.1.0.7"
+  VERSION = "0.1.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: c80_estate
 version: !ruby/object:Gem::Version
-  version: 0.1.0.7
+  version: 0.1.0.8
 platform: ruby
 authors:
 - C80609A
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-07-22 00:00:00.000000000 Z
+date: 2016-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -65,9 +65,11 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- app/admin/c80_estate/admin_user.rb
 - app/admin/c80_estate/areas.rb
 - app/admin/c80_estate/astatuses.rb
 - app/admin/c80_estate/atypes.rb
+- app/admin/c80_estate/comments.rb
 - app/admin/c80_estate/dashboard.rb
 - app/admin/c80_estate/prop_names.rb
 - app/admin/c80_estate/properties.rb
@@ -89,6 +91,7 @@ files:
 - app/assets/javascript/c80_estate_active_admin.js.coffee
 - app/assets/stylesheets/c80_estate/backend/admin_areas.scss
 - app/assets/stylesheets/c80_estate/backend/admin_prop_names.scss
+- app/assets/stylesheets/c80_estate/backend/admin_properties.scss
 - app/assets/stylesheets/c80_estate/backend/admin_pstats.scss
 - app/assets/stylesheets/c80_estate/backend/admin_sevents.scss
 - app/assets/stylesheets/c80_estate/backend/admin_users.scss