From 5e9b04b0f58b024e71c53730b0085044efde207f Mon Sep 17 00:00:00 2001 From: Jenny Li Date: Wed, 4 Oct 2017 23:19:19 -0700 Subject: [PATCH 1/5] update broken link to contributor docs (#4123) --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f1ef3672c6..df81e98095 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -1,6 +1,6 @@ ### Contributing -Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing). +Please see the documentation on [contributing and developing for Snipe-IT](https://snipe-it.readme.io/docs/contributing-overview). Please note that this project is released with a [Contributor Code of Conduct](CODE_OF_CONDUCT.md). By participating in this project you agree to abide by its terms. From 7b10213b3a8a9dc536c47a6255371c46b793ba3a Mon Sep 17 00:00:00 2001 From: madd15 Date: Thu, 5 Oct 2017 16:58:13 +1030 Subject: [PATCH 2/5] Small UI Tweaks to Accessories (#4149) * Small UI Change Changing Save button for Checkout button and adding Cancel button * Small UI Change Move buttons to match checkout page and remove extra save button --- resources/views/accessories/checkin.blade.php | 17 ++++------------- resources/views/accessories/checkout.blade.php | 5 +++-- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/resources/views/accessories/checkin.blade.php b/resources/views/accessories/checkin.blade.php index abc5e1f8b1..075f72720d 100755 --- a/resources/views/accessories/checkin.blade.php +++ b/resources/views/accessories/checkin.blade.php @@ -56,19 +56,10 @@ {!! $errors->first('note', ' :message') !!} - -
- -
- {{ trans('button.cancel') }} - -
-
- - - -
- +
+
+ {{ trans('button.cancel') }} +
diff --git a/resources/views/accessories/checkout.blade.php b/resources/views/accessories/checkout.blade.php index d89ea825dc..830e9492a8 100755 --- a/resources/views/accessories/checkout.blade.php +++ b/resources/views/accessories/checkout.blade.php @@ -79,8 +79,9 @@ @endif -
- +
+ {{ trans('button.cancel') }} +
From f442b70ae73df295039548e5555c8e248f4af191 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 5 Oct 2017 00:02:14 -0700 Subject: [PATCH 3/5] Apply PR #4133 to develop --- snipeit.sh | 243 +++++++++++++++++++++++++++++++---------------------- 1 file changed, 144 insertions(+), 99 deletions(-) diff --git a/snipeit.sh b/snipeit.sh index 1a6023ca2d..561b5f1cb5 100755 --- a/snipeit.sh +++ b/snipeit.sh @@ -16,8 +16,14 @@ # ensure running as root if [ "$(id -u)" != "0" ]; then - exec sudo "$0" "$@" + #Debian doesnt have sudo if root has a password. + if ! hash sudo 2>/dev/null; then + exec su -c "$0" "$@" + else + exec sudo "$0" "$@" + fi fi + #First things first, let's set some variables and find our distro. clear @@ -26,16 +32,12 @@ hostname="$(hostname)" fqdn="$(hostname --fqdn)" ans=default hosts=/etc/hosts -tmp=/tmp/$name spin[0]="-" spin[1]="\\" spin[2]="|" spin[3]="/" -rm -rf ${tmp:?} -mkdir $tmp - # Debian/Ubuntu friendly f(x)s progress () { while kill -0 $pid > /dev/null 2>&1 @@ -48,7 +50,6 @@ progress () { done } - #Used for Debian and Ubuntu vhenvfile () { find /etc/apache2/mods-enabled -maxdepth 1 -name 'rewrite.load' >/dev/null 2>&1 @@ -124,7 +125,6 @@ else distro="unsupported" fi - echo " _____ _ __________ / ___/____ (_)___ ___ / _/_ __/ @@ -134,7 +134,6 @@ echo " /_/ " -echo "" echo "" echo " Welcome to Snipe-IT Inventory Installer for Centos, Debian and Ubuntu!" echo "" @@ -158,7 +157,6 @@ case $distro in ;; esac shopt -u nocasematch -#Get your FQDN. echo -n " Q. What is the FQDN of your server? ($fqdn): " read fqdn @@ -168,7 +166,6 @@ fi echo " Setting to $fqdn" echo "" -#Do you want to set your own passwords, or have me generate random ones? until [[ $ans == "yes" ]] || [[ $ans == "no" ]]; do echo -n " Q. Do you want to automatically create the database user password? (y/n) " read setpw @@ -189,71 +186,71 @@ case $setpw in esac done -#Snipe says we need a new 32bit key, so let's create one randomly and inject it into the file - -#db_setup.sql will be injected to the database during install. -#Again, this file should be removed, which will be a prompt at the end of the script. -dbsetup=$tmp/db_setup.sql -echo >> $dbsetup "CREATE DATABASE snipeit;" -echo >> $dbsetup "GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';" - -#Let us make it so only root can read the file. Again, this isn't best practice, so please remove these after the install. -chown root:root $dbsetup -chmod 700 $dbsetup - -## TODO: Progress tracker on each step +#TODO: Lets not install snipeit application under root +#TODO: Make progress tracker go on the same line of the step being run +#TODO: Progress tracker on each step case $distro in debian) - ##################################### Install for Debian ############################################## - #Update/upgrade Debian/Ubuntu repositories, get the latest version of git. - #Git clone snipeit, create vhost, edit hosts file, create .env file, mysql install - #composer install, set permissions, restart apache. - #BTW, Debian, I swear, you're such a pain. - + ##################################### Install for Debian 9 ############################################## webdir=/var/www - echo -e "\n* Updating Debian packages in the background... ${spin[0]}\n" - apt-get update >> /var/log/snipeit-install.log & pid=$! 2>&1 - wait - apt-get upgrade >> /var/log/snipeit-install.log & pid=$! 2>&1 - wait - echo -e "\n* Installing packages... ${spin[0]}\n" - echo -e "\n* Going to suppress more messages that you don't need to worry about. Please wait... ${spin[0]}" - DEBIAN_FRONTEND=noninteractive apt-get -y install mariadb-server mariadb-client apache2 git unzip php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap libapache2-mod-php5 curl >> /var/log/snipeit-install.log & pid=$! 2>&1 + + echo "* Updating with apt-get update." + log "apt-get update" & pid=$! progress - wait - echo -e "\n* Cloning Snipeit, extracting to $webdir/$name..." - git clone https://github.com/snipe/snipe-it $webdir/$name >> /var/log/snipeit-install.log & pid=$! 2>&1 + + echo "* Upgrading packages with apt-get upgrade." + log "apt-get -y upgrade" & pid=$! progress - php5enmod mcrypt >> /var/log/snipeit-install.log 2>&1 - a2enmod rewrite >> /var/log/snipeit-install.log 2>&1 + + echo "* Installing httpd, PHP, MariaDB and other requirements." + log "DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server mariadb-client apache2 libapache2-mod-php php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath curl git unzip" & pid=$! + progress + + log "a2enmod rewrite" + + echo "* Cloning Snipe-IT from github to the web directory." + log "git clone https://github.com/snipe/snipe-it $webdir/$name" & pid=$! + progress + tzone=$(cat /etc/timezone) setenv vhenvfile wait echo >> $hosts "127.0.0.1 $hostname $fqdn" a2ensite $name.conf - echo -e "* Modify the Snipe-It files necessary for a production environment.\n* Securing Mysql" - # Have user set own root password when securing install - # and just set the snipeit database user at the beginning + + echo "* Securing MariaDB server."; /usr/bin/mysql_secure_installation - echo -e "* Creating Mysql Database and User.\n## Please Input your MySQL/MariaDB root password: " - mysql -u root -p < $dbsetup + + echo "* Creating MariaDB Database/User." + echo "* Please Input your MariaDB root password:" + mysql -u root -p --execute="CREATE DATABASE snipeit;GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';" + + echo "* Installing and running composer." cd $webdir/$name/ curl -sS https://getcomposer.org/installer | php php composer.phar install --no-dev --prefer-source + perms + chown -R www-data:www-data "/var/www/$name" + service apache2 restart - php artisan key:generate + + echo "* Generating the application key." + php artisan key:generate --force + + echo "* Artisan Migrate." + php artisan migrate --force ;; ubuntu) - ##################################### Install for Ubuntu ############################################## - + if [[ "$version" =~ 1[6-7] ]]; then + ##################################### Install for Ubuntu 16-17 ############################################## webdir=/var/www echo "* Adding MariaDB repository." - (echo "deb [arch=amd64,i386] http://ftp.hosteurope.de/mirror/mariadb.org/repo/10.1/ubuntu $codename main" | tee /etc/apt/sources.list.d/mariadb.list >/dev/null 2>&1) log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xF1656F24C74CD1D8" + log "add-apt-repository 'deb [arch=amd64,i386] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu $codename main'" echo "* Updating with apt-get update." log "apt-get update" & pid=$! @@ -265,50 +262,41 @@ case $distro in progress echo "* Installing httpd, PHP, MariaDB and other requirements." - log "DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server mariadb-client apache2 libapache2-mod-php curl git unzip" & pid=$! + log "DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server mariadb-client apache2 libapache2-mod-php php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath curl git unzip" & pid=$! progress - if [ "$version" == "16.04" ]; then - log "apt-get install -y php php-mcrypt php-curl php-mysql php-gd php-ldap php-zip php-mbstring php-xml php-bcmath" & pid=$! - progress - log "phpenmod mcrypt" - log "phpenmod mbstring" - log "a2enmod rewrite" - else - log "apt-get install -y php5 php5-mcrypt php5-curl php5-mysql php5-gd php5-ldap" & pid=$! - progress - log "php5enmod mcrypt" - log "a2enmod rewrite" - fi + log "phpenmod mcrypt" + log "phpenmod mbstring" + log "a2enmod rewrite" echo "* Cloning Snipe-IT from github to the web directory." log "git clone https://github.com/snipe/snipe-it $webdir/$name" & pid=$! progress - + echo "* Configuring .env file." tzone=$(cat /etc/timezone) setenv - + vhenvfile - - echo "* Starting the MariaDB server."; + + echo "* Starting the MariaDB server."; service mysql status >/dev/null || service mysql start - + echo "* Securing MariaDB server."; /usr/bin/mysql_secure_installation - + echo "* Creating MariaDB Database/User." echo "* Please Input your MariaDB root password:" - mysql -u root -p < $dbsetup + mysql -u root -p --execute="CREATE DATABASE snipeit;GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';" echo "* Installing and running composer." cd $webdir/$name/ curl -sS https://getcomposer.org/installer | php php composer.phar install --no-dev --prefer-source - + perms chown -R www-data:www-data "/var/www/$name" - + service apache2 restart echo "* Generating the application key." @@ -316,14 +304,80 @@ case $distro in echo "* Artisan Migrate." php artisan migrate --force - ;; - centos ) + + elif [[ "$version" =~ 14 ]]; then + ##################################### Install for Ubuntu 14 ############################################## + webdir=/var/www + + echo "* Adding MariaDB and ppa:ondrej/php repositories." + log "apt-key adv --recv-keys --keyserver hkp://keyserver.ubuntu.com:80 0xcbcb082a1bb943db" + log "add-apt-repository 'deb [arch=amd64,i386,ppc64el] http://nyc2.mirrors.digitalocean.com/mariadb/repo/10.1/ubuntu $codename main'" + #PHP7 repository + log "add-apt-repository ppa:ondrej/php -y" + + echo "* Updating with apt-get update." + log "apt-get update" & pid=$! + [ -f /var/lib/dpkg/lock ] && rm -f /var/lib/dpkg/lock + progress + + echo "* Upgrading packages with apt-get upgrade." + log "apt-get -y upgrade" & pid=$! + progress + + echo "* Installing httpd, PHP, MariaDB and other requirements." + log "DEBIAN_FRONTEND=noninteractive apt-get install -y mariadb-server mariadb-client php7.1 php7.1-mcrypt php7.1-curl php7.1-mysql php7.1-gd php7.1-ldap php7.1-zip php7.1-mbstring php7.1-xml php7.1-bcmath curl git unzip" & pid=$! + progress + + log "phpenmod mcrypt" + log "phpenmod mbstring" + log "a2enmod rewrite" + + echo "* Cloning Snipe-IT from github to the web directory." + log "git clone https://github.com/snipe/snipe-it $webdir/$name" & pid=$! + progress + + echo "* Configuring .env file." + tzone=$(cat /etc/timezone) + setenv + + vhenvfile + + echo "* Starting the MariaDB server."; + service mysql status >/dev/null || service mysql start + + echo "* Securing MariaDB server."; + /usr/bin/mysql_secure_installation + + echo "* Creating MariaDB Database/User." + echo "* Please Input your MariaDB root password:" + mysql -u root -p --execute="CREATE DATABASE snipeit;GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';" + + echo "* Installing and running composer." + cd $webdir/$name/ + curl -sS https://getcomposer.org/installer | php + php composer.phar install --no-dev --prefer-source + + perms + chown -R www-data:www-data "/var/www/$name" + + service apache2 restart + + echo "* Generating the application key." + php artisan key:generate --force + + echo "* Artisan Migrate." + php artisan migrate --force + + else + echo "Unable to Handle Ubuntu Version #. Version Found: " $version + return 1 + fi + ;; + centos) if [[ "$version" =~ ^6 ]]; then ##################################### Install for Centos/Redhat 6 ############################################## - webdir=/var/www/html - #Allow us to get the mysql engine - echo "" + echo "## Adding IUS, epel-release and MariaDB repositories."; mariadbRepo=/etc/yum.repos.d/MariaDB.repo touch "$mariadbRepo" @@ -337,10 +391,9 @@ case $distro in } >> "$mariadbRepo" log "yum -y install wget epel-release" - log "wget -P "$tmp/" https://centos6.iuscommunity.org/ius-release.rpm" - log "rpm -Uvh "$tmp/ius-release*.rpm"" + log "yum -y install https://centos6.iuscommunity.org/ius-release.rpm" + log "rpm --import /etc/pki/rpm-gpg/IUS-COMMUNITY-GPG-KEY" - #Install PHP and other needed stuff echo "## Installing httpd, PHP, MariaDB and other requirements."; PACKAGES="httpd mariadb-server git unzip php71u php71u-mysqlnd php71u-bcmath php71u-cli php71u-common php71u-embedded php71u-gd php71u-mbstring php71u-mcrypt php71u-ldap php71u-json php71u-simplexml" @@ -368,7 +421,7 @@ case $distro in echo "## Creating MariaDB Database/User." echo "## Please Input your MariaDB root password: " - mysql -u root -p < $dbsetup + mysql -u root -p --execute="CREATE DATABASE snipeit;GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';" #Create the new virtual host in Apache and enable rewrite echo "## Creating the new virtual host in Apache."; @@ -399,7 +452,7 @@ case $distro in echo "## Starting the apache server."; chkconfig httpd on /sbin/service httpd start - + echo "## Configuring .env file." tzone=$(grep ZONE /etc/sysconfig/clock | tr -d '"' | sed 's/ZONE=//g'); setenv @@ -422,7 +475,7 @@ case $distro in fi service httpd restart - + echo "## Generating the application key." php artisan key:generate --force @@ -431,16 +484,13 @@ case $distro in elif [[ "$version" =~ ^7 ]]; then ##################################### Install for Centos/Redhat 7 ############################################## - webdir=/var/www/html - #Allow us to get the mysql engine echo -e "\n## Adding IUS, epel-release and MariaDB repositories."; log "yum -y install wget epel-release" - log "wget -P $tmp/ https://centos7.iuscommunity.org/ius-release.rpm" - log "rpm -Uvh $tmp/ius-release*.rpm" + log "yum -y install https://centos7.iuscommunity.org/ius-release.rpm" + log "rpm --import /etc/pki/rpm-gpg/IUS-COMMUNITY-GPG-KEY" - #Install PHP and other requirements echo "## Installing httpd, PHP, MariaDB and other requirements."; PACKAGES="httpd mariadb-server git unzip php71u php71u-mysqlnd php71u-bcmath php71u-cli php71u-common php71u-embedded php71u-gd php71u-mbstring php71u-mcrypt php71u-ldap php71u-json php71u-simplexml" @@ -455,25 +505,21 @@ case $distro in done; echo -e "\n## Cloning Snipe-IT from github to the web directory."; - log "git clone https://github.com/snipe/snipe-it $webdir/$name" - # Make mariaDB start on boot and restart the daemon + #Make mariaDB start on boot and restart the daemon echo "## Starting the MariaDB server."; systemctl enable mariadb.service systemctl start mariadb.service echo "## Securing MariaDB server."; - echo ""; - echo ""; /usr/bin/mysql_secure_installation echo "## Creating MariaDB Database/User." echo "## Please Input your MariaDB root password " - mysql -u root -p < "$dbsetup" - - ##TODO make sure the apachefile doesnt exist isnt already in there + mysql -u root -p --execute="CREATE DATABASE snipeit;GRANT ALL PRIVILEGES ON snipeit.* TO snipeit@localhost IDENTIFIED BY '$mysqluserpw';" + #TODO make sure the apachefile doesnt exist isnt already in there #Create the new virtual host in Apache and enable rewrite apachefile="/etc/httpd/conf.d/$name.conf" @@ -497,7 +543,7 @@ case $distro in echo "" } >> "$apachefile" - ##TODO make sure this isnt already in there + #TODO make sure this isnt already in there echo "## Setting up hosts file."; echo >> $hosts "127.0.0.1 $hostname $fqdn" @@ -538,7 +584,7 @@ case $distro in echo "## Creating scheduler cron." (crontab -l ; echo "* * * * * /usr/bin/php $webdir/$name/artisan schedule:run >> /dev/null 2>&1") | crontab - - + else echo "Unable to Handle Centos Version #. Version Found: " $version return 1 @@ -554,6 +600,5 @@ echo "" echo "* Cleaning up..." rm -f snipeit.sh rm -f install.sh -rm -rf ${tmp:?} echo "* Finished!" sleep 1 From adddc5324b493ab8dc7f61638e16308806874d23 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 5 Oct 2017 00:34:50 -0700 Subject: [PATCH 4/5] Add @imjennyli as a contributor --- .all-contributorsrc | 9 +++++++++ README.md | 4 ++-- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/.all-contributorsrc b/.all-contributorsrc index 9d1ca91056..8cbf9d64e1 100644 --- a/.all-contributorsrc +++ b/.all-contributorsrc @@ -755,6 +755,15 @@ "contributions": [ "code" ] + }, + { + "login": "imjennyli", + "name": "Jenny Li", + "avatar_url": "https://avatars3.githubusercontent.com/u/404729?v=4", + "profile": "https://github.com/imjennyli", + "contributions": [ + "doc" + ] } ] } diff --git a/README.md b/README.md index f737d050a2..93b2eb5111 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ [![Build Status](https://travis-ci.org/snipe/snipe-it.svg?branch=develop)](https://travis-ci.org/snipe/snipe-it) [![Stories in Ready](https://badge.waffle.io/snipe/snipe-it.png?label=ready+for+dev&title=Ready+for+development)](http://waffle.io/snipe/snipe-it) [![Maintenance](https://img.shields.io/maintenance/yes/2017.svg)]() [![Crowdin](https://d322cqt584bo4o.cloudfront.net/snipe-it/localized.png)](https://crowdin.com/project/snipe-it) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/snipe/snipe-it?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) [![Docker Pulls](https://img.shields.io/docker/pulls/snipe/snipe-it.svg)](https://hub.docker.com/r/snipe/snipe-it/) [![Twitter Follow](https://img.shields.io/twitter/follow/snipeyhead.svg?style=social)](https://twitter.com/snipeyhead) [![Zenhub](https://raw.githubusercontent.com/ZenHubIO/support/master/zenhub-badge.png)](https://zenhub.io) [![Codacy Badge](https://api.codacy.com/project/badge/Grade/553ce52037fc43ea99149785afcfe641)](https://www.codacy.com/app/snipe/snipe-it?utm_source=github.com&utm_medium=referral&utm_content=snipe/snipe-it&utm_campaign=Badge_Grade) -[![All Contributors](https://img.shields.io/badge/all_contributors-81-orange.svg?style=flat-square)](#contributors) +[![All Contributors](https://img.shields.io/badge/all_contributors-82-orange.svg?style=flat-square)](#contributors) ## Snipe-IT - Open Source Asset Management System @@ -67,7 +67,7 @@ Thanks goes to all of these wonderful people ([emoji key](https://github.com/ken | [
Jay Richards](http://www.cordeos.com)
[💻](https://github.com/snipe/snipe-it/commits?author=technogenus "Code") | [
Alexander Innes](https://necurity.co.uk)
[💻](https://github.com/snipe/snipe-it/commits?author=leostat "Code") | [
Danny Garcia](https://buzzedword.codes)
[💻](https://github.com/snipe/snipe-it/commits?author=buzzedword "Code") | [
archpoint](https://github.com/archpoint)
[💻](https://github.com/snipe/snipe-it/commits?author=archpoint "Code") | [
Jake McGraw](http://www.jakemcgraw.com)
[💻](https://github.com/snipe/snipe-it/commits?author=jakemcgraw "Code") | [
FleischKarussel](https://github.com/FleischKarussel)
[📖](https://github.com/snipe/snipe-it/commits?author=FleischKarussel "Documentation") | [
Dylan Yi](https://github.com/feeva)
[💻](https://github.com/snipe/snipe-it/commits?author=feeva "Code") | | [
Gil Rutkowski](http://FlashingCursor.com)
[💻](https://github.com/snipe/snipe-it/commits?author=flashingcursor "Code") | [
Desmond Morris](http://www.desmondmorris.com)
[💻](https://github.com/snipe/snipe-it/commits?author=desmondmorris "Code") | [
Nick Peelman](http://peelman.us)
[💻](https://github.com/snipe/snipe-it/commits?author=peelman "Code") | [
Abraham Vegh](https://abrahamvegh.com)
[💻](https://github.com/snipe/snipe-it/commits?author=abrahamvegh "Code") | [
Mohamed Rashid](https://github.com/rashivkp)
[📖](https://github.com/snipe/snipe-it/commits?author=rashivkp "Documentation") | [
Kasey](http://hinchk.github.io)
[💻](https://github.com/snipe/snipe-it/commits?author=HinchK "Code") | [
Brett](https://github.com/BrettFagerlund)
[⚠️](https://github.com/snipe/snipe-it/commits?author=BrettFagerlund "Tests") | | [
Jason Spriggs](http://jasonspriggs.com)
[💻](https://github.com/snipe/snipe-it/commits?author=jasonspriggs "Code") | [
Nate Felton](http://n8felton.wordpress.com)
[💻](https://github.com/snipe/snipe-it/commits?author=n8felton "Code") | [
Manasses Ferreira](http://homepages.dcc.ufmg.br/~manassesferreira)
[💻](https://github.com/snipe/snipe-it/commits?author=manassesferreira "Code") | [
Steve](https://github.com/steveelwood)
[⚠️](https://github.com/snipe/snipe-it/commits?author=steveelwood "Tests") | [
matc](http://twitter.com/matc)
[⚠️](https://github.com/snipe/snipe-it/commits?author=matc "Tests") | [
Cole R. Davis](http://www.davisracingteam.com)
[⚠️](https://github.com/snipe/snipe-it/commits?author=VanillaNinjaD "Tests") | [
gibsonjoshua55](https://github.com/gibsonjoshua55)
[💻](https://github.com/snipe/snipe-it/commits?author=gibsonjoshua55 "Code") | -| [
Robin Temme](https://github.com/zwerch)
[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [
Iman](https://github.com/imanghafoori1)
[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [
Richard Hofman](https://github.com/richardhofman6)
[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [
gizzmojr](https://github.com/gizzmojr)
[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | +| [
Robin Temme](https://github.com/zwerch)
[💻](https://github.com/snipe/snipe-it/commits?author=zwerch "Code") | [
Iman](https://github.com/imanghafoori1)
[💻](https://github.com/snipe/snipe-it/commits?author=imanghafoori1 "Code") | [
Richard Hofman](https://github.com/richardhofman6)
[💻](https://github.com/snipe/snipe-it/commits?author=richardhofman6 "Code") | [
gizzmojr](https://github.com/gizzmojr)
[💻](https://github.com/snipe/snipe-it/commits?author=gizzmojr "Code") | [
Jenny Li](https://github.com/imjennyli)
[📖](https://github.com/snipe/snipe-it/commits?author=imjennyli "Documentation") | This project follows the [all-contributors](https://github.com/kentcdodds/all-contributors) specification. Contributions of any kind welcome! From f6d8642799a3b88790d286bb0d747297c505e0b1 Mon Sep 17 00:00:00 2001 From: snipe Date: Thu, 5 Oct 2017 00:35:37 -0700 Subject: [PATCH 5/5] Fix $search variable to $search_var for new filter --- app/Models/Asset.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/app/Models/Asset.php b/app/Models/Asset.php index 2f7d221157..87c8e147ab 100644 --- a/app/Models/Asset.php +++ b/app/Models/Asset.php @@ -856,10 +856,10 @@ class Asset extends Depreciable } if ($key =='checkedout_to') { - $query->whereHas('assigneduser', function ($query) use ($search) { - $query->where(function ($query) use ($search) { - $query->where('users.first_name', 'LIKE', '%' . $search . '%') - ->orWhere('users.last_name', 'LIKE', '%' . $search . '%'); + $query->whereHas('assigneduser', function ($query) use ($search_val) { + $query->where(function ($query) use ($search_val) { + $query->where('users.first_name', 'LIKE', '%' . $search_val . '%') + ->orWhere('users.last_name', 'LIKE', '%' . $search_val . '%'); }); }); } @@ -876,8 +876,8 @@ class Asset extends Depreciable } if ($key =='category') { - $query->whereHas('model', function ($query) use ($search) { - $query->whereHas('category', function ($query) use ($search) { + $query->whereHas('model', function ($query) use ($search_val) { + $query->whereHas('category', function ($query) use ($search_val) { $query->where(function ($query) use ($search_val) { $query->where('categories.name', 'LIKE', '%' . $search_val . '%') ->orWhere('models.name', 'LIKE', '%' . $search_val . '%')