Przeglądaj źródła

Merge pull request #6 from troglodyne/ptcms

Fixes found doing strim
George S. Baugh 5 lat temu
rodzic
commit
6923340ae1
2 zmienionych plików z 9 dodań i 9 usunięć
  1. 2 2
      Makefile
  2. 7 7
      lib/Trog/Routes/HTML.pm

+ 2 - 2
Makefile

@@ -8,5 +8,5 @@ test:
 
 .PHONY: depend
 depend:
-	sudo apt install -y cpanminus starman  libcal-dav-perl libtext-xslate-perl libserver-starter-perl liburl-encode-perl libplack-perl libcal-dav-perl libconfig-tiny-perl libdatetime-format-http-perl libjson-maybexs-perl libuuid-tiny-perl libcapture-tiny-perl libconfig-simple-perl libdbi-perl libfile-slurper-perl libfile-touch-perl libfile-copy-recursive-perl
-	sudo cpanm Mojo::File Date::Format DBD::SQLite
+	sudo apt install -y sqlite3 libsqlite3-dev libdbd-sqlite3-perl cpanminus starman  libcal-dav-perl libtext-xslate-perl libserver-starter-perl liburl-encode-perl libplack-perl libcal-dav-perl libconfig-tiny-perl libdatetime-format-http-perl libjson-maybexs-perl libuuid-tiny-perl libcapture-tiny-perl libconfig-simple-perl libdbi-perl libfile-slurper-perl libfile-touch-perl libfile-copy-recursive-perl
+	sudo cpanm Mojo::File Date::Format

+ 7 - 7
lib/Trog/Routes/HTML.pm

@@ -285,13 +285,13 @@ sub config ($query, $input, $render_cb) {
     $query->{failure} //= -1;
 
     return $render_cb->('config.tx', {
-        title         => 'Configure tCMS',
-        stylesheets   => $css,
-        scripts       => $js,
-        themes        => _get_themes(),
-        data_models   => _get_data_models(),
-        current_theme => $conf->param('general.theme'),
-        current_data_model => $conf->param('general.data_model'),
+        title              => 'Configure tCMS',
+        stylesheets        => $css,
+        scripts            => $js,
+        themes             => _get_themes(),
+        data_models        => _get_data_models(),
+        current_theme      => $conf->param('general.theme') // '',
+        current_data_model => $conf->param('general.data_model') // 'DUMMY',
         route       => '/about',
         category    => '/about',
         types       => ['profile'],