Merged in add-author-program-option (pull request auth0#23)

Add author program option

Author: David Lenton

js/clprogram.js

@@ -166,6 +166,10 @@ var programcourse = window.programcourse || [];
     if (document.getElementById('start_program')) {
       program.start_program = document.getElementById('start_program').value;
     }
+    if (document.getElementById('author')) {
+      program.author = document.getElementById('author').value;
+      if (program.author === '') program.author = null;
+    }
     if (document.getElementById('cost')) {
       program.cost = document.getElementById('cost').value;
       if (program.cost === '') program.cost = null;
@@ -264,6 +268,7 @@ var programcourse = window.programcourse || [];
     if (p.restrict_course_next)
       document.getElementById('options-next-course').checked = 'checked';
     if (p.cost) document.getElementById('cost').value = p.cost;
+    if (p.author) document.getElementById('author').value = p.author;
     if (p.terms) document.getElementById('cost-terms').checked = 'checked';
     if (p.status) {
       var subjectStatus = document.getElementById('status');

models/program.js

@@ -268,7 +268,7 @@ class Program {
     options.pageParam =
       typeof options.pageParam !== 'undefined' ? options.pageParam : '/';
     const params = [this.appId];
-    let query = 'SELECT module.id, image_url, name, description, count(module_subject.subject_id) as subject_count, owner, if (module_account.account_id is null, 0, 1) As added ';
+    let query = 'SELECT module.id, image_url, name, description, count(module_subject.subject_id) as subject_count, author, owner, if (module_account.account_id is null, 0, 1) As added ';
     // if (options.userId) {
     //   query += ', max(account_subject_statistics.last_accessed) as latest ';
     //   params.push(options.userId);
@@ -278,7 +278,7 @@ class Program {
     let orderBy = 'name DESC';
     if (options.searchText) {
       query =
-        'SELECT module.id,  image_url, name, description, count(module_subject.subject_id) as subject_count, owner, if (module_account.account_id is null, 0, 1) As added FROM module LEFT JOIN module_account ON module.id = module_account.module_id INNER JOIN sites ON module.client_id = sites.client_id LEFT JOIN module_subject ON module.id = module_subject.module_id LEFT JOIN settings ON module.id = settings.home_program_id  ';
+        'SELECT module.id,  image_url, name, description, count(module_subject.subject_id) as subject_count, author, owner, if (module_account.account_id is null, 0, 1) As added FROM module LEFT JOIN module_account ON module.id = module_account.module_id INNER JOIN sites ON module.client_id = sites.client_id LEFT JOIN module_subject ON module.id = module_subject.module_id LEFT JOIN settings ON module.id = settings.home_program_id  ';
       where = 'WHERE module.client_id = ? AND settings.id IS NULL AND name LIKE ? ';
       params.push('%' + options.searchText + '%');
     }
@@ -1335,6 +1335,8 @@ class Program {
           return done(err);
         // CHANGED THIS
         _this.owner = owner;
+        // Author supercedes owner
+        if (_this.author) _this.owner = _this.author;
         if (_this.originator_id) {
           subject.getOriginator(_this.originator_id, _this.appId, (err, user) => {
             if (err)
@@ -1532,6 +1534,7 @@ class Program {
       current_id: this.version_id,
       restrict_next: this.restrict_next,
       restrict_course_next: this.restrict_course_next,
+      author: this.author,
       cost: this.cost,
       terms: this.terms,
       last_saved: new Date(),

mysql/database.mwb

@@ -166,6 +166,10 @@ var programcourse = window.programcourse || [];
     if (document.getElementById('start_program')) {
       program.start_program = document.getElementById('start_program').value;
     }
+    if (document.getElementById('author')) {
+      program.author = document.getElementById('author').value;
+      if (program.author === '') program.author = null;
+    }
     if (document.getElementById('cost')) {
       program.cost = document.getElementById('cost').value;
       if (program.cost === '') program.cost = null;
@@ -264,6 +268,7 @@ var programcourse = window.programcourse || [];
     if (p.restrict_course_next)
       document.getElementById('options-next-course').checked = 'checked';
     if (p.cost) document.getElementById('cost').value = p.cost;
+    if (p.author) document.getElementById('author').value = p.author;
     if (p.terms) document.getElementById('cost-terms').checked = 'checked';
     if (p.status) {
       var subjectStatus = document.getElementById('status');

public/js/clprogram.js

@@ -28,6 +28,8 @@ function processForDisplay(p) {
     p.image.title = p.name;
   }
   p.published = p.published_date;
+  // Author supercedes owner
+  if (p.author) p.owner = p.author;
   return p;
 }
 
@@ -45,7 +47,8 @@ function setProgramProperties(prog, body) {
   prog.status = body.status;
   prog.restrict_next = body.restrict_next;
   prog.restrict_course_next = body.restrict_course_next;
-  prog.cost = body.cost;
+  prog.author = body.author;
+  prog.cost = body.cost || null;
   prog.terms = body.terms;
   prog.list = body.list;
   return prog;

routes/api/program.js

@@ -566,6 +566,7 @@ form {
   .complete,
   .next,
   .after,
+  .author,
   .publishing,
   .sponsorship,
   .locales,
@@ -758,6 +759,16 @@ form {
       min-height: 2em;
     }
   }
+  .author {
+    // span.authorname {
+    //   float: left;
+    //   text-align: left;
+    //   position: relative;
+    // }
+    input[type='text'] {
+      width: 15em;
+    }
+  }
   .cost {
     span.amount {
       float: left;

src/scss/editor.scss

@@ -104,7 +104,15 @@ block content
                 p.terms
                   input(type='checkbox', name='cost-terms', id='cost-terms')
                   label.full.checkbox(for='cost-terms') I understand and agree that all payments are in Canadian dollars and that any payment will be a subject to a 15% administration fee and that all payments are subject to the terms set out in the agreement with Consolidated Learning Inc, and confirm that I am authorised to enter into this agreement.
-
+          .author
+            h2 Author
+            .help
+              p You can specify an author if you want to override the default for this site
+            div
+              p
+                label.full Author
+                span.authorname
+                  input(id='author', name='author', type='text', maxlength='255')
           .publishing
             h2 Publish
             #info Saved