diff --git a/alembic/versions/db161adbafdf_update_loa_to_array_type.py b/alembic/versions/db161adbafdf_update_loa_to_array_type.py index afe3ae6d..72ce461c 100644 --- a/alembic/versions/db161adbafdf_update_loa_to_array_type.py +++ b/alembic/versions/db161adbafdf_update_loa_to_array_type.py @@ -1,7 +1,7 @@ """Update LOA to Array Type Revision ID: db161adbafdf -Revises: b3a1a07cf30b +Revises: fa3ba4049218 Create Date: 2019-02-15 14:28:33.181136 """ @@ -11,7 +11,7 @@ import sqlalchemy as sa # revision identifiers, used by Alembic. revision = 'db161adbafdf' -down_revision = 'b3a1a07cf30b' +down_revision = 'fa3ba4049218' branch_labels = None depends_on = None @@ -19,10 +19,12 @@ depends_on = None def upgrade(): # ### commands auto generated by Alembic - please adjust! ### op.execute("ALTER TABLE task_orders ALTER COLUMN loa TYPE varchar[] USING array[loa]") + op.alter_column('task_orders', 'loa', new_column_name='loas') # ### end Alembic commands ### def downgrade(): # ### commands auto generated by Alembic - please adjust! ### op.execute("ALTER TABLE task_orders ALTER COLUMN loa TYPE varchar USING loa[1]") + op.alter_column('task_orders', 'loas', new_column_name='loa') # ### end Alembic commands ### diff --git a/atst/forms/ko_review.py b/atst/forms/ko_review.py index 2ac0b38d..c92561ab 100644 --- a/atst/forms/ko_review.py +++ b/atst/forms/ko_review.py @@ -29,7 +29,7 @@ class KOReviewForm(CacheableForm): number = StringField( translate("forms.ko_review.to_number"), validators=[Length(min=10)] ) - loa = FieldList( + loas = FieldList( StringField( translate("forms.ko_review.loa"), validators=[Length(min=10), IsNumber()] ) @@ -43,5 +43,5 @@ class KOReviewForm(CacheableForm): @property def data(self): _data = super(FlaskForm, self).data - _data["loa"] = [n for n in _data["loa"] if n not in self.EMPTY_LOA] + _data["loas"] = [n for n in _data["loas"] if n not in self.EMPTY_LOA] return _data diff --git a/atst/models/task_order.py b/atst/models/task_order.py index c265cbe0..b09eca73 100644 --- a/atst/models/task_order.py +++ b/atst/models/task_order.py @@ -90,7 +90,7 @@ class TaskOrder(Base, mixins.TimestampsMixin): pdf_attachment_id = Column(ForeignKey("attachments.id")) _pdf = relationship("Attachment", foreign_keys=[pdf_attachment_id]) number = Column(String, unique=True) # Task Order Number - loa = Column(ARRAY(String)) # Line of Accounting (LOA) + loas = Column(ARRAY(String)) # Line of Accounting (LOA) custom_clauses = Column(String) # Custom Clauses signer_dod_id = Column(String) signed_at = Column(DateTime) diff --git a/js/components/forms/ko_review.js b/js/components/forms/ko_review.js index 5efdb3cf..3b86390e 100644 --- a/js/components/forms/ko_review.js +++ b/js/components/forms/ko_review.js @@ -26,7 +26,7 @@ export default { }, data: function() { - const loa_list = this.initialData['loa'] + const loa_list = this.initialData['loas'] const loas = (loa_list.length > 0 ? loa_list : ['']).map(createLOA) return { diff --git a/templates/portfolios/task_orders/review.html b/templates/portfolios/task_orders/review.html index 6336ade1..6f93c044 100644 --- a/templates/portfolios/task_orders/review.html +++ b/templates/portfolios/task_orders/review.html @@ -98,11 +98,11 @@