diff --git a/app/models/subject.rb b/app/models/subject.rb index b7681191..6d0eaca0 100644 --- a/app/models/subject.rb +++ b/app/models/subject.rb @@ -135,8 +135,7 @@ def check_retire_by_vote if assesment_classifications > 2 percentage_for_retire = retire_count / assesment_classifications.to_f if percentage_for_retire >= workflow.retire_limit - self.retire! - increment_parents_subject_count_by -1 if parent_subject + increment_parents_subject_count_by -1 if self.retire! && parent_subject end end end @@ -149,12 +148,13 @@ def bad! end def retire! - return if status == "bad" - return if classifying_user_ids.length < workflow.retire_limit + return false if status == "bad" + return false if classifying_user_ids.length < workflow.retire_limit + status! 'retired' subject_set.subject_completed_on_workflow(workflow) if ! workflow.nil? - - # subject_set.inc_complete_secondary_subject 1 if type != 'root' + + true end def activate! diff --git a/app/models/workflow.rb b/app/models/workflow.rb index 7a380337..bc0d9220 100644 --- a/app/models/workflow.rb +++ b/app/models/workflow.rb @@ -6,7 +6,7 @@ class Workflow field :key, type: String field :label, type: String field :first_task, type: String - field :retire_limit, type: Integer, default: 3 + field :retire_limit, type: Float, default: 0.75 field :subject_fetch_limit, type: Integer, default: 10 field :generates_subjects, type: Boolean, default: true field :generates_subjects_after, type: Integer, default: 0 diff --git a/project/emigrant/project.json b/project/emigrant/project.json index 9153ed16..d11c987a 100644 --- a/project/emigrant/project.json +++ b/project/emigrant/project.json @@ -44,6 +44,8 @@ "google_analytics_client_id": "UA-69673163-1" }, + "discuss_url": "http://forum.emigrantcity.nypl.org", + "forum": { "type": "discourse", "base_url": "http://forum.emigrantcity.nypl.org" diff --git a/project/emigrant/workflows/mark.json b/project/emigrant/workflows/mark.json index 81698765..c6273239 100644 --- a/project/emigrant/workflows/mark.json +++ b/project/emigrant/workflows/mark.json @@ -4,6 +4,7 @@ "subject_fetch_limit":"10", "generates_subjects": true, "generates_subjects_for": "transcribe", + "retire_limit": 0.75, "first_task":"mark_primary",