some fixes + added zf console
This commit is contained in:
parent
08b0d4e843
commit
6d4004ae33
@ -5,6 +5,7 @@
|
|||||||
"zendframework/zend-validator": "2.2.*",
|
"zendframework/zend-validator": "2.2.*",
|
||||||
"zendframework/zend-log": "2.2.*",
|
"zendframework/zend-log": "2.2.*",
|
||||||
"zendframework/zend-mail": "2.2.*",
|
"zendframework/zend-mail": "2.2.*",
|
||||||
|
"zendframework/zend-console": "2.2.*",
|
||||||
"symfony/yaml": "2.3.*",
|
"symfony/yaml": "2.3.*",
|
||||||
"leafo/scssphp": "0.0.8",
|
"leafo/scssphp": "0.0.8",
|
||||||
"toopay/assetic-minifier": "1.0.0"
|
"toopay/assetic-minifier": "1.0.0"
|
||||||
|
@ -487,7 +487,7 @@ abstract class Base
|
|||||||
$this->isNewRecord = false;
|
$this->isNewRecord = false;
|
||||||
|
|
||||||
$this->attributes = $data->attributes();
|
$this->attributes = $data->attributes();
|
||||||
// $this->init();
|
$this->loadedAssociations = [];
|
||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -104,7 +104,7 @@ trait AttributeMethods
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ((string)$this->getAttribute($name) != (string)$value) {
|
if ((string)$this->getAttribute($name) != (string)$value) {
|
||||||
$this->setChangedAttribute($name, $value);
|
$this->setChangedAttribute($name, $this->$name);
|
||||||
}
|
}
|
||||||
$this->attributes[$name] = $value;
|
$this->attributes[$name] = $value;
|
||||||
return $this;
|
return $this;
|
||||||
|
File diff suppressed because one or more lines are too long
@ -7,7 +7,7 @@
|
|||||||
</head>
|
</head>
|
||||||
<body>
|
<body>
|
||||||
<div id="notice-container"></div>
|
<div id="notice-container"></div>
|
||||||
<div class="navbar navbar-inverse navbar-fixed-top">
|
<div class="navbar navbar-inverse navbar-fixed-top" role="banner">
|
||||||
<div class="container">
|
<div class="container">
|
||||||
<div class="navbar-header">
|
<div class="navbar-header">
|
||||||
<?= $this->linkTo('RailsPanel', '#index', ['class' => 'navbar-brand']) ?>
|
<?= $this->linkTo('RailsPanel', '#index', ['class' => 'navbar-brand']) ?>
|
||||||
@ -36,8 +36,7 @@
|
|||||||
<?= $this->content() ?>
|
<?= $this->content() ?>
|
||||||
</div>
|
</div>
|
||||||
<hr />
|
<hr />
|
||||||
<footer><p>© 2013 <em>PHP on Rails</em></p></footer>
|
<footer><p>© 2013 <em>RailsPHP Framework</em></p></footer>
|
||||||
</div>
|
</div>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user