projects
/
working
/
Evergreen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
8f74b16
)
lp1709698_nullable_reporter_descriptions
user/rogan/lp1709698_template_description_should_be_nullable
author
Rogan Hamby
<rogan.hamby@gmail.com>
Wed, 7 Nov 2018 15:31:05 +0000
(10:31 -0500)
committer
Rogan Hamby
<rogan.hamby@gmail.com>
Wed, 7 Nov 2018 15:31:05 +0000
(10:31 -0500)
Open-ILS/src/sql/Pg/reporter-schema.sql
patch
|
blob
|
history
Open-ILS/src/sql/Pg/upgrade/xxxx.schema.reporter.template.sql
[new file with mode: 0644]
patch
|
blob
Open-ILS/src/templates/staff/reporter/t_edit_template.tt2
patch
|
blob
|
history
diff --git
a/Open-ILS/src/sql/Pg/reporter-schema.sql
b/Open-ILS/src/sql/Pg/reporter-schema.sql
index
ce302a6
..
116802f
100644
(file)
--- a/
Open-ILS/src/sql/Pg/reporter-schema.sql
+++ b/
Open-ILS/src/sql/Pg/reporter-schema.sql
@@
-66,7
+66,7
@@
CREATE TABLE reporter.template (
owner INT NOT NULL REFERENCES actor.usr (id) DEFERRABLE INITIALLY DEFERRED,
create_time TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW(),
name TEXT NOT NULL,
- description TEXT
NOT NULL
,
+ description TEXT,
data TEXT NOT NULL,
folder INT NOT NULL REFERENCES reporter.template_folder (id) DEFERRABLE INITIALLY DEFERRED
);
diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.reporter.template.sql
b/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.reporter.template.sql
new file mode 100644
(file)
index 0000000..
ff16f4c
--- /dev/null
+++ b/
Open-ILS/src/sql/Pg/upgrade/xxxx.schema.reporter.template.sql
@@ -0,0
+1,2
@@
+ALTER TABLE reporter.template ALTER COLUMN description DROP NOT NULL;
+
diff --git
a/Open-ILS/src/templates/staff/reporter/t_edit_template.tt2
b/Open-ILS/src/templates/staff/reporter/t_edit_template.tt2
index
fbb266d
..
135a5ba
100644
(file)
--- a/
Open-ILS/src/templates/staff/reporter/t_edit_template.tt2
+++ b/
Open-ILS/src/templates/staff/reporter/t_edit_template.tt2
@@
-21,7
+21,7
@@
[% l('Template Description') %]
</div>
<div class="col-md-10">
- <div><textarea class="form-control" ng-model="templateDescription"
required
/></div>
+ <div><textarea class="form-control" ng-model="templateDescription"/></div>
</div>
</div>