[open-ils-commits] [GIT] Evergreen ILS branch master updated. c20bfea3494cd8a5930f7be1bb5e1bb0b85fd180

[Evergreen Git]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".

The branch, master has been updated
       via  c20bfea3494cd8a5930f7be1bb5e1bb0b85fd180 (commit)
       via  57f2d3c5cd2fdba10d407054f06aa7514420142e (commit)
      from  5461c9bd045a29b25aa20391b1d5a56fa1bba582 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit c20bfea3494cd8a5930f7be1bb5e1bb0b85fd180
Author: Chris Sharp <csharp at georgialibraries.org>
Date:   Fri Mar 8 13:34:53 2019 -0500

    LP#1709698 - stamping upgrade script
    
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 5d4b323a0d..cc481e9fdc 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1155', :eg_version); -- berick/rogan
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1156', :eg_version); -- rogan/jvwoolf/csharp
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1156.schema.reporter.template.sql b/Open-ILS/src/sql/Pg/upgrade/1156.schema.reporter.template.sql
new file mode 100644
index 0000000000..7099f60e83
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1156.schema.reporter.template.sql
@@ -0,0 +1,7 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1155', :eg_version);
+
+ALTER TABLE reporter.template ALTER COLUMN description SET DEFAULT '';
+
+COMMIT;
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
deleted file mode 100644
index 819b562184..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.schema.reporter.template.sql
+++ /dev/null
@@ -1,2 +0,0 @@
-ALTER TABLE reporter.template ALTER COLUMN description SET DEFAULT '';
-

commit 57f2d3c5cd2fdba10d407054f06aa7514420142e
Author: Rogan Hamby <rogan.hamby at gmail.com>
Date:   Fri Nov 30 14:34:04 2018 -0500

    LP#1709698: no longer require descriptions in report templates
    
    Signed-off-by: Rogan Hamby <rogan.hamby at gmail.com>
    Signed-off-by: Jessica Woolford <jwoolford at biblio.org>
    Signed-off-by: Chris Sharp <csharp at georgialibraries.org>

diff --git a/Open-ILS/src/sql/Pg/reporter-schema.sql b/Open-ILS/src/sql/Pg/reporter-schema.sql
index 8d0897d817..52f2f398d9 100644
--- 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				NOT NULL DEFAULT '',
 	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
index 0000000000..819b562184
--- /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 SET DEFAULT '';
+
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 fbb266d3a0..cab7bd06bb 100644
--- 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>
 

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql                     | 2 +-
 Open-ILS/src/sql/Pg/reporter-schema.sql                       | 2 +-
 Open-ILS/src/sql/Pg/upgrade/1156.schema.reporter.template.sql | 7 +++++++
 Open-ILS/src/templates/staff/reporter/t_edit_template.tt2     | 2 +-
 4 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/1156.schema.reporter.template.sql


hooks/post-receive
-- 
Evergreen ILS