Download as
Browse Code »

Commit 3e028f74c1e94453fa3e3aa8fe00d2542414691a

Authored by Michel Felipe
2 parents 1cc3df68 ff409765
Exists in theme-brasil-digital-from-staging and in 9 other branches angular_poc, api-article-archived, backup-7-jan-2016, captcha_serpro_plugin, login-captcha, production, resend_confirmation_email, staging, staging_rails3

Merge branch 'reject_details_all' into stable

Showing 8 changed files with 1 additions and 29 deletions   Show diff stats
app/models/abuse_complaint.rb
  Diff comments   View file @3e028f7
... ... @@ -40,10 +40,6 @@ class AbuseComplaint < Task
40 40 true
41 41 end
42 42  
43   - def reject_details
44   - true
45   - end
46   -
47 43 def icon
48 44 {:type => :profile_image, :profile => reported, :url => reported.url}
49 45 end
... ...
app/models/approve_article.rb
  Diff comments   View file @3e028f7
... ... @@ -82,10 +82,6 @@ class ApproveArticle < Task
82 82 true
83 83 end
84 84  
85   - def reject_details
86   - true
87   - end
88   -
89 85 def default_decision
90 86 if article
91 87 'skip'
... ...
app/models/approve_comment.rb
  Diff comments   View file @3e028f7
... ... @@ -60,10 +60,6 @@ class ApproveComment < Task
60 60 true
61 61 end
62 62  
63   - def reject_details
64   - true
65   - end
66   -
67 63 def default_decision
68 64 if article
69 65 'skip'
... ...
app/models/create_community.rb
  Diff comments   View file @3e028f7
... ... @@ -56,10 +56,6 @@ class CreateCommunity < Task
56 56 end
57 57 end
58 58  
59   - def reject_details
60   - true
61   - end
62   -
63 59 # tells if this request was rejected
64 60 def rejected?
65 61 self.status == Task::Status::CANCELLED
... ...
app/models/create_enterprise.rb
  Diff comments   View file @3e028f7
... ... @@ -164,10 +164,6 @@ class CreateEnterprise < Task
164 164 {:message => _('%{requestor} wants to create enterprise %{subject}.')}
165 165 end
166 166  
167   - def reject_details
168   - true
169   - end
170   -
171 167 def task_created_message
172 168 _('Your request for registering enterprise "%{enterprise}" at %{environment} was just received. It will be reviewed by the validator organization of your choice, according to its methods and criteria.
173 169  
... ...
app/models/task.rb
  Diff comments   View file @3e028f7
... ... @@ -141,7 +141,7 @@ class Task < ActiveRecord::Base
141 141 end
142 142  
143 143 def reject_details
144   - false
  144 + true
145 145 end
146 146  
147 147 def icon
... ...
plugins/bsc/lib/bsc_plugin/associate_enterprise.rb
  Diff comments   View file @3e028f7
... ... @@ -23,10 +23,6 @@ class BscPlugin::AssociateEnterprise < Task
23 23 {:type => :defined_image, :src => src, :name => bsc.name}
24 24 end
25 25  
26   - def reject_details
27   - true
28   - end
29   -
30 26 def perform
31 27 bsc.enterprises << enterprise
32 28 end
... ...
plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity.rb
  Diff comments   View file @3e028f7
... ... @@ -28,10 +28,6 @@ class SubOrganizationsPlugin::ApprovePaternity &lt; Task
28 28 {:message => _('%{requestor} wants to add this organization as a sub-organization of %{linked_subject}.')}
29 29 end
30 30  
31   - def reject_details
32   - true
33   - end
34   -
35 31 def icon
36 32 {:type => :profile_image, :profile => parent, :url => parent.url}
37 33 end
... ...