Fixes all remaining found issues with last nickname commit, Also impliements finalised version of PR 1163 #1164
Conversation
hitime1234
requested review from
markspolakovs,
michael-grace and
ashhhleyyy
docs/install.md
Outdated
| @@ -29,8 +29,7 @@ If you have Docker on your system, use Docker Compose to set up an environment. | |||
| Simply run `docker compose up -d` and visit "https://localhost:4443/myradio/". | |||
|
|
|||
| If you encounter an error with autoload.php: | |||
| find the id of your myradio container using `docker dontainer ls` | |||
| enter a bash session with `docker exec -it [myradioid] bash` | |||
| enter a bash session with `docker compose exec myradio bash` | |||
There was a problem hiding this comment.
more concise to do docker compose exec myradio composer install
There was a problem hiding this comment.
should be changed
| } | ||
| ], | ||
| "bPaginate": true | ||
| }); | ||
| }); |
There was a problem hiding this comment.
removed will add to seperate pr
src/Public/js/myradio.timeslot.js
Outdated
| @@ -1,3 +1,14 @@ | |||
| //Name helper function for concating names; | |||
| function NameHelper(data) { | |||
There was a problem hiding this comment.
maybe a better name for this (formatName? or something along those lines)
There was a problem hiding this comment.
Change name to formatName as that works
| @@ -442,7 +442,7 @@ public function getFName() | |||
| } | |||
|
|
|||
| /** | |||
| * Returns the User's first name. | |||
| * Returns the User's nickname. | |||
| * | |||
| * @return string The User's first name | |||
There was a problem hiding this comment.
you've also missed
https://github.com/UniversityRadioYork/MyRadio/pull/1154/files#r1731837216
src/Public/js/myradio.timeslot.js
Outdated
| @@ -1,3 +1,14 @@ | |||
| //Format names function for concating names; | |||
There was a problem hiding this comment.
not sure the comment is really necessary, and it reads quite confusingly to me
There was a problem hiding this comment.
//combines the first ,nickname, last names of the user together
would this be good or show I remove the comment fully
There was a problem hiding this comment.
probably best to just yeet it
| } | ||
| return $this->fname.' '.$this->nname.' '.$this->sname; | ||
| } | ||
| return $this->fname.' "'.$this->nname.'" '.$this->sname; |
There was a problem hiding this comment.
it feels like this if case should be inverted, as having a nickname set is definitely the non-default case
Changes:
removes and adds fixes to rest of issues found see:
#1159
#1154
for more detail
Other changes impliemented a finalised version of
#1153
Let me know if I missed any
Squashed and move to new branch to so history doesn't get wack :3