drg_cms 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0867ef411e20c533abaff83ba61268fffe01be0d
-  data.tar.gz: 7a249dfea4847991e8437fd9f5b9d9f0445cedd6
+  metadata.gz: d887c0659fd8bf3a65bef4b1efb17f8337119c48
+  data.tar.gz: 4d950c6bb8e59d9b8973842653c7d1cbb9fd9e4c
 SHA512:
-  metadata.gz: 52bf2980ec6fbc9c88314b21b766fa827ec6e482dbf9db06b0d029adec3d4759b5157de196aef1c717ec1c2ac8016f5b9479b3d341fb716ac841f38957360670
-  data.tar.gz: aced1888c2df9660b106ba36129db5b9eaffb94ff7fae741fd845ac3e665946c5a6e510d37c8c86024870caf8590e93b5300d48a5ef9ca53dcc90f1f6cb4f303
+  metadata.gz: 9ea94cdd52753eb84264c8672371f79dd7d0775fbe9e7cbab6038ba612b260dfaaaf8740dfdf57eb9e65e1dc4dd38e8fae981362b11e2b9c4580eb6ebff2c20a
+  data.tar.gz: 14dfc42786eaa772a444b5e5fe6e68b6e73cb1e94700f18bc03d2a3f07f61fce7d26d86858061940fa71fe1c4becd0d3d10dbd209cc29b1523f242d92159b35a

data/app/controllers/cmsedit_controller.rb

@@ -164,7 +164,7 @@ def check_filter_options() #:nodoc:
   if session[table_name][:filter]
     field, oper, value = session[table_name][:filter].split( "\t")
     field = '_id' if field == 'id' # must be
-    value = /#{value}/ if oper == 'like' # do regex if operation is like
+    value = /#{value}/i if oper == 'like' # do regex if operation is like
 # when field type is ObjectId transform value    
     if model.fields[field] and model.fields[field].type == BSON::ObjectId
       value = BSON::ObjectId.from_string(value) rescue nil

data/app/controllers/dc_common_controller.rb

@@ -63,7 +63,7 @@ def autocomplete
       r << { label: v[params['search']], value: v[params['search']], id: v.id.to_s }
     end
   end
-  p a
+
   render inline: a.to_json, formats: 'js'
 end
 
@@ -103,17 +103,16 @@ end
 def process_login
 # Somebody is probably playing
   return dc_render_404 unless ( params[:record] and params[:record][:username] and params[:record][:password] )
-  
-  if params[:record][:password].to_s.size > 0  #password must not be empty
+
+  unless params[:record][:password].blank? #password must not be empty
     user  = DcUser.find_by(username: params[:record][:username])
     if user and user.authenticate(params[:record][:password])
       fill_login_data(user, params[:record][:remember_me].to_i == 1)
+      return redirect_to params[:return_to] ||  '/'
     end
-  else
-    flash[:error]      = t('drgcms.invalid_username')
-    params[:return_to] = params[:return_to_error] # return_to error
   end
-  redirect_to params[:return_to] ||  '/'
+  flash[:error] = t('drgcms.invalid_username')
+  redirect_to params[:return_to_error] ||  '/'
 end
 
 ####################################################################

data/app/forms/cms_menu.yml

@@ -38,59 +38,59 @@ menu:
         params:
           table: dc_design
       30: 
+        caption: helpers.label.dc_page.tabletitle
+        controller: cmsedit
+        picture: dc_page.png
+        params:
+          table: dc_page
+      40: 
         caption: helpers.label.dc_category.tabletitle
         controller: cmsedit
         picture: dc_category.png
         params:
           table: dc_category
-      40: 
-        caption: helpers.label.dc_page.tabletitle
+      50: 
+        caption: helpers.label.dc_user.tabletitle
         controller: cmsedit
-        picture: dc_page.png
+        picture: dc_user.png
         params:
-          table: dc_page
-      50: 
+          table: dc_user
+      60: 
         caption: helpers.label.dc_piece.tabletitle
         controller: cmsedit
         picture: dc_piece.png
         params:
           table: dc_piece
-      60: 
+      70: 
         caption: helpers.label.dc_link.tabletitle
         controller: cmsedit
         picture: dc_link.png
         params:
           table: dc_link
-      70: 
+      80: 
         caption: helpers.label.dc_menu.tabletitle
         controller: cmsedit
         picture: dc_menu.png
         params:
           table: dc_menu
-      80: 
+      90: 
         caption: helpers.label.dc_simple_menu.tabletitle
         controller: cmsedit
         picture: dc_simple_menu.png
         params:
           table: dc_simple_menu
-      90: 
+      100: 
         caption: helpers.label.dc_poll.tabletitle
         controller: cmsedit
         picture: dc_poll.png
         params:
           table: dc_poll
-      100: 
+      110: 
         caption: helpers.label.dc_ad.tabletitle
         controller: cmsedit
         picture: dc_ad.png
         params:
           table: dc_ad
-      110: 
-        caption: helpers.label.dc_user.tabletitle
-        controller: cmsedit
-        picture: dc_user.png
-        params:
-          table: dc_user
       120: 
         caption: helpers.label.dc_big_table.tabletitle
         controller: cmsedit

data/app/forms/dc_design.yml

@@ -4,7 +4,7 @@ title: Site design
 table: dc_design
 
 index:
-  filter: name, description, body as text_field
+  filter: description, body as text_field
   actions: standard
 
 result_set:
@@ -12,16 +12,11 @@ result_set:
     1: edit
     2: 
       type: duplicate
-      dup_fields: name,description
+      dup_fields: description
 
     3: delete
-#    4: 
-#      type: edit_embedded
-#      table: dc_part
 
   columns:
-    1:  
-      name: name
     2: 
       name: description
 
@@ -35,20 +30,22 @@ form:
   tabs:
     tab1:
       10:
-        name: name
-        type: text_field
-        size: 50
-
-      20:
         name: description
         type: text_field
         html:
           size: 50
+      20:
+        name: site_id
+        type: select
+        eval: DcSite.choices4_site
+        html:
+          include_blank: true
       30:
         name: rails_view
         type: text_field
         html:
           size: 50
+          
       40:
         name: body
         type: text_area

data/app/forms/dc_page.yml

@@ -98,7 +98,7 @@ form:
       10:
         name: dc_design_id
         type: select
-        eval: DcDesign.choices4_design
+        eval: DcDesign.choices4_design(@parent.dc_get_site)
         html:
           include_blank: true
       20:

data/app/helpers/cmsedit_helper.rb

@@ -420,10 +420,9 @@ def dc_columns_for_result(document)
             eval( "#{v['eval']} '#{document[ v['name'] ]}'") 
           end
         end
-      else        
-        dc_format_value(document[ v['name'] ], v['format'])
+      else 
+        document.respond_to?(v['name']) ? dc_format_value(document.send( v['name'] ), v['format']) : "!!! #{v['name']}"
       end
-#      td << ">#{value}</td>"
       html << td << ">#{value}</td>"
     end
   end

data/app/models/dc_design.rb

@@ -73,7 +73,6 @@ class DcDesign
   include Mongoid::Document
   include Mongoid::Timestamps
   
-  field   :name,        type: String
   field   :description, type: String,  default: ''
   field   :body,        type: String,  default: ''
   field   :css,         type: String,  default: ''
@@ -82,17 +81,22 @@ class DcDesign
   field   :active,      type: Boolean, default: true 
   field   :created_by,  type: BSON::ObjectId
   field   :updated_by,  type: BSON::ObjectId
+  field   :site_id,     type: BSON::ObjectId
   
   embeds_many :dc_parts
-#  embeds_many :dc_parts, as: :dc_parts
-
-  index( { name: 1 }, { unique: true } )
+  
+  validates_length_of :description, minimum: 5
   
 ########################################################################
-# Return choices for select for design_id
+# Return choices for select for design_id. 
+# 
+# If site is passed as parameter, only designs which belong to site or do not
+# have site assigned will be selected. Too much designs to select often confuses
+# end user.
 ########################################################################
-def self.choices4_design
-  all.sort(name: 1).inject([]) { |r,design| r << [ design.description, design._id] if design.active; r }
+def self.choices4_design(site=nil)
+  list = site.nil? ? where(active: true) : where(active: true).in(site_id: [nil,site.id])
+  list.sort(name: 1).inject([]) { |r,design| r << [ design.description, design._id] }
 end
   
 end

data/config/locales/models_en.yml

@@ -72,6 +72,7 @@ en:
         updated_by: Updated by
         active: Active
         dc_parts: Parts
+        site_id: Site name
         rails_view: Rails view filename
 
       dc_user_role:
@@ -547,6 +548,7 @@ en:
         active: Is the design active
         dc_parts: Parts of design
         rails_view: Rails view (file) name which will be used to render design
+        site_id: Select site name if this design belongs to singe site
 
       dc_poll:
         name: Unique poll name

data/config/locales/models_sl.yml

@@ -75,6 +75,7 @@ sl:
         active: Aktiven
         dc_parts: Elementi 
         rails_view: Rails view datoteka
+        site_id: Spletišče
 
       dc_user:
         tabletitle: Uporabniki
@@ -520,6 +521,7 @@ sl:
         active: Ali je dizajn aktiven
         dc_parts: Elementi, sestavni deli dizajna
         rails_view: Ime Rails view datoteke, ki bo uporabljena za izris strani
+        site_id: Izberite spletišče, če dizajn pripada samo enemu spletišču
 
       dc_user:
         username: Uporabniško ime

data/lib/drg_cms/version.rb

@@ -1,4 +1,4 @@
 module DrgCms #:nodoc:
   # drg_cms gem version
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_cms
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -341,7 +341,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.2.5
 signing_key: 
 specification_version: 4
 summary: 'DRG CMS: Content management system for Ruby, Rails and MongoDB'