tyler.durden
/
opensupports
mirror of https://github.com/opensupports/opensupports.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ivan - Fix StaffEditor issues [skip ci]

This commit is contained in:
ivan 2017-04-20 21:54:04 -03:00
parent bd52d7b680
commit 7b8226f579
4 changed files with 7 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/gulp/config.js
View File

@ -2,7 +2,7 @@
module.exports = {
'serverport': 3000,
'serverport': 4000,
'scripts': {
'src': './src/*.js',

2
client/src/app/admin/panel/staff/staff-editor.js
View File

@ -198,7 +198,7 @@ class StaffEditor extends React.Component {
<div className="staff-editor__delete-title">
{i18n('DELETE_STAFF_MEMBER')}
</div>
<Button onClick={AreYouSure.openModal.bind(this, i18n('WILL_DELETE_STAFF'), this.onDeleteClick.bind(this))}>
<Button onClick={() => AreYouSure.openModal(i18n('WILL_DELETE_STAFF'), this.onDeleteClick.bind(this))}>
{i18n('DELETE_STAFF_MEMBER')}
</Button>
</div>

2
client/src/app/admin/panel/staff/staff-editor.scss
View File

@ -136,7 +136,7 @@
position: absolute;
bottom: 0;
right: 0;
width: 180px;
min-width: 180px;
}
&__update-email,

18
server/config.php
View File

@ -1,15 +1,5 @@
<?php
$env['MYSQL_SERVER'] = getenv('MYSQL_SERVER');
$env['MYSQL_USER'] = getenv('MYSQL_USER');
$env['MYSQL_PASSWORD'] = getenv('MYSQL_PASSWORD');
$env['MYSQL_DATABASE'] = getenv('MYSQL_DATABASE');
$mysql_host = ($env['MYSQL_SERVER']) ? $env['MYSQL_SERVER'] : 'localhost';
$mysql_user = ($env['MYSQL_USER']) ? $env['MYSQL_USER'] : 'root';
$mysql_password = ($env['MYSQL_PASSWORD']) ? $env['MYSQL_PASSWORD'] : '';
$mysql_database = ($env['MYSQL_DATABASE']) ? $env['MYSQL_DATABASE'] : 'development';
define('MYSQL_HOST', $mysql_host);
define('MYSQL_USER', $mysql_user);
define('MYSQL_PASSWORD', $mysql_password);
define('MYSQL_DATABASE', $mysql_database);
define('MYSQL_HOST', 'localhost');
define('MYSQL_USER', 'root');
define('MYSQL_PASSWORD', '');
define('MYSQL_DATABASE', 'development');