From 3e1823a435155430b001bfccbafdd87cbf6f86d7 Mon Sep 17 00:00:00 2001 From: Piotr Date: Sat, 7 Jul 2018 18:29:46 +0200 Subject: [PATCH] Fix: Correctly display user-name on Publications page (#30) * Fix: Correctly display user-name on Publications page * Docs: Update Changelog * Docs: Update Readme * Docs: Update INSTALL.md * Docs: Remove bages for dev branch --- CHANGELOG.md | 1 + INSTALL.md | 10 +++++----- README.md | 16 ++++++++++++---- lib/BibSpace/Controller/Publications.pm | 3 +-- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ae25045..e1e7150 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,7 @@ Use it to migrate your data from 0.5.x to 0.6.x. * Deprecation: Storable backups are marked as deprecated now. Use JSON backup instead. * Feature: Add support for independent JSON backup and restore +* Fix: Non-ANSI usernames are now properly encoded with UTF-8 on the Publications page * Fix: External link to DateTime formats uses now permalink to CPAN * Fix: Show recenlty added/modified works correctly for less than 10 objects in system * Fix: Harden tests for less than 10 objects in system diff --git a/INSTALL.md b/INSTALL.md index dc6848d..2245de7 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -7,13 +7,13 @@ cd ~ sudo aptitude update sudo aptitude upgrade -sudo aptitude install git curl vim cpanminus mysql-server mysql-client libssl-dev bibtex2html libbtparse-dev libdbd-mysql-perl +sudo aptitude install build-essential make git curl vim cpanminus mysql-server mysql-client libssl-dev bibtex2html libbtparse-dev libdbd-mysql-perl # get code git clone https://github.com/vikin91/BibSpace.git --depth 1 cd BibSpace -# install prerequisites +# install prerequisites cpanm -nq --no-interactive --installdeps . # config mysql @@ -30,14 +30,14 @@ If all tests are passed then you may finally **start BibSpace** ```bash # provide config -export BIBSPACE_CONFIG=lib/BibSpace/files/config/default.conf +export BIBSPACE_CONFIG=lib/BibSpace/files/config/default.conf # using hypnotoad (currently not recomended for version 0.5.0 due to prefork) hypnotoad ./bin/bibspace # using built-in server bin/bibspace daemon -m production -l http://*:8080 ``` -To **stop BibSpace** +To **stop BibSpace** ```bash hypnotoad -s ./bin/bibspace ``` @@ -46,7 +46,7 @@ hypnotoad -s ./bin/bibspace you may also run it in **developer mode** to see errors, debug messages etc. ```bash morbo -l http://*:8080 ./bin/bibspace -# or +# or bin/bibspace daemon -m development -l http://*:8080 ``` diff --git a/README.md b/README.md index 169c994..a201ad5 100644 --- a/README.md +++ b/README.md @@ -4,10 +4,7 @@ BibSpace is an Online Bibtex Publications Management Software for Authors and Re ## Build status ## -Branch | Status | Test coverage ---- | --- | --- -*master* | [![Build Status](https://travis-ci.org/vikin91/BibSpace.svg?branch=master)](https://travis-ci.org/vikin91/BibSpace) | [![Coverage Status](https://coveralls.io/repos/github/vikin91/BibSpace/badge.svg?branch=master)](https://coveralls.io/github/vikin91/BibSpace?branch=master) -*dev* | [![Build Status](https://travis-ci.org/vikin91/BibSpace.svg?branch=dev)](https://travis-ci.org/vikin91/BibSpace) | [![Coverage Status](https://coveralls.io/repos/github/vikin91/BibSpace/badge.svg?branch=dev)](https://coveralls.io/github/vikin91/BibSpace?branch=dev) +[![Build Status](https://travis-ci.org/vikin91/BibSpace.svg?branch=master)](https://travis-ci.org/vikin91/BibSpace) [![Coverage Status](https://coveralls.io/repos/github/vikin91/BibSpace/badge.svg?branch=master)](https://coveralls.io/github/vikin91/BibSpace?branch=master) ## Installation ## * See [INSTALL.md](INSTALL.md) @@ -30,12 +27,23 @@ Your MySQL data is stored in `db_data`, whereas preferences and stats in `json_d ## Updating +Make sure to backup your data (regular backup + copy all `json` files) before updating. + ### From Version <=0.5.2 to 0.6.x Update first to version 0.5.3. Then backup your data to JSON format and make sure that data can be restored correctly. Next, update to version 0.6.0 and restore data from the JSON backup. +### From Version 0.5.0 to >0.5.0 + +Update normally, then execute the following: + +``` +mkdir -p json_data +mv *.json json_data/ +``` + ## TODOs ## BibSpace is currently undergoing serious refactoring. Feel free to post an issue if you have a question or want to report a bug. diff --git a/lib/BibSpace/Controller/Publications.pm b/lib/BibSpace/Controller/Publications.pm index 1a98451..2240156 100644 --- a/lib/BibSpace/Controller/Publications.pm +++ b/lib/BibSpace/Controller/Publications.pm @@ -59,8 +59,7 @@ sub all { my @filtered = Fget_publications_main_hashed_args($self, {}, \@all); $self->stash(entries => \@filtered, all_entries => \@all); - my $html = $self->render_to_string(template => 'publications/all'); - $self->render(data => $html); + $self->render(template => 'publications/all'); } sub all_recently_added {