From 0c65b2c038a309a867ef9e25108e905e127a4be3 Mon Sep 17 00:00:00 2001 From: Ryon Coleman Date: Wed, 10 Mar 2021 04:47:48 +0000 Subject: [PATCH 01/34] feat: improve course section sidebar styling and add tag browser mockup --- html-templates/sections/courseSection.tpl | 188 +++++++++++++----- site-root/sass/slate/_common.scss | 72 ++++++- site-root/sass/slate/_modules.scss | 3 +- .../sass/slate/modules/_key-value-list.scss | 13 +- site-root/sass/slate/modules/_people.scss | 40 ++-- site-root/sass/slate/modules/_tag-list.scss | 30 +++ 6 files changed, 267 insertions(+), 79 deletions(-) create mode 100644 site-root/sass/slate/modules/_tag-list.scss diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index e024da833..637afd8c0 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -95,38 +95,45 @@
-
-

{$Section->Code|escape}

- - {if $Section->Course->Description} -
{$Section->Course->Description|escape|markdown}
- {/if} - -
-
-
Term
-
{$Section->Term->Title}
-
- - {if $.User} -
-
Schedule
-
{$Section->Schedule->Title}
-
-
-
Location
-
{$Section->Location->Title}
+
+
+

+
+
+ {$Section->Code|escape} +

+ + {if $Section->Course->Description} +
{$Section->Course->Description|escape|markdown}
{/if} - {if $Section->Notes} +
-
Notes
-
{$Section->Notes|escape|markdown}
+
Term
+
{$Section->Term->Title}
- {/if} -
-
+ + {if $.User} +
+
Schedule
+
{$Section->Schedule->Title}
+
+
+
Location
+
{$Section->Location->Title}
+
+ {/if} + + {if $Section->Notes} +
+
Notes
+
{$Section->Notes|escape|markdown}
+
+ {/if} +
+
+
{template linksEntry entry} {if $entry.href}{/if} @@ -135,9 +142,22 @@ {/template} {foreach item=linkGroup from=Slate\UI\SectionProfile::getLinks($Section)} + {* spaces in key names here are parsed wrong *} + {$linksIcons = array( + 'CourseTools' => 'wrench', + 'OtherWebsites' => 'external-link', + )} + {$labelNoSpaces = str_replace(' ', '', $linkGroup.label)} +
-

{linksEntry $linkGroup}

+

+
+ +
+ + {linksEntry $linkGroup} +

{foreach item=link from=$linkGroup.children} @@ -157,27 +177,103 @@
{/foreach} -

Teacher{tif count($Section->ActiveTeachers) != 1 ? s}

-
    - {foreach item=Teacher from=$Section->ActiveTeachers} -
  • {personLink $Teacher photo=true}
    • - {foreachelse} -

    No instructors currently listed.

    - {/foreach} -
+
+
+

+ + + + Tags +

+ + {$tags = array( + "lorem ipsum", + "dolor sit amet", + "consectetur", + "adipiscing", + "elit borbi consequat", + "turpis", + "feugiat", + "foo", + "bar", + "baz", + "qux" + );} + + {* if there's 10 or more, show the first five and collapse the rest *} + {if count($tags) >= 10} + {$tagsShown = array_slice($tags, 0, 5)} + {$tagsHidden = array_slice($tags, 5)} + {else} + {* less than 10, just show them all *} + {$tagsShown = $tags} + {/if} + + + + {if $tagsHidden} +
+ + See all + See less + + + +
+ {/if} +
+
+ +
+
+

+ + + + Teacher{tif count($Section->ActiveTeachers) != 1 ? s} +

+
    + {foreach item=Teacher from=$Section->ActiveTeachers} +
  • {personLink $Teacher photo=true}
    • + {foreachelse} +

    No instructors currently listed.

    + {/foreach} +
+
+
{if $.User} -

Students

-
    - {foreach item=Student from=$Section->ActiveStudents} -
  • {personLink $Student photo=true}
    • - {foreachelse} -

    No students currently listed.

    - {/foreach} -
+
+
+

+ + + + Students +

+
    + {foreach item=Student from=$Section->ActiveStudents} +
  • {personLink $Student photo=true}
    • + {foreachelse} +

    No students currently listed.

    + {/foreach} +
+
+
{/if} -
-{/block} \ No newline at end of file +{/block} diff --git a/site-root/sass/slate/_common.scss b/site-root/sass/slate/_common.scss index 2324fc178..a60173a13 100644 --- a/site-root/sass/slate/_common.scss +++ b/site-root/sass/slate/_common.scss @@ -45,13 +45,33 @@ body { } } -.text-left { text-align: left !important; } -.text-right { text-align: right !important; } -.text-center { text-align: center !important; } -.text-justify { text-align: justify !important; } -.text-nowrap { white-space: nowrap !important; } -.text-nolead { margin-top: 0 !important; } -.text-notrail { margin-bottom: 0 !important; } +.text-left { + text-align: left !important; +} + +.text-right { + text-align: right !important; +} + +.text-center { + text-align: center !important; +} + +.text-justify { + text-align: justify !important; +} + +.text-nowrap { + white-space: nowrap !important; +} + +.text-nolead { + margin-top: 0 !important; +} + +.text-notrail { + margin-bottom: 0 !important; +} .sidebar-item { margin: 1em 0 3em; @@ -59,6 +79,40 @@ body { .empty-text { margin: .5em 0; } + + .sidebar-collapsible-toggle { + background-color: rgba($text-color, .05); + border-radius: .25em; + cursor: pointer; + font-size: .75em; + margin-top: 1em; + padding: .25em; + text-align: center; + text-transform: uppercase; + + &:hover, + &:focus { + background-color: rgba($text-color, .1); + } + } + + .collapsible-collapse-text { + display: none; + } + + .sidebar-collapsible[open] { + >.sidebar-collapsible-toggle { + margin-bottom: 1em; + } + + .collapsible-expand-text { + display: none; + } + + .collapsible-collapse-text { + display: unset; + } + } } .sidebar-item-title { @@ -94,7 +148,7 @@ body { width: 250px; } - > .inner { + >.inner { background-position: center; background-repeat: no-repeat; background-size: cover; @@ -111,4 +165,4 @@ body { margin: 1em 0 0; } } -} \ No newline at end of file +} diff --git a/site-root/sass/slate/_modules.scss b/site-root/sass/slate/_modules.scss index e243bb362..f0956ea03 100644 --- a/site-root/sass/slate/_modules.scss +++ b/site-root/sass/slate/_modules.scss @@ -15,5 +15,6 @@ @import 'modules/slate-menu'; @import 'modules/source-grid'; @import 'modules/splitview'; +@import 'modules/tag-list'; @import 'modules/todo'; -@import 'modules/wizards'; \ No newline at end of file +@import 'modules/wizards'; diff --git a/site-root/sass/slate/modules/_key-value-list.scss b/site-root/sass/slate/modules/_key-value-list.scss index 7391c7371..cf6b8d626 100644 --- a/site-root/sass/slate/modules/_key-value-list.scss +++ b/site-root/sass/slate/modules/_key-value-list.scss @@ -13,6 +13,7 @@ .kv-key, .kv-value { margin: 0; + padding: 0; } .kv-key { @@ -34,12 +35,16 @@ .kv-pair { display: table-row; } - + .kv-key, - .kv-value { + .kv-value, + > .kv-key, + > .kv-value { display: table-cell; + padding-bottom: 0; + padding-top: 0; } - + .kv-key { padding-right: 1em; } @@ -51,4 +56,4 @@ .kv-key { text-align: right; } -} \ No newline at end of file +} diff --git a/site-root/sass/slate/modules/_people.scss b/site-root/sass/slate/modules/_people.scss index c6e271f8b..a9937d3a0 100644 --- a/site-root/sass/slate/modules/_people.scss +++ b/site-root/sass/slate/modules/_people.scss @@ -2,40 +2,42 @@ @include background-size(cover); } -$roster-avatar-size: 64px; -$roster-item-width: $roster-avatar-size * 1.3125; -$roster-font-size: $font-size * .6875; -$roster-line-height: $line-height * .8; - .roster { + display: grid; + grid-gap: 1em .5em; + grid-template-columns: repeat(3, 1fr); margin: 0; padding: 0; - + li { - display: inline-block; - font-size: $roster-font-size; - height: $roster-avatar-size + (($roster-line-height * $roster-font-size) * 2.5); - line-height: $roster-line-height; + font-size: .75em; + line-height: 1.25; list-style: none; - margin-bottom: .75em; - overflow: hidden; + min-width: 0; text-align: center; - vertical-align: text-bottom; - width: $roster-item-width; } - + a { + display: block; text-decoration: none; - + &:hover, &:focus { text-decoration: underline; } } - + .avatar { + border-radius: 100%; + box-shadow: 0 1px 2px rgba(0,0,0,.1); margin: 0 auto .25em; } + + .name { + display: block; + overflow: hidden; + text-overflow: ellipsis; + } } .about-bio { @@ -43,7 +45,7 @@ $roster-line-height: $line-height * .8; color: inherit; font-size: 1em; } - + .well-title { color: $heading-color; font-size: 1.2em; @@ -58,4 +60,4 @@ $roster-line-height: $line-height * .8; text-overflow: ellipsis; white-space: nowrap; } -} \ No newline at end of file +} diff --git a/site-root/sass/slate/modules/_tag-list.scss b/site-root/sass/slate/modules/_tag-list.scss new file mode 100644 index 000000000..ba0dad9aa --- /dev/null +++ b/site-root/sass/slate/modules/_tag-list.scss @@ -0,0 +1,30 @@ +.tag-list { + list-style: none; + margin: 0; + padding: 0; + + >li { + display: inline-block; + } + + .tag { + background-color: rgba($link-color, .05); + border-radius: .25em; + display: block; + font-size: .875em; + margin-bottom: .25em; + padding: 0 .5em; + text-decoration: none; + + &:hover, + &:focus { + background-color: rgba($link-color, .1); + } + } + + .tag-count { + color: rgba($text-color, .4); + font-size: .75em; + font-weight: bold; + } +} From 56a2ecbbd90f0b7612cbd39860d71779daaa09d0 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 14 Dec 2021 12:45:54 -0500 Subject: [PATCH 02/34] feat: update Section obj to provide posts and tags --- php-classes/Slate/Courses/Section.php | 32 ++++++++++++++++++++++++++- 1 file changed, 31 insertions(+), 1 deletion(-) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index a6c3b60cf..68a642b40 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -186,7 +186,13 @@ class Section extends \VersionedRecord ,'class' => Mapping::class ,'contextClass' => __CLASS__ ] - ]; + ,'BlogPosts' => [ + 'type' => 'one-many' + ,'class' => BlogPost::class + ,'contextClass' => __CLASS__ + ,'foreign' => 'ContextID' + ] + ]; public static $validators = [ 'Course' => [ @@ -204,6 +210,10 @@ class Section extends \VersionedRecord ,'StudentsCount' => [ 'method' => 'getStudentsCount' ] + ,'BlogPosts' + ,'Tags' => [ + 'method' => 'getTags' + ] ]; public static $sorters = [ @@ -411,6 +421,26 @@ public function getCohorts() } } + public function getTags() + { + $posts = $this->BlogPosts; + $tags = []; + $result = []; + + foreach ($posts as $post) { + $tags = array_merge($tags, $post->Tags); + } + + $result = array_reduce($tags, function($result, $tag) + { + $count = $result[$tag->Handle] != NULL ? $result[$tag->Handle]['count'] : 0; + $result[$tag->Handle] = array_merge($tag->getData(), ['count' => count]); + return $result; + }); + + return $result; + } + // search SQL generators protected static function getTeacherSearchSql($term, $condition) { From 2052d15e3f002733690f49f75f651e0992f4bdaf Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 14 Dec 2021 12:49:27 -0500 Subject: [PATCH 03/34] fix: add BlogPost class to imports --- php-classes/Slate/Courses/Section.php | 1 + 1 file changed, 1 insertion(+) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index 68a642b40..9de73610d 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -12,6 +12,7 @@ use Emergence\People\User; use Emergence\Locations\Location; use Emergence\Connectors\Mapping; +use Emergence\CMS\BlogPost; use Slate\Term; use Slate\Courses\SectionParticipant; From 06fea31a5610ed7aca19bc5d942b1a3da25f9925 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 14 Dec 2021 13:44:11 -0500 Subject: [PATCH 04/34] fix: correct tag counting --- php-classes/Slate/Courses/Section.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index 9de73610d..a2fae7380 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -435,7 +435,7 @@ public function getTags() $result = array_reduce($tags, function($result, $tag) { $count = $result[$tag->Handle] != NULL ? $result[$tag->Handle]['count'] : 0; - $result[$tag->Handle] = array_merge($tag->getData(), ['count' => count]); + $result[$tag->Handle] = array_merge($tag->getData(), ['count' => $count+1]); return $result; }); From 7b33300482f414b959be3bd47cd92053dfdb26ff Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 14 Dec 2021 15:38:40 -0500 Subject: [PATCH 05/34] feat: implement tag links in section template --- html-templates/sections/courseSection.tpl | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 637afd8c0..b0632b5ac 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -186,19 +186,7 @@ Tags - {$tags = array( - "lorem ipsum", - "dolor sit amet", - "consectetur", - "adipiscing", - "elit borbi consequat", - "turpis", - "feugiat", - "foo", - "bar", - "baz", - "qux" - );} + {$tags = $Section->getTags()} {* if there's 10 or more, show the first five and collapse the rest *} {if count($tags) >= 10} @@ -212,7 +200,7 @@ @@ -227,7 +215,7 @@ From a4b4c4f41c9b8ff0224714d505912d9b1d9cbf51 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 14 Dec 2021 17:32:05 -0500 Subject: [PATCH 06/34] fix: improve function name --- html-templates/sections/courseSection.tpl | 2 +- php-classes/Slate/Courses/Section.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index b0632b5ac..a73c72862 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -186,7 +186,7 @@ Tags - {$tags = $Section->getTags()} + {$tags = $Section->findBlogTags()} {* if there's 10 or more, show the first five and collapse the rest *} {if count($tags) >= 10} diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index a2fae7380..5074192e8 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -422,7 +422,7 @@ public function getCohorts() } } - public function getTags() + public function findBlogTags() { $posts = $this->BlogPosts; $tags = []; From 9071a2fb1897915bbaa33632c2c828ee5a894d0c Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 14 Dec 2021 17:37:55 -0500 Subject: [PATCH 07/34] feat: move code from template to Class function --- html-templates/sections/courseSection.tpl | 20 ++++---------------- php-classes/Slate/Courses/Section.php | 19 +++++++++++++++++++ 2 files changed, 23 insertions(+), 16 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index a73c72862..848fee2ef 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -39,22 +39,10 @@ 'conditions' => [] ]; - $sectionTeacherIds = array_map(function($Teacher) { - return $Teacher->ID; - }, $this->scope['Section']->ActiveTeachers); - - $latestTeacherPost = \Emergence\CMS\BlogPost::getAllPublishedByContextObject($this->scope['Section'], array_merge_recursive($options, [ - 'conditions' => [ - 'AuthorID' => [ - 'operator' => 'IN', - 'values' => $sectionTeacherIds - ] - ], - 'limit' => 1 - ])); - - if (count($latestTeacherPost)) { - $this->scope['latestTeacherPost'] = $latestTeacherPost[0]; + $latestTeacherPost = $this->scope['Section']->findLatestTeacherPost(); + + if ($latestTeacherPost) { + $this->scope['latestTeacherPost'] = $latestTeacherPost; $options['conditions'][] = sprintf('ID != %u', $this->scope['latestTeacherPost']->ID); } diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index 5074192e8..b4acd9f40 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -442,6 +442,25 @@ public function findBlogTags() return $result; } + public function findLatestTeacherPost() + { + $sectionTeacherIds = array_map(function($Teacher) { + return $Teacher->ID; + }, $this->ActiveTeachers); + + $latestTeacherPost = \Emergence\CMS\BlogPost::getAllPublishedByContextObject($this, array_merge_recursive([ + 'conditions' => [ + 'AuthorID' => [ + 'operator' => 'IN', + 'values' => $sectionTeacherIds + ] + ], + 'limit' => 1 + ])); + + return $latestTeacherPost[0]; + } + // search SQL generators protected static function getTeacherSearchSql($term, $condition) { From 952da6fc024cb85200b60308196d153018413c8c Mon Sep 17 00:00:00 2001 From: BillClinton Date: Thu, 23 Dec 2021 13:19:07 -0500 Subject: [PATCH 08/34] feat: update count variable to reflect new name --- html-templates/sections/courseSection.tpl | 36 ++++++++++++++++------- 1 file changed, 26 insertions(+), 10 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 848fee2ef..6a9e9bf29 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -32,29 +32,45 @@ scope['limit'] = 10; - $options = [ - 'limit' => $this->scope['limit'], - 'offset' => $_GET['offset'] ?: 0, - 'calcFoundRows' => 'yes', - 'conditions' => [] - ]; + $conditions = []; $latestTeacherPost = $this->scope['Section']->findLatestTeacherPost(); if ($latestTeacherPost) { $this->scope['latestTeacherPost'] = $latestTeacherPost; - $options['conditions'][] = sprintf('ID != %u', $this->scope['latestTeacherPost']->ID); + $conditions[] = sprintf('ID != %u', $this->scope['latestTeacherPost']->ID); } - $this->scope['blogPosts'] = \Emergence\CMS\BlogPost::getAllPublishedByContextObject($this->scope['Section'], $options); + $this->scope['blogPosts'] = $this->scope['Section']->findBlogPosts($conditions, $this->scope['limit'], $_GET['offset'] ?: 0 ); $this->scope['total'] = DB::foundRows(); + + {* if (!empty($_GET['blog_tag'])) { + $Tag = Tag::getByHandle($_GET['blog_tag']); + + if (!$Tag) { + throw new Exception('tag not found'); + } + + $this->scope['blogTag'] = $Tag; + } else { + $Tag = null; + } *} + ?>
-

{$Section->getTitle()|escape} Public Feed

+

+ {$Section->getTitle()|escape} + + Public Feed + {if $blogTag} + for tag {$blogTag->getTitle()|escape} + {/if} + +

Create a Post
@@ -188,7 +204,7 @@ From 27062fd61bc042dd04bbd8628b3c5a6caac4a10a Mon Sep 17 00:00:00 2001 From: BillClinton Date: Thu, 23 Dec 2021 13:23:52 -0500 Subject: [PATCH 09/34] feat: update func to use TagItem::getTagsSummary --- php-classes/Slate/Courses/Section.php | 36 +++++++++++++++------------ 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index b4acd9f40..a47f6d2b0 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -6,6 +6,7 @@ use HandleBehavior; use DuplicateKeyException; use TableNotFoundException; +use TagItem; use Emergence\People\IPerson; use Emergence\People\Person; @@ -424,22 +425,25 @@ public function getCohorts() public function findBlogTags() { - $posts = $this->BlogPosts; - $tags = []; - $result = []; - - foreach ($posts as $post) { - $tags = array_merge($tags, $post->Tags); - } - - $result = array_reduce($tags, function($result, $tag) - { - $count = $result[$tag->Handle] != NULL ? $result[$tag->Handle]['count'] : 0; - $result[$tag->Handle] = array_merge($tag->getData(), ['count' => $count+1]); - return $result; - }); - - return $result; + return TagItem::getTagsSummary([ + 'Class' => BlogPost::class, + 'classConditions' => [ + 'ContextClass' => static::getStaticRootClass(), + 'ContextID' => $this->ID + ] + ]); + } + + public function findBlogPosts($conditions, $limit, $offset) + { + $options = [ + 'limit' => $limit, + 'offset' => $offset, + 'calcFoundRows' => 'yes', + 'conditions' => $conditions + ]; + + return BlogPost::getAllPublishedByContextObject($this, $options); } public function findLatestTeacherPost() From 3e5734a19616cbe4725b7e8ac4005557a8b8c16f Mon Sep 17 00:00:00 2001 From: BillClinton Date: Sat, 25 Dec 2021 18:56:59 -0500 Subject: [PATCH 10/34] feat: add browsing section blog posts by tag --- html-templates/sections/courseSection.tpl | 26 ++++++++++++----------- php-classes/Slate/Courses/Section.php | 26 +++++++++++++++++++---- 2 files changed, 36 insertions(+), 16 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 6a9e9bf29..be346679e 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -41,20 +41,22 @@ $conditions[] = sprintf('ID != %u', $this->scope['latestTeacherPost']->ID); } - $this->scope['blogPosts'] = $this->scope['Section']->findBlogPosts($conditions, $this->scope['limit'], $_GET['offset'] ?: 0 ); - $this->scope['total'] = DB::foundRows(); - - {* if (!empty($_GET['blog_tag'])) { - $Tag = Tag::getByHandle($_GET['blog_tag']); + if (!empty($_GET['blog_tag'])) { + $Tag = Tag::getByHandle($_GET['blog_tag']); + + if (!$Tag) { + throw new Exception('tag not found'); + } + //$conditions[] = sprintf("blogTag", $Tag->ID); + $this->scope['blogTag'] = $Tag; + } else { + $Tag = null; + } - if (!$Tag) { - throw new Exception('tag not found'); - } + //xdebug_break(); - $this->scope['blogTag'] = $Tag; - } else { - $Tag = null; - } *} + $this->scope['blogPosts'] = $this->scope['Section']->findBlogPosts($conditions, $this->scope['limit'], $_GET['offset'] ?: 0, $Tag ); + $this->scope['total'] = DB::foundRows(); ?> diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index a47f6d2b0..ff8f1d345 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -212,10 +212,10 @@ class Section extends \VersionedRecord ,'StudentsCount' => [ 'method' => 'getStudentsCount' ] - ,'BlogPosts' + // TODO: remove this, only for testing ,'Tags' => [ - 'method' => 'getTags' - ] + 'method' => 'findBlogTags' + ] ]; public static $sorters = [ @@ -434,7 +434,7 @@ public function findBlogTags() ]); } - public function findBlogPosts($conditions, $limit, $offset) + public function findBlogPosts($conditions, $limit, $offset, $tag) { $options = [ 'limit' => $limit, @@ -443,6 +443,24 @@ public function findBlogPosts($conditions, $limit, $offset) 'conditions' => $conditions ]; + if ($tag!=null) { + + $tagIDsQuery = 'SELECT ContextID FROM `tag_items` WHERE (`ContextClass` = "%s") AND (`TagID` = %u)'; + $tagIDsConditions = [ + 'ContextClass' => DB::escape(BlogPost::getStaticRootClass()), + 'TagID' => $tag->ID + ]; + + $options = array_merge_recursive($options, [ + 'conditions' => [ + 'ID' => [ + 'operator' => 'IN', + 'values' => \DB::allValues('ContextID', $tagIDsQuery, $tagIDsConditions) + ] + ] + ]); + } + return BlogPost::getAllPublishedByContextObject($this, $options); } From d2ecfce2561b1ab926bffee1c921504a5a192371 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Sat, 25 Dec 2021 22:06:43 -0500 Subject: [PATCH 11/34] feat: add fixture data to test tag browsing --- fixtures/content.sql | 40 ++++++++++++++++++++++++++++++++++++++ fixtures/content_items.sql | 34 ++++++++++++++++++++++++++++++++ fixtures/tag_items.sql | 28 ++++++++++++++++++++++++++ fixtures/tags.sql | 16 +++++++++++++++ 4 files changed, 118 insertions(+) create mode 100644 fixtures/content.sql create mode 100644 fixtures/content_items.sql create mode 100644 fixtures/tag_items.sql create mode 100644 fixtures/tags.sql diff --git a/fixtures/content.sql b/fixtures/content.sql new file mode 100644 index 000000000..55ddf3c47 --- /dev/null +++ b/fixtures/content.sql @@ -0,0 +1,40 @@ +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `content` ( + `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `Class` enum('Emergence\\CMS\\Page','Emergence\\CMS\\BlogPost') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Modified` timestamp NULL DEFAULT NULL, + `ModifierID` int(10) unsigned DEFAULT NULL, + `ContextClass` varchar(255) DEFAULT NULL, + `ContextID` int(10) unsigned DEFAULT NULL, + `Title` varchar(255) NOT NULL, + `Handle` varchar(255) NOT NULL, + `AuthorID` int(10) unsigned NOT NULL, + `Status` enum('Draft','Published','Hidden','Deleted') NOT NULL DEFAULT 'Published', + `Published` timestamp NULL DEFAULT NULL, + `Visibility` enum('Public','Private') NOT NULL DEFAULT 'Public', + `Summary` text, + `LayoutClass` enum('OneColumn') DEFAULT 'OneColumn', + `LayoutConfig` json DEFAULT NULL, + PRIMARY KEY (`ID`), + UNIQUE KEY `Handle` (`Handle`), + KEY `Published` (`Published`), + KEY `CONTEXT` (`ContextClass`,`ContextID`) +) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; +INSERT INTO `content` VALUES (1,'Emergence\\CMS\\BlogPost','2021-12-26 02:44:15',3,'2021-12-26 02:44:39',3,'Slate\\Courses\\Section',2,'1st post from teacher','st_post_from_teacher',3,'Published','2021-12-26 02:44:00','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (2,'Emergence\\CMS\\BlogPost','2021-12-26 02:46:48',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student',4,'Published','2021-12-26 02:46:48','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (3,'Emergence\\CMS\\BlogPost','2021-12-26 02:47:16',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student-2',4,'Published','2021-12-26 02:47:17','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (4,'Emergence\\CMS\\BlogPost','2021-12-26 02:51:07',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2',6,'Published','2021-12-26 02:51:08','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (5,'Emergence\\CMS\\BlogPost','2021-12-26 02:51:52',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-2',6,'Published','2021-12-26 02:51:52','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (6,'Emergence\\CMS\\BlogPost','2021-12-26 02:52:13',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-3',6,'Published','2021-12-26 02:52:13','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (7,'Emergence\\CMS\\BlogPost','2021-12-26 02:53:36',4,'2021-12-26 02:53:45',4,'Slate\\Courses\\Section',2,'Post from student','post_from_student-3',4,'Published','2021-12-26 02:53:00','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (8,'Emergence\\CMS\\BlogPost','2021-12-26 02:54:13',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student-4',4,'Published','2021-12-26 02:54:13','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (9,'Emergence\\CMS\\BlogPost','2021-12-26 02:54:33',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student-5',4,'Published','2021-12-26 02:54:33','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (10,'Emergence\\CMS\\BlogPost','2021-12-26 02:55:49',3,'2021-12-26 02:56:51',3,'Slate\\Courses\\Section',2,'This is the 2nd post from teacher','this_is_the_2nd_post_from_teacher',3,'Published','2021-12-26 02:55:00','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (11,'Emergence\\CMS\\BlogPost','2021-12-26 02:56:24',3,'2021-12-26 02:57:01',3,'Slate\\Courses\\Section',2,'This is the 3rd post from teacher','this_is_the_3rd_post_from_teacher',3,'Published','2021-12-26 02:56:00','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (12,'Emergence\\CMS\\BlogPost','2021-12-26 02:57:56',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-4',6,'Published','2021-12-26 02:57:57','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (13,'Emergence\\CMS\\BlogPost','2021-12-26 02:58:20',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-5',6,'Published','2021-12-26 02:58:20','Public',NULL,'OneColumn',NULL); +INSERT INTO `content` VALUES (14,'Emergence\\CMS\\BlogPost','2021-12-26 02:58:47',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-6',6,'Published','2021-12-26 02:58:48','Public',NULL,'OneColumn',NULL); diff --git a/fixtures/content_items.sql b/fixtures/content_items.sql new file mode 100644 index 000000000..b5513d83f --- /dev/null +++ b/fixtures/content_items.sql @@ -0,0 +1,34 @@ +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `content_items` ( + `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `Class` enum('Emergence\\CMS\\Item\\Album','Emergence\\CMS\\Item\\Embed','Emergence\\CMS\\Item\\Media','Emergence\\CMS\\Item\\RichText','Emergence\\CMS\\Item\\Text','Emergence\\CMS\\Item\\Markdown') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Modified` timestamp NULL DEFAULT NULL, + `ModifierID` int(10) unsigned DEFAULT NULL, + `Title` varchar(255) DEFAULT NULL, + `ContentID` int(10) unsigned NOT NULL, + `AuthorID` int(10) unsigned NOT NULL, + `Status` enum('Draft','Published','Hidden','Deleted') NOT NULL DEFAULT 'Published', + `Order` int(10) unsigned DEFAULT NULL, + `Data` json NOT NULL, + PRIMARY KEY (`ID`), + KEY `ContentID` (`ContentID`) +) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; +INSERT INTO `content_items` VALUES (1,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:44:15',3,'2021-12-26 02:44:39',3,NULL,1,3,'Deleted',1,'\"Here is some information about the course\\n - Lorem ipsum dolor sit amet\\n - consectetur adipiscing elit\"'); +INSERT INTO `content_items` VALUES (2,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:44:39',3,NULL,NULL,NULL,1,3,'Published',1,'\"Here is some information about the course\\n - Lorem ipsum dolor sit amet\\n - consectetur adipiscing elit\"'); +INSERT INTO `content_items` VALUES (3,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:46:48',4,NULL,NULL,NULL,2,4,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \"'); +INSERT INTO `content_items` VALUES (4,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:47:16',4,NULL,NULL,NULL,3,4,'Published',1,'\"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); +INSERT INTO `content_items` VALUES (5,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:51:07',6,NULL,NULL,NULL,4,6,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \"'); +INSERT INTO `content_items` VALUES (6,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:51:52',6,NULL,NULL,NULL,5,6,'Published',1,'\"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat.\"'); +INSERT INTO `content_items` VALUES (7,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:52:13',6,NULL,NULL,NULL,6,6,'Published',1,'\"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); +INSERT INTO `content_items` VALUES (8,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:53:36',4,NULL,NULL,NULL,7,4,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.\"'); +INSERT INTO `content_items` VALUES (9,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:54:13',4,NULL,NULL,NULL,8,4,'Published',1,'\"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\"'); +INSERT INTO `content_items` VALUES (10,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:54:33',4,NULL,NULL,NULL,9,4,'Published',1,'\"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); +INSERT INTO `content_items` VALUES (11,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:55:49',3,NULL,NULL,NULL,10,3,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. \"'); +INSERT INTO `content_items` VALUES (12,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:56:24',3,NULL,NULL,NULL,11,3,'Published',1,'\"Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); +INSERT INTO `content_items` VALUES (13,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:57:56',6,NULL,NULL,NULL,12,6,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \"'); +INSERT INTO `content_items` VALUES (14,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:58:20',6,NULL,NULL,NULL,13,6,'Published',1,'\"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\"'); +INSERT INTO `content_items` VALUES (15,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:58:47',6,NULL,NULL,NULL,14,6,'Published',1,'\"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); diff --git a/fixtures/tag_items.sql b/fixtures/tag_items.sql new file mode 100644 index 000000000..85c5bdd31 --- /dev/null +++ b/fixtures/tag_items.sql @@ -0,0 +1,28 @@ +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `tag_items` ( + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `ContextClass` varchar(255) DEFAULT NULL, + `ContextID` int(11) DEFAULT NULL, + `TagID` int(11) NOT NULL, + UNIQUE KEY `TagItem` (`TagID`,`ContextClass`,`ContextID`), + KEY `CONTEXT` (`ContextClass`,`ContextID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; +INSERT INTO `tag_items` VALUES ('2021-12-26 02:44:16',3,'Emergence\\CMS\\AbstractContent',1,1); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:56:51',3,'Emergence\\CMS\\AbstractContent',10,1); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:57:01',3,'Emergence\\CMS\\AbstractContent',11,1); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:46:48',4,'Emergence\\CMS\\AbstractContent',2,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:47:16',4,'Emergence\\CMS\\AbstractContent',3,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:51:07',6,'Emergence\\CMS\\AbstractContent',4,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:51:52',6,'Emergence\\CMS\\AbstractContent',5,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:52:13',6,'Emergence\\CMS\\AbstractContent',6,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:53:45',4,'Emergence\\CMS\\AbstractContent',7,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:54:13',4,'Emergence\\CMS\\AbstractContent',8,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:54:33',4,'Emergence\\CMS\\AbstractContent',9,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:56:51',3,'Emergence\\CMS\\AbstractContent',10,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:57:01',3,'Emergence\\CMS\\AbstractContent',11,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:57:56',6,'Emergence\\CMS\\AbstractContent',12,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:58:20',6,'Emergence\\CMS\\AbstractContent',13,2); +INSERT INTO `tag_items` VALUES ('2021-12-26 02:58:47',6,'Emergence\\CMS\\AbstractContent',14,2); diff --git a/fixtures/tags.sql b/fixtures/tags.sql new file mode 100644 index 000000000..8c6ee95c9 --- /dev/null +++ b/fixtures/tags.sql @@ -0,0 +1,16 @@ +/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40101 SET character_set_client = utf8 */; +CREATE TABLE `tags` ( + `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `Class` enum('Tag') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Title` varchar(255) NOT NULL, + `Handle` varchar(255) NOT NULL, + `Description` varchar(255) DEFAULT NULL, + PRIMARY KEY (`ID`), + UNIQUE KEY `Handle` (`Handle`) +) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; +/*!40101 SET character_set_client = @saved_cs_client */; +INSERT INTO `tags` VALUES (1,'Tag','2021-12-26 02:44:16',3,'info','info',NULL); +INSERT INTO `tags` VALUES (2,'Tag','2021-12-26 02:46:48',4,'comment','comment',NULL); From 0d1e868d916832c78d9a66db8459826507f76e02 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Sat, 25 Dec 2021 22:13:30 -0500 Subject: [PATCH 12/34] feat: Don't pin teacher post when tag browsing --- html-templates/sections/courseSection.tpl | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index be346679e..9d6b73d28 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -34,26 +34,23 @@ $this->scope['limit'] = 10; $conditions = []; - $latestTeacherPost = $this->scope['Section']->findLatestTeacherPost(); - - if ($latestTeacherPost) { - $this->scope['latestTeacherPost'] = $latestTeacherPost; - $conditions[] = sprintf('ID != %u', $this->scope['latestTeacherPost']->ID); - } - if (!empty($_GET['blog_tag'])) { $Tag = Tag::getByHandle($_GET['blog_tag']); if (!$Tag) { throw new Exception('tag not found'); } - //$conditions[] = sprintf("blogTag", $Tag->ID); $this->scope['blogTag'] = $Tag; } else { $Tag = null; - } - //xdebug_break(); + $latestTeacherPost = $this->scope['Section']->findLatestTeacherPost(); + + if ($latestTeacherPost) { + $this->scope['latestTeacherPost'] = $latestTeacherPost; + $conditions[] = sprintf('ID != %u', $this->scope['latestTeacherPost']->ID); + } + } $this->scope['blogPosts'] = $this->scope['Section']->findBlogPosts($conditions, $this->scope['limit'], $_GET['offset'] ?: 0, $Tag ); $this->scope['total'] = DB::foundRows(); From 90986b8d71e163bb90ffa57896d0a261f60f5bed Mon Sep 17 00:00:00 2001 From: BillClinton Date: Sat, 25 Dec 2021 22:54:07 -0500 Subject: [PATCH 13/34] fix: remove test code --- php-classes/Slate/Courses/Section.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index ff8f1d345..2fae6c7cd 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -212,10 +212,6 @@ class Section extends \VersionedRecord ,'StudentsCount' => [ 'method' => 'getStudentsCount' ] - // TODO: remove this, only for testing - ,'Tags' => [ - 'method' => 'findBlogTags' - ] ]; public static $sorters = [ From a028952b40f2ad71eb4e57a8097bfe003061fbd9 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Sun, 26 Dec 2021 22:25:44 -0500 Subject: [PATCH 14/34] fix: clean up fixture files --- fixtures/content.sql | 7 ++++--- fixtures/content_items.sql | 7 ++++--- fixtures/tag_items.sql | 5 +++-- fixtures/tags.sql | 7 ++++--- 4 files changed, 15 insertions(+), 11 deletions(-) diff --git a/fixtures/content.sql b/fixtures/content.sql index 55ddf3c47..b76e02f88 100644 --- a/fixtures/content.sql +++ b/fixtures/content.sql @@ -1,5 +1,6 @@ -/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40103 SET TIME_ZONE='+00:00' */; /*!40101 SET character_set_client = utf8 */; + CREATE TABLE `content` ( `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, `Class` enum('Emergence\\CMS\\Page','Emergence\\CMS\\BlogPost') NOT NULL, @@ -22,8 +23,8 @@ CREATE TABLE `content` ( UNIQUE KEY `Handle` (`Handle`), KEY `Published` (`Published`), KEY `CONTEXT` (`ContextClass`,`ContextID`) -) ENGINE=MyISAM AUTO_INCREMENT=15 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + INSERT INTO `content` VALUES (1,'Emergence\\CMS\\BlogPost','2021-12-26 02:44:15',3,'2021-12-26 02:44:39',3,'Slate\\Courses\\Section',2,'1st post from teacher','st_post_from_teacher',3,'Published','2021-12-26 02:44:00','Public',NULL,'OneColumn',NULL); INSERT INTO `content` VALUES (2,'Emergence\\CMS\\BlogPost','2021-12-26 02:46:48',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student',4,'Published','2021-12-26 02:46:48','Public',NULL,'OneColumn',NULL); INSERT INTO `content` VALUES (3,'Emergence\\CMS\\BlogPost','2021-12-26 02:47:16',4,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student','post_from_student-2',4,'Published','2021-12-26 02:47:17','Public',NULL,'OneColumn',NULL); diff --git a/fixtures/content_items.sql b/fixtures/content_items.sql index b5513d83f..1a759c763 100644 --- a/fixtures/content_items.sql +++ b/fixtures/content_items.sql @@ -1,5 +1,6 @@ -/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40103 SET TIME_ZONE='+00:00' */; /*!40101 SET character_set_client = utf8 */; + CREATE TABLE `content_items` ( `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, `Class` enum('Emergence\\CMS\\Item\\Album','Emergence\\CMS\\Item\\Embed','Emergence\\CMS\\Item\\Media','Emergence\\CMS\\Item\\RichText','Emergence\\CMS\\Item\\Text','Emergence\\CMS\\Item\\Markdown') NOT NULL, @@ -15,8 +16,8 @@ CREATE TABLE `content_items` ( `Data` json NOT NULL, PRIMARY KEY (`ID`), KEY `ContentID` (`ContentID`) -) ENGINE=MyISAM AUTO_INCREMENT=16 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + INSERT INTO `content_items` VALUES (1,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:44:15',3,'2021-12-26 02:44:39',3,NULL,1,3,'Deleted',1,'\"Here is some information about the course\\n - Lorem ipsum dolor sit amet\\n - consectetur adipiscing elit\"'); INSERT INTO `content_items` VALUES (2,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:44:39',3,NULL,NULL,NULL,1,3,'Published',1,'\"Here is some information about the course\\n - Lorem ipsum dolor sit amet\\n - consectetur adipiscing elit\"'); INSERT INTO `content_items` VALUES (3,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:46:48',4,NULL,NULL,NULL,2,4,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \"'); diff --git a/fixtures/tag_items.sql b/fixtures/tag_items.sql index 85c5bdd31..cd3314841 100644 --- a/fixtures/tag_items.sql +++ b/fixtures/tag_items.sql @@ -1,5 +1,6 @@ -/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40103 SET TIME_ZONE='+00:00' */; /*!40101 SET character_set_client = utf8 */; + CREATE TABLE `tag_items` ( `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, `CreatorID` int(11) DEFAULT NULL, @@ -9,7 +10,7 @@ CREATE TABLE `tag_items` ( UNIQUE KEY `TagItem` (`TagID`,`ContextClass`,`ContextID`), KEY `CONTEXT` (`ContextClass`,`ContextID`) ) ENGINE=MyISAM DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; + INSERT INTO `tag_items` VALUES ('2021-12-26 02:44:16',3,'Emergence\\CMS\\AbstractContent',1,1); INSERT INTO `tag_items` VALUES ('2021-12-26 02:56:51',3,'Emergence\\CMS\\AbstractContent',10,1); INSERT INTO `tag_items` VALUES ('2021-12-26 02:57:01',3,'Emergence\\CMS\\AbstractContent',11,1); diff --git a/fixtures/tags.sql b/fixtures/tags.sql index 8c6ee95c9..3cd9bcfa4 100644 --- a/fixtures/tags.sql +++ b/fixtures/tags.sql @@ -1,5 +1,6 @@ -/*!40101 SET @saved_cs_client = @@character_set_client */; +/*!40103 SET TIME_ZONE='+00:00' */; /*!40101 SET character_set_client = utf8 */; + CREATE TABLE `tags` ( `ID` int(10) unsigned NOT NULL AUTO_INCREMENT, `Class` enum('Tag') NOT NULL, @@ -10,7 +11,7 @@ CREATE TABLE `tags` ( `Description` varchar(255) DEFAULT NULL, PRIMARY KEY (`ID`), UNIQUE KEY `Handle` (`Handle`) -) ENGINE=MyISAM AUTO_INCREMENT=3 DEFAULT CHARSET=utf8; -/*!40101 SET character_set_client = @saved_cs_client */; +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + INSERT INTO `tags` VALUES (1,'Tag','2021-12-26 02:44:16',3,'info','info',NULL); INSERT INTO `tags` VALUES (2,'Tag','2021-12-26 02:46:48',4,'comment','comment',NULL); From 9bae2ae4b0ec098352f55ea7e8e62c9ece39914f Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 28 Dec 2021 01:32:36 -0500 Subject: [PATCH 15/34] temp: Override emergence-skeleton class This overide matches the changes made in https://github.com/JarvusInnovations/emergence-skeleton/pull/318 and the file can be removed when upstream PR is merged --- php-classes/TagItem.class.php | 197 ++++++++++++++++++++++++++++++++++ 1 file changed, 197 insertions(+) create mode 100644 php-classes/TagItem.class.php diff --git a/php-classes/TagItem.class.php b/php-classes/TagItem.class.php new file mode 100644 index 000000000..814132af7 --- /dev/null +++ b/php-classes/TagItem.class.php @@ -0,0 +1,197 @@ + null + ,'Class' => null + ,'ContextClass' => array( + 'type' => 'string' + ,'notnull' => false + ) + ,'ContextID' => array( + 'type' => 'integer' + ,'notnull' => false + ) + ,'TagID' => array( + 'type' => 'integer' + ) + ); + + public static $relationships = array( + 'Context' => array( + 'type' => 'context-parent' + ) + ,'Tag' => array( + 'type' => 'one-one' + ,'class' => 'Tag' + ) + ); + + public static $indexes = array( + 'TagItem' => array( + 'fields' => array('TagID','ContextClass','ContextID') + ,'unique' => true + ) + ); + + + + public function getTitle() + { + return sprintf('TagItem %s-%u + %s', $this->ContextClass, $this->ContextID, $this->Tag ? $this->Tag->getTitle() : '[tag not found]'); + } + + public function validate($deep = true) + { + // call parent + parent::validate($deep); + + $this->_validator->validate(array( + 'field' => 'TagID' + ,'validator' => 'number' + )); + + $this->_validator->validate(array( + 'field' => 'ContextClass' + ,'validator' => 'className' + )); + + $this->_validator->validate(array( + 'field' => 'ContextID' + ,'validator' => 'number' + )); + + // save results + $this->_isValid = $this->_isValid && !$this->_validator->hasErrors(); + if (!$this->_isValid) { + $this->_validationErrors = array_merge($this->_validationErrors, $this->_validator->getErrors()); + } + + + return $this->_isValid; + } + + public function destroy() + { + DB::nonQuery('DELETE FROM `%s` WHERE `%s` = \'%s\' AND `%s` = %u AND `%s` = %u', array( + static::$tableName + ,static::_cn('ContextClass') + ,$this->ContextClass + ,static::_cn('ContextID') + ,$this->ContextID + ,static::_cn('TagID') + ,$this->TagID + )); + + return DB::affectedRows() > 0; + } + + public static function getTagsSummary($options = array()) + { + $options = array_merge(array( + 'tagConditions' => array() + ,'itemConditions' => array() + ,'Class' => false + ,'classConditions' => array() + ,'overlayTag' => false + ,'order' => 'itemsCount DESC' + ,'excludeEmpty' => true + ,'limit' => false + ), $options); + + // initialize conditions + $options['tagConditions'] = Tag::mapConditions($options['tagConditions']); + + if (!empty($options['Class'])) { + $options['classConditions'] = $options['Class']::mapConditions($options['classConditions']); + } + + $options['itemConditions'] = TagItem::mapConditions($options['itemConditions']); + + // build query + if (!empty($options['classConditions'])) { + $classSubquery = 'SELECT `%s` FROM `%s` WHERE (%s)'; + $classParams = array( + $options['Class']::getColumnName('ID') + ,$options['Class']::$tableName + ,join(') AND (', $options['classConditions']) + ); + } + + $itemsCountQuery = 'SELECT COUNT(*) FROM `%s` TagItem WHERE TagItem.`%s` = Tag.`%s` AND (%s)'; + $itemsCountParams = array( + TagItem::$tableName + ,TagItem::getColumnName('TagID') + ,Tag::getColumnName('ID') + ,count($options['itemConditions']) ? join(') AND (', $options['itemConditions']) : '1' + ); + + if (!empty($options['overlayTag'])) { + if (!is_object($OverlayTag = $options['overlayTag']) && !$OverlayTag = Tag::getByHandle($options['overlayTag'])) { + throw new Exception('Overlay tag not found'); + } + + $itemsCountQuery .= sprintf( + ' AND (TagItem.`%s`,TagItem.`%s`) IN (SELECT OverlayTagItem.`%s`, OverlayTagItem.`%s` FROM `%s` OverlayTagItem WHERE OverlayTagItem.`%s` = %u)' + ,TagItem::getColumnName('ContextClass') + ,TagItem::getColumnName('ContextID') + ,TagItem::getColumnName('ContextClass') + ,TagItem::getColumnName('ContextID') + ,TagItem::$tableName + ,TagItem::getColumnName('TagID') + ,$OverlayTag->ID + ); + } + + if (isset($classSubquery)) { + $classIDs = DB::allValues('ID', $classSubquery, $classParams); + + $itemsCountQuery .= sprintf( + ' AND TagItem.`%s` = "%s" AND TagItem.`%s` IN (%s)' + ,TagItem::getColumnName('ContextClass') + ,DB::escape($options['Class']::getStaticRootClass()) + ,TagItem::getColumnName('ContextID') + ,implode(",",$classIDs) + ); + } + + + + $tagSummaryQuery = 'SELECT Tag.*, (%s) AS itemsCount FROM `%s` Tag WHERE (%s)'; + $tagSummaryParams = array( + DB::prepareQuery($itemsCountQuery, $itemsCountParams) + ,Tag::$tableName + ,count($options['tagConditions']) ? join(') AND (', $options['tagConditions']) : '1' + ); + + // exclude empty + if ($options['excludeEmpty']) { + $tagSummaryQuery .= ' HAVING itemsCount > 0'; + } + + // add order options + if ($options['order']) { + $tagSummaryQuery .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order'])); + } + + // add limit options + if ($options['limit']) { + $tagSummaryQuery .= sprintf(' LIMIT %u,%u', $options['offset'], $options['limit']); + } + + try { + // return indexed table or list + if ($options['indexField']) { + return DB::table(Tag::getColumnName($options['indexField']), $tagSummaryQuery, $tagSummaryParams); + } else { + return DB::allRecords($tagSummaryQuery, $tagSummaryParams); + } + } catch (TableNotFoundException $e) { + return array(); + } + } +} \ No newline at end of file From 75a3234e71a394dd02d5dd5fb3b54e8a6d050056 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 28 Dec 2021 01:42:25 -0500 Subject: [PATCH 16/34] feat: move blog/tag logic to request handler --- html-templates/sections/courseSection.tpl | 31 +------------- .../Slate/Courses/SectionsRequestHandler.php | 41 +++++++++++++++++++ 2 files changed, 42 insertions(+), 30 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 9d6b73d28..82cdb671b 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -25,38 +25,11 @@ {block "content"} - {load_templates "subtemplates/blog.tpl"} + {load_templates "blog.tpl"} {load_templates "subtemplates/paging.tpl"} {$Section = $data} - scope['limit'] = 10; - $conditions = []; - - if (!empty($_GET['blog_tag'])) { - $Tag = Tag::getByHandle($_GET['blog_tag']); - - if (!$Tag) { - throw new Exception('tag not found'); - } - $this->scope['blogTag'] = $Tag; - } else { - $Tag = null; - - $latestTeacherPost = $this->scope['Section']->findLatestTeacherPost(); - - if ($latestTeacherPost) { - $this->scope['latestTeacherPost'] = $latestTeacherPost; - $conditions[] = sprintf('ID != %u', $this->scope['latestTeacherPost']->ID); - } - } - - $this->scope['blogPosts'] = $this->scope['Section']->findBlogPosts($conditions, $this->scope['limit'], $_GET['offset'] ?: 0, $Tag ); - $this->scope['total'] = DB::foundRows(); - - ?> -
@@ -189,8 +162,6 @@ Tags - {$tags = $Section->findBlogTags()} - {* if there's 10 or more, show the first five and collapse the rest *} {if count($tags) >= 10} {$tagsShown = array_slice($tags, 0, 5)} diff --git a/php-classes/Slate/Courses/SectionsRequestHandler.php b/php-classes/Slate/Courses/SectionsRequestHandler.php index 85dab1894..f617c735e 100644 --- a/php-classes/Slate/Courses/SectionsRequestHandler.php +++ b/php-classes/Slate/Courses/SectionsRequestHandler.php @@ -5,6 +5,7 @@ use DB; use ActiveRecord; use DuplicateKeyException; +use Tag; use Emergence\People\Person; use Emergence\People\User; @@ -110,11 +111,51 @@ public static function handleRecordRequest(ActiveRecord $Section, $action = fals ])); case 'students': return static::handleStudentsRequest($Section); + case false: + return static::handleBlogpostRequest($Section, $action); default: return parent::handleRecordRequest($Section, $action); } } + public static function handleBlogpostRequest(Section $Section, $action) + { + $className = static::$recordClass; + + $limit = isset($_REQUEST['limit']) && ctype_digit($_REQUEST['limit']) ? (integer)$_REQUEST['limit'] : 10; + $offset = isset($_REQUEST['offset']) && ctype_digit($_REQUEST['offset']) ? (integer)$_REQUEST['offset'] : 0; + $handle = $_REQUEST['blog_tag']; + + $conditions = []; + $latestTeacherPost = false; + $tag = null; + + if ($handle) { + $tag = Tag::getByHandle($handle); + + if (!$tag) { + static::throwNotFoundError('tag not found'); + } + } else { + $latestTeacherPost = $Section->findLatestTeacherPost(); + + if ($latestTeacherPost) { + $conditions[] = sprintf('ID != %u', $latestTeacherPost->ID); + } + } + + return static::respond(static::getTemplateName($className::$singularNoun), array( + 'success' => true + ,'data' => $Section + ,'tags' => $Section->findBlogTags() + ,'latestTeacherPost' => $latestTeacherPost + ,'blogPosts' => $Section->findBlogPosts($conditions, $limit ?: 4, $offset, $tag ) + ,'total' => DB::foundRows() + ,'limit' => $limit + ,'offset' => $offset + )); + } + public static function handleCohortsRequest(Section $Section) { return static::respond('sectionCohorts', [ From 1607123598f047e7a865a410d0e94efe90bb53ae Mon Sep 17 00:00:00 2001 From: Chef Habitat Studio Date: Tue, 28 Dec 2021 20:48:33 +0000 Subject: [PATCH 17/34] fix: correct blog template path --- html-templates/sections/courseSection.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 82cdb671b..0a76d1bd0 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -25,7 +25,7 @@ {block "content"} - {load_templates "blog.tpl"} + {load_templates "subtemplates/blog.tpl"} {load_templates "subtemplates/paging.tpl"} {$Section = $data} From de463c01aa16958acc17e9f728f20962d17a1a24 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 28 Dec 2021 16:03:03 -0500 Subject: [PATCH 18/34] fix: add history tables to new fixtures --- fixtures/content.sql | 25 +++++++++++++++++++++++++ fixtures/content_items.sql | 20 ++++++++++++++++++++ 2 files changed, 45 insertions(+) diff --git a/fixtures/content.sql b/fixtures/content.sql index b76e02f88..03185e622 100644 --- a/fixtures/content.sql +++ b/fixtures/content.sql @@ -39,3 +39,28 @@ INSERT INTO `content` VALUES (11,'Emergence\\CMS\\BlogPost','2021-12-26 02:56:24 INSERT INTO `content` VALUES (12,'Emergence\\CMS\\BlogPost','2021-12-26 02:57:56',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-4',6,'Published','2021-12-26 02:57:57','Public',NULL,'OneColumn',NULL); INSERT INTO `content` VALUES (13,'Emergence\\CMS\\BlogPost','2021-12-26 02:58:20',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-5',6,'Published','2021-12-26 02:58:20','Public',NULL,'OneColumn',NULL); INSERT INTO `content` VALUES (14,'Emergence\\CMS\\BlogPost','2021-12-26 02:58:47',6,NULL,NULL,'Slate\\Courses\\Section',2,'Post from student2','post_from_student2-6',6,'Published','2021-12-26 02:58:48','Public',NULL,'OneColumn',NULL); + +CREATE TABLE `history_content` ( + `RevisionID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `ID` int(10) unsigned NOT NULL, + `Class` enum('Emergence\\CMS\\Page','Emergence\\CMS\\BlogPost') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Modified` timestamp NULL DEFAULT NULL, + `ModifierID` int(10) unsigned DEFAULT NULL, + `ContextClass` varchar(255) DEFAULT NULL, + `ContextID` int(10) unsigned DEFAULT NULL, + `Title` varchar(255) NOT NULL, + `Handle` varchar(255) NOT NULL, + `AuthorID` int(10) unsigned NOT NULL, + `Status` enum('Draft','Published','Hidden','Deleted') NOT NULL DEFAULT 'Published', + `Published` timestamp NULL DEFAULT NULL, + `Visibility` enum('Public','Private') NOT NULL DEFAULT 'Public', + `Summary` text, + `LayoutClass` enum('OneColumn') DEFAULT 'OneColumn', + `LayoutConfig` json DEFAULT NULL, + PRIMARY KEY (`RevisionID`), + KEY `ID` (`ID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `history_content` SELECT NULL AS RevisionID, `content`.* FROM `content`; \ No newline at end of file diff --git a/fixtures/content_items.sql b/fixtures/content_items.sql index 1a759c763..3a1052d69 100644 --- a/fixtures/content_items.sql +++ b/fixtures/content_items.sql @@ -33,3 +33,23 @@ INSERT INTO `content_items` VALUES (12,'Emergence\\CMS\\Item\\Markdown','2021-12 INSERT INTO `content_items` VALUES (13,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:57:56',6,NULL,NULL,NULL,12,6,'Published',1,'\"Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. \"'); INSERT INTO `content_items` VALUES (14,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:58:20',6,NULL,NULL,NULL,13,6,'Published',1,'\"Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.\"'); INSERT INTO `content_items` VALUES (15,'Emergence\\CMS\\Item\\Markdown','2021-12-26 02:58:47',6,NULL,NULL,NULL,14,6,'Published',1,'\"Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.\"'); + +CREATE TABLE `history_content_items` ( + `RevisionID` int(10) unsigned NOT NULL AUTO_INCREMENT, + `ID` int(10) unsigned NOT NULL, + `Class` enum('Emergence\\CMS\\Item\\Album','Emergence\\CMS\\Item\\Embed','Emergence\\CMS\\Item\\Media','Emergence\\CMS\\Item\\RichText','Emergence\\CMS\\Item\\Text','Emergence\\CMS\\Item\\Markdown') NOT NULL, + `Created` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, + `CreatorID` int(11) DEFAULT NULL, + `Modified` timestamp NULL DEFAULT NULL, + `ModifierID` int(10) unsigned DEFAULT NULL, + `Title` varchar(255) DEFAULT NULL, + `ContentID` int(10) unsigned NOT NULL, + `AuthorID` int(10) unsigned NOT NULL, + `Status` enum('Draft','Published','Hidden','Deleted') NOT NULL DEFAULT 'Published', + `Order` int(10) unsigned DEFAULT NULL, + `Data` json NOT NULL, + PRIMARY KEY (`RevisionID`), + KEY `ID` (`ID`) +) ENGINE=MyISAM DEFAULT CHARSET=utf8; + +INSERT INTO `history_content_items` SELECT NULL AS RevisionID, `content_items`.* FROM `content_items`; \ No newline at end of file From 9e86ee737714725ae4f23bbbbcf02934da66cbbf Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 28 Dec 2021 16:59:29 -0500 Subject: [PATCH 19/34] temp: fix: allow for empty subquery result This file is a placeholder override for changes on emergence-skeleton. It can be deleted when merged with updated emergence-skeleton. --- php-classes/TagItem.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-classes/TagItem.class.php b/php-classes/TagItem.class.php index 814132af7..e6d9b5f76 100644 --- a/php-classes/TagItem.class.php +++ b/php-classes/TagItem.class.php @@ -155,7 +155,7 @@ public static function getTagsSummary($options = array()) ,TagItem::getColumnName('ContextClass') ,DB::escape($options['Class']::getStaticRootClass()) ,TagItem::getColumnName('ContextID') - ,implode(",",$classIDs) + ,!empty($classIDs) ? implode(",",$classIDs) : [-1] ); } From 4cdc3b116296b19f536f2d56c9494d071085b10a Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 28 Dec 2021 18:19:08 -0500 Subject: [PATCH 20/34] fix: allow for zero results from subquery --- php-classes/Slate/Courses/Section.php | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index 2fae6c7cd..ff5365553 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -447,11 +447,13 @@ public function findBlogPosts($conditions, $limit, $offset, $tag) 'TagID' => $tag->ID ]; + $tagItemIDs = DB::allValues('ContextID', $tagIDsQuery, $tagIDsConditions); + $options = array_merge_recursive($options, [ 'conditions' => [ 'ID' => [ 'operator' => 'IN', - 'values' => \DB::allValues('ContextID', $tagIDsQuery, $tagIDsConditions) + 'values' => count($tagItemIDs) ? $tagItemIDs : '0' ] ] ]); From 498370eeadef3d3c8bd11d502af7b20dfaf5eb75 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 28 Dec 2021 18:23:02 -0500 Subject: [PATCH 21/34] feat: hide blog tag box when empty and update name --- html-templates/sections/courseSection.tpl | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 0a76d1bd0..0cd46844d 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -153,13 +153,14 @@
{/foreach} + {if count($tags) > 0}

- Tags + Blog Tags

{* if there's 10 or more, show the first five and collapse the rest *} @@ -197,6 +198,7 @@ {/if}
+ {/if}
From e7327fa5c25568ea05e4c2d38c24620b3a49852e Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 28 Dec 2021 18:29:31 -0500 Subject: [PATCH 22/34] fix: send current blog tag with data for header --- php-classes/Slate/Courses/SectionsRequestHandler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/php-classes/Slate/Courses/SectionsRequestHandler.php b/php-classes/Slate/Courses/SectionsRequestHandler.php index f617c735e..b6614b5c1 100644 --- a/php-classes/Slate/Courses/SectionsRequestHandler.php +++ b/php-classes/Slate/Courses/SectionsRequestHandler.php @@ -148,6 +148,7 @@ public static function handleBlogpostRequest(Section $Section, $action) 'success' => true ,'data' => $Section ,'tags' => $Section->findBlogTags() + ,'blogTag' => $tag ,'latestTeacherPost' => $latestTeacherPost ,'blogPosts' => $Section->findBlogPosts($conditions, $limit ?: 4, $offset, $tag ) ,'total' => DB::foundRows() From be70cffea9d99354e736738042c2ec76a11dc523 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 28 Dec 2021 18:31:03 -0500 Subject: [PATCH 23/34] temp: fix: allow for empty subquery result This file is a placeholder override for changes on emergence-skeleton. It can be deleted when merged with updated emergence-skeleton. --- php-classes/TagItem.class.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-classes/TagItem.class.php b/php-classes/TagItem.class.php index e6d9b5f76..800468c39 100644 --- a/php-classes/TagItem.class.php +++ b/php-classes/TagItem.class.php @@ -155,7 +155,7 @@ public static function getTagsSummary($options = array()) ,TagItem::getColumnName('ContextClass') ,DB::escape($options['Class']::getStaticRootClass()) ,TagItem::getColumnName('ContextID') - ,!empty($classIDs) ? implode(",",$classIDs) : [-1] + ,count($classIDs) ? implode(",", $classIDs) : '0' ); } From fe22f6ef95b92270bc7d811ecb061bacbd079d43 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Thu, 30 Dec 2021 14:47:22 -0500 Subject: [PATCH 24/34] fix: changes have now been added to slate-skeleton This file was acting as an override. The changes made to it have now been incorporated into the slate-skeleton version and this file can now be removed. --- php-classes/TagItem.class.php | 197 ---------------------------------- 1 file changed, 197 deletions(-) delete mode 100644 php-classes/TagItem.class.php diff --git a/php-classes/TagItem.class.php b/php-classes/TagItem.class.php deleted file mode 100644 index 800468c39..000000000 --- a/php-classes/TagItem.class.php +++ /dev/null @@ -1,197 +0,0 @@ - null - ,'Class' => null - ,'ContextClass' => array( - 'type' => 'string' - ,'notnull' => false - ) - ,'ContextID' => array( - 'type' => 'integer' - ,'notnull' => false - ) - ,'TagID' => array( - 'type' => 'integer' - ) - ); - - public static $relationships = array( - 'Context' => array( - 'type' => 'context-parent' - ) - ,'Tag' => array( - 'type' => 'one-one' - ,'class' => 'Tag' - ) - ); - - public static $indexes = array( - 'TagItem' => array( - 'fields' => array('TagID','ContextClass','ContextID') - ,'unique' => true - ) - ); - - - - public function getTitle() - { - return sprintf('TagItem %s-%u + %s', $this->ContextClass, $this->ContextID, $this->Tag ? $this->Tag->getTitle() : '[tag not found]'); - } - - public function validate($deep = true) - { - // call parent - parent::validate($deep); - - $this->_validator->validate(array( - 'field' => 'TagID' - ,'validator' => 'number' - )); - - $this->_validator->validate(array( - 'field' => 'ContextClass' - ,'validator' => 'className' - )); - - $this->_validator->validate(array( - 'field' => 'ContextID' - ,'validator' => 'number' - )); - - // save results - $this->_isValid = $this->_isValid && !$this->_validator->hasErrors(); - if (!$this->_isValid) { - $this->_validationErrors = array_merge($this->_validationErrors, $this->_validator->getErrors()); - } - - - return $this->_isValid; - } - - public function destroy() - { - DB::nonQuery('DELETE FROM `%s` WHERE `%s` = \'%s\' AND `%s` = %u AND `%s` = %u', array( - static::$tableName - ,static::_cn('ContextClass') - ,$this->ContextClass - ,static::_cn('ContextID') - ,$this->ContextID - ,static::_cn('TagID') - ,$this->TagID - )); - - return DB::affectedRows() > 0; - } - - public static function getTagsSummary($options = array()) - { - $options = array_merge(array( - 'tagConditions' => array() - ,'itemConditions' => array() - ,'Class' => false - ,'classConditions' => array() - ,'overlayTag' => false - ,'order' => 'itemsCount DESC' - ,'excludeEmpty' => true - ,'limit' => false - ), $options); - - // initialize conditions - $options['tagConditions'] = Tag::mapConditions($options['tagConditions']); - - if (!empty($options['Class'])) { - $options['classConditions'] = $options['Class']::mapConditions($options['classConditions']); - } - - $options['itemConditions'] = TagItem::mapConditions($options['itemConditions']); - - // build query - if (!empty($options['classConditions'])) { - $classSubquery = 'SELECT `%s` FROM `%s` WHERE (%s)'; - $classParams = array( - $options['Class']::getColumnName('ID') - ,$options['Class']::$tableName - ,join(') AND (', $options['classConditions']) - ); - } - - $itemsCountQuery = 'SELECT COUNT(*) FROM `%s` TagItem WHERE TagItem.`%s` = Tag.`%s` AND (%s)'; - $itemsCountParams = array( - TagItem::$tableName - ,TagItem::getColumnName('TagID') - ,Tag::getColumnName('ID') - ,count($options['itemConditions']) ? join(') AND (', $options['itemConditions']) : '1' - ); - - if (!empty($options['overlayTag'])) { - if (!is_object($OverlayTag = $options['overlayTag']) && !$OverlayTag = Tag::getByHandle($options['overlayTag'])) { - throw new Exception('Overlay tag not found'); - } - - $itemsCountQuery .= sprintf( - ' AND (TagItem.`%s`,TagItem.`%s`) IN (SELECT OverlayTagItem.`%s`, OverlayTagItem.`%s` FROM `%s` OverlayTagItem WHERE OverlayTagItem.`%s` = %u)' - ,TagItem::getColumnName('ContextClass') - ,TagItem::getColumnName('ContextID') - ,TagItem::getColumnName('ContextClass') - ,TagItem::getColumnName('ContextID') - ,TagItem::$tableName - ,TagItem::getColumnName('TagID') - ,$OverlayTag->ID - ); - } - - if (isset($classSubquery)) { - $classIDs = DB::allValues('ID', $classSubquery, $classParams); - - $itemsCountQuery .= sprintf( - ' AND TagItem.`%s` = "%s" AND TagItem.`%s` IN (%s)' - ,TagItem::getColumnName('ContextClass') - ,DB::escape($options['Class']::getStaticRootClass()) - ,TagItem::getColumnName('ContextID') - ,count($classIDs) ? implode(",", $classIDs) : '0' - ); - } - - - - $tagSummaryQuery = 'SELECT Tag.*, (%s) AS itemsCount FROM `%s` Tag WHERE (%s)'; - $tagSummaryParams = array( - DB::prepareQuery($itemsCountQuery, $itemsCountParams) - ,Tag::$tableName - ,count($options['tagConditions']) ? join(') AND (', $options['tagConditions']) : '1' - ); - - // exclude empty - if ($options['excludeEmpty']) { - $tagSummaryQuery .= ' HAVING itemsCount > 0'; - } - - // add order options - if ($options['order']) { - $tagSummaryQuery .= ' ORDER BY '.join(',', static::_mapFieldOrder($options['order'])); - } - - // add limit options - if ($options['limit']) { - $tagSummaryQuery .= sprintf(' LIMIT %u,%u', $options['offset'], $options['limit']); - } - - try { - // return indexed table or list - if ($options['indexField']) { - return DB::table(Tag::getColumnName($options['indexField']), $tagSummaryQuery, $tagSummaryParams); - } else { - return DB::allRecords($tagSummaryQuery, $tagSummaryParams); - } - } catch (TableNotFoundException $e) { - return array(); - } - } -} \ No newline at end of file From 2efa2dcc707d7c3c28d089f96601bc4e097b87d9 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 18 Jan 2022 00:38:37 -0500 Subject: [PATCH 25/34] fix: escape text output --- html-templates/sections/courseSection.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 0cd46844d..04d4359d4 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -175,7 +175,7 @@ @@ -190,7 +190,7 @@ From 98f3fd029fc5818059402a23498cf47aed3952ca Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 18 Jan 2022 00:43:25 -0500 Subject: [PATCH 26/34] fix: use lowerhyphencase for query param --- html-templates/sections/courseSection.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 04d4359d4..03445368f 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -175,7 +175,7 @@ @@ -190,7 +190,7 @@ From f496e1ba8cce9816ba52faa59ad2373d02db221d Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 18 Jan 2022 00:47:14 -0500 Subject: [PATCH 27/34] fix: Error should be returned --- php-classes/Slate/Courses/SectionsRequestHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-classes/Slate/Courses/SectionsRequestHandler.php b/php-classes/Slate/Courses/SectionsRequestHandler.php index b6614b5c1..0fbf4c247 100644 --- a/php-classes/Slate/Courses/SectionsRequestHandler.php +++ b/php-classes/Slate/Courses/SectionsRequestHandler.php @@ -134,7 +134,7 @@ public static function handleBlogpostRequest(Section $Section, $action) $tag = Tag::getByHandle($handle); if (!$tag) { - static::throwNotFoundError('tag not found'); + return static::throwNotFoundError('tag not found'); } } else { $latestTeacherPost = $Section->findLatestTeacherPost(); From e9f51a19338b08d3ada143844144ac354ff80894 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 18 Jan 2022 00:50:02 -0500 Subject: [PATCH 28/34] fix: avoid undefined index error if no results --- php-classes/Slate/Courses/Section.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index ff5365553..38b36b60b 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -478,7 +478,7 @@ public function findLatestTeacherPost() 'limit' => 1 ])); - return $latestTeacherPost[0]; + return count($latestTeacherPost) ? $latestTeacherPost[0] : null; } // search SQL generators From bdf69e355f0b963e86dc20ea732e5dc51cef270b Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 18 Jan 2022 00:54:12 -0500 Subject: [PATCH 29/34] fix: no need to specify full path of class --- php-classes/Slate/Courses/Section.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index 38b36b60b..c2c9b36e1 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -468,7 +468,7 @@ public function findLatestTeacherPost() return $Teacher->ID; }, $this->ActiveTeachers); - $latestTeacherPost = \Emergence\CMS\BlogPost::getAllPublishedByContextObject($this, array_merge_recursive([ + $latestTeacherPost = BlogPost::getAllPublishedByContextObject($this, array_merge_recursive([ 'conditions' => [ 'AuthorID' => [ 'operator' => 'IN', From bede5499584ea21148801596b96c2720583c8c64 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 18 Jan 2022 01:00:41 -0500 Subject: [PATCH 30/34] fix: catch both cases --- php-classes/Slate/Courses/SectionsRequestHandler.php | 1 + 1 file changed, 1 insertion(+) diff --git a/php-classes/Slate/Courses/SectionsRequestHandler.php b/php-classes/Slate/Courses/SectionsRequestHandler.php index 0fbf4c247..25dc04a44 100644 --- a/php-classes/Slate/Courses/SectionsRequestHandler.php +++ b/php-classes/Slate/Courses/SectionsRequestHandler.php @@ -111,6 +111,7 @@ public static function handleRecordRequest(ActiveRecord $Section, $action = fals ])); case 'students': return static::handleStudentsRequest($Section); + case '': case false: return static::handleBlogpostRequest($Section, $action); default: From 842203a14ca377aea91b3e7fadeee234211945d0 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 18 Jan 2022 01:02:30 -0500 Subject: [PATCH 31/34] fix: use more appropriate method name --- php-classes/Slate/Courses/SectionsRequestHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/php-classes/Slate/Courses/SectionsRequestHandler.php b/php-classes/Slate/Courses/SectionsRequestHandler.php index 25dc04a44..bab8d2e9d 100644 --- a/php-classes/Slate/Courses/SectionsRequestHandler.php +++ b/php-classes/Slate/Courses/SectionsRequestHandler.php @@ -113,13 +113,13 @@ public static function handleRecordRequest(ActiveRecord $Section, $action = fals return static::handleStudentsRequest($Section); case '': case false: - return static::handleBlogpostRequest($Section, $action); + return static::handleSectionRequest($Section, $action); default: return parent::handleRecordRequest($Section, $action); } } - public static function handleBlogpostRequest(Section $Section, $action) + public static function handleSectionRequest(Section $Section, $action) { $className = static::$recordClass; From dce8e5dfce0f5acea450a42e9d88ee8e74a09278 Mon Sep 17 00:00:00 2001 From: BillClinton Date: Tue, 18 Jan 2022 01:09:50 -0500 Subject: [PATCH 32/34] refactor: remove unnecessarily named args --- php-classes/Slate/Courses/Section.php | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/php-classes/Slate/Courses/Section.php b/php-classes/Slate/Courses/Section.php index c2c9b36e1..8a0afbd07 100644 --- a/php-classes/Slate/Courses/Section.php +++ b/php-classes/Slate/Courses/Section.php @@ -441,13 +441,14 @@ public function findBlogPosts($conditions, $limit, $offset, $tag) if ($tag!=null) { - $tagIDsQuery = 'SELECT ContextID FROM `tag_items` WHERE (`ContextClass` = "%s") AND (`TagID` = %u)'; - $tagIDsConditions = [ - 'ContextClass' => DB::escape(BlogPost::getStaticRootClass()), - 'TagID' => $tag->ID - ]; - - $tagItemIDs = DB::allValues('ContextID', $tagIDsQuery, $tagIDsConditions); + $tagItemIDs = DB::allValues( + 'ContextID', + 'SELECT ContextID FROM `tag_items` WHERE (`ContextClass` = "%s") AND (`TagID` = %u)', + [ + DB::escape(BlogPost::getStaticRootClass()), + $tag->ID + ] + ); $options = array_merge_recursive($options, [ 'conditions' => [ From b20de13cd8c17ac11d048c692ac35f08d23bcf7f Mon Sep 17 00:00:00 2001 From: BillClinton Date: Mon, 14 Feb 2022 19:40:54 -0500 Subject: [PATCH 33/34] fix: corrected url parameter name --- php-classes/Slate/Courses/SectionsRequestHandler.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/php-classes/Slate/Courses/SectionsRequestHandler.php b/php-classes/Slate/Courses/SectionsRequestHandler.php index bab8d2e9d..e515043b4 100644 --- a/php-classes/Slate/Courses/SectionsRequestHandler.php +++ b/php-classes/Slate/Courses/SectionsRequestHandler.php @@ -125,7 +125,7 @@ public static function handleSectionRequest(Section $Section, $action) $limit = isset($_REQUEST['limit']) && ctype_digit($_REQUEST['limit']) ? (integer)$_REQUEST['limit'] : 10; $offset = isset($_REQUEST['offset']) && ctype_digit($_REQUEST['offset']) ? (integer)$_REQUEST['offset'] : 0; - $handle = $_REQUEST['blog_tag']; + $handle = $_REQUEST['blog-tag']; $conditions = []; $latestTeacherPost = false; From f55442c5ced8587946712b5e9b154e26222e477a Mon Sep 17 00:00:00 2001 From: Chris Alfano Date: Tue, 15 Feb 2022 12:40:14 -0500 Subject: [PATCH 34/34] style(blog): wrap tag in tag --- html-templates/sections/courseSection.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/html-templates/sections/courseSection.tpl b/html-templates/sections/courseSection.tpl index 03445368f..af4280701 100644 --- a/html-templates/sections/courseSection.tpl +++ b/html-templates/sections/courseSection.tpl @@ -39,7 +39,7 @@ Public Feed {if $blogTag} - for tag {$blogTag->getTitle()|escape} + for tag {$blogTag->getTitle()|escape} {/if}