[Git][noosfero/noosfero][stable-1.8] Merge branch 'solid' into 'master'

[Rodrigo Souto]

Rodrigo Souto pushed to branch stable-1.8 at Noosfero / noosfero


Commits:
2e9f5a2f by Rodrigo Souto at 2017-07-25T14:18:25+00:00
Merge branch 'solid' into 'master'

Applying SOLID techniques

See merge request !1273
- - - - -


1 changed file:

- app/models/concerns/code_numbering.rb


Changes:

=====================================
app/models/concerns/code_numbering.rb
=====================================
--- a/app/models/concerns/code_numbering.rb
+++ b/app/models/concerns/code_numbering.rb
@@ -35,14 +35,24 @@ module CodeNumbering
       self.code_scope.maximum(self.code_numbering_field) || 0
     end
 
+    def code_max
+      max = nil
+           
+      if self.code_numbering_options[:start]
+        max = self.code_numbering_options[:start].to_i - 1
+      end
+
+      max
+    end
+
     def create_code_numbering
-      max = self.code_numbering_options[:start].to_i - 1 if self.code_numbering_options[:start]
+      max = code_max
       max = self.code_maximum
       self.send "#{self.code_numbering_field}=", max+1
     end
 
     def reset_scope_code_numbering
-      max = self.code_numbering_options[:start].to_i - 1 if self.code_numbering_options[:start]
+      max = code_max
       max ||= 1
 
       self.code_scope.order(:created_at).each do |record|



View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/2e9f5a2fcedc77aeeee95883d7534aebc6dbf5be

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/commit/2e9f5a2fcedc77aeeee95883d7534aebc6dbf5be
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170725/bc48a9e3/attachment-0001.html>