Commit 3e028f74c1e94453fa3e3aa8fe00d2542414691a
Exists in
theme-brasil-digital-from-staging
and in
9 other branches
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
| @@ -40,10 +40,6 @@ class AbuseComplaint < Task | @@ -40,10 +40,6 @@ class AbuseComplaint < Task | ||
| 40 | true | 40 | true |
| 41 | end | 41 | end |
| 42 | 42 | ||
| 43 | - def reject_details | ||
| 44 | - true | ||
| 45 | - end | ||
| 46 | - | ||
| 47 | def icon | 43 | def icon |
| 48 | {:type => :profile_image, :profile => reported, :url => reported.url} | 44 | {:type => :profile_image, :profile => reported, :url => reported.url} |
| 49 | end | 45 | end |
app/models/approve_article.rb
app/models/approve_comment.rb
app/models/create_community.rb
| @@ -56,10 +56,6 @@ class CreateCommunity < Task | @@ -56,10 +56,6 @@ class CreateCommunity < Task | ||
| 56 | end | 56 | end |
| 57 | end | 57 | end |
| 58 | 58 | ||
| 59 | - def reject_details | ||
| 60 | - true | ||
| 61 | - end | ||
| 62 | - | ||
| 63 | # tells if this request was rejected | 59 | # tells if this request was rejected |
| 64 | def rejected? | 60 | def rejected? |
| 65 | self.status == Task::Status::CANCELLED | 61 | self.status == Task::Status::CANCELLED |
app/models/create_enterprise.rb
| @@ -164,10 +164,6 @@ class CreateEnterprise < Task | @@ -164,10 +164,6 @@ class CreateEnterprise < Task | ||
| 164 | {:message => _('%{requestor} wants to create enterprise %{subject}.')} | 164 | {:message => _('%{requestor} wants to create enterprise %{subject}.')} |
| 165 | end | 165 | end |
| 166 | 166 | ||
| 167 | - def reject_details | ||
| 168 | - true | ||
| 169 | - end | ||
| 170 | - | ||
| 171 | def task_created_message | 167 | def task_created_message |
| 172 | _('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. | 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
plugins/bsc/lib/bsc_plugin/associate_enterprise.rb
| @@ -23,10 +23,6 @@ class BscPlugin::AssociateEnterprise < Task | @@ -23,10 +23,6 @@ class BscPlugin::AssociateEnterprise < Task | ||
| 23 | {:type => :defined_image, :src => src, :name => bsc.name} | 23 | {:type => :defined_image, :src => src, :name => bsc.name} |
| 24 | end | 24 | end |
| 25 | 25 | ||
| 26 | - def reject_details | ||
| 27 | - true | ||
| 28 | - end | ||
| 29 | - | ||
| 30 | def perform | 26 | def perform |
| 31 | bsc.enterprises << enterprise | 27 | bsc.enterprises << enterprise |
| 32 | end | 28 | end |
plugins/sub_organizations/lib/sub_organizations_plugin/approve_paternity.rb
| @@ -28,10 +28,6 @@ class SubOrganizationsPlugin::ApprovePaternity < Task | @@ -28,10 +28,6 @@ class SubOrganizationsPlugin::ApprovePaternity < Task | ||
| 28 | {:message => _('%{requestor} wants to add this organization as a sub-organization of %{linked_subject}.')} | 28 | {:message => _('%{requestor} wants to add this organization as a sub-organization of %{linked_subject}.')} |
| 29 | end | 29 | end |
| 30 | 30 | ||
| 31 | - def reject_details | ||
| 32 | - true | ||
| 33 | - end | ||
| 34 | - | ||
| 35 | def icon | 31 | def icon |
| 36 | {:type => :profile_image, :profile => parent, :url => parent.url} | 32 | {:type => :profile_image, :profile => parent, :url => parent.url} |
| 37 | end | 33 | end |