diff --git a/src/Classes/MyRadio/MyRadioNews.php b/src/Classes/MyRadio/MyRadioNews.php index e607982dc..3f5b23755 100644 --- a/src/Classes/MyRadio/MyRadioNews.php +++ b/src/Classes/MyRadio/MyRadioNews.php @@ -75,7 +75,7 @@ public static function getNewsItem($newsentryid, MyRadio_User $user = null) $db = Database::getInstance(); $news = $db->fetchOne( - 'SELECT newsentryid, fname || \' \' || sname AS author, timestamp AS posted, content + 'SELECT newsentryid, fname || \' \' || sname AS author, fname || \' "\' || nname || \'" \' || sname AS nickname, timestamp AS posted, content FROM public.news_feed, public.member WHERE newsentryid=$1 AND news_feed.memberid = member.memberid', diff --git a/src/Classes/ServiceAPI/Profile.php b/src/Classes/ServiceAPI/Profile.php index 88c313d55..a45d22a4f 100644 --- a/src/Classes/ServiceAPI/Profile.php +++ b/src/Classes/ServiceAPI/Profile.php @@ -83,7 +83,7 @@ public static function getMembersForYear($year) */ $result = self::$db->fetchAll( - 'SELECT member.memberid, CONCAT(fname, \', \' ,sname) AS name, l_college.descr AS college, paid, email, eduroam + 'SELECT member.memberid, CONCAT(fname, \', \' ,sname) AS name, fname || \' "\' || nname || \'" \' || sname as nickname, l_college.descr AS college, paid, email, eduroam FROM member INNER JOIN (SELECT * FROM member_year WHERE year = $1) AS member_year ON ( member.memberid = member_year.memberid ), l_college WHERE member.college = l_college.collegeid diff --git a/src/Public/js/myradio.newslist.js b/src/Public/js/myradio.newslist.js index 21dde34ce..34554805a 100644 --- a/src/Public/js/myradio.newslist.js +++ b/src/Public/js/myradio.newslist.js @@ -8,6 +8,11 @@ $(".twig-datatable").dataTable({ { "sTitle": "Author" }, + //nickname + { + "sTitle": "nickname", + "sClass": "left", + }, //posted { "sTitle": "Time" diff --git a/src/Public/js/myradio.profile.list.js b/src/Public/js/myradio.profile.list.js index d7d987dcf..83f97a7c3 100644 --- a/src/Public/js/myradio.profile.list.js +++ b/src/Public/js/myradio.profile.list.js @@ -11,6 +11,11 @@ $(".twig-datatable").dataTable({ "sClass": "left", "aDataSort": [ 1, 2 ] }, + //nickname + { + "sTitle": "Nickname", + "sClass": "left", + }, //college { "sTitle": "College" diff --git a/src/Templates/MyRadio/getOnAir.twig b/src/Templates/MyRadio/getOnAir.twig index f65c364b9..cda80ac08 100644 --- a/src/Templates/MyRadio/getOnAir.twig +++ b/src/Templates/MyRadio/getOnAir.twig @@ -9,7 +9,7 @@
  • - Become a Paid Member + Become a Paid Member {% if config.base_url not in config.payment_url %}   {% endif %}