Adjust to renamed Model::onlyFields and Model::loaded methods

demos/collection/multitable.php

@@ -41,7 +41,7 @@ public function setModel(Model $model, $route = []): void
             $path[] = $id;
             $pushModel = new $model($model->persistence);
             $pushModel = $pushModel->tryLoad($id);
-            if (!$pushModel->loaded()) {
+            if (!$pushModel->isLoaded()) {
                 break;
             }
             $ref = array_shift($route);

demos/init-db.php

@@ -166,7 +166,7 @@ public function validate($intent = null): array
 
         // look if name is unique
         $c = $this->getModel()->tryLoadBy($this->fieldName()->name, $this->name);
-        if ($c->loaded() && $c->getId() !== $this->getId()) {
+        if ($c->isLoaded() && $c->getId() !== $this->getId()) {
             $errors[$this->fieldName()->name] = 'Country name must be unique';
         }
 

demos/tutorial/intro.php

@@ -151,7 +151,7 @@ protected function init(): void
         $model = $model->tryLoad(1);
         $form->setModel($model);
 
-        if (!$model->loaded()) {
+        if (!$model->isLoaded()) {
             // set default data
             $model->setMulti([
                 'id' => 1,
@@ -210,7 +210,7 @@ protected function init(): void
 
         Header::addTo($owner, ['Record display in Card View using model data.']);
         $model = $model->tryLoad(1);
-        if ($model->loaded()) {
+        if ($model->isLoaded()) {
             \Atk4\Ui\Card::addTo($owner, ['useLabel' => true])
                 ->setModel($model);
         } else {

docs/app.rst

@@ -90,7 +90,7 @@ active. (See :ref:`system_pattern`)::
             }
 
             // Make sure user is valid
-            if(!$this->user->loaded()) {
+            if (!$this->user->isLoaded()) {
                 $this->initLayout([\Atk4\Ui\Layout\Centered::class]);
                 Message::addTo($this, ['Login Required', 'error']);
                 Button::addTo($this, ['Login', 'primary'])->link('index.php');

docs/form.rst

@@ -436,7 +436,7 @@ POST data to submit itself and will re-use the query string, so you can also saf
 use any GET arguments for passing record $id. You may also perform model load after
 record association. This gives the benefit of not loading any other fields, unless
 they're marked as System (https://agile-data.readthedocs.io/en/develop/fields.html#Field::$system),
-see https://agile-data.readthedocs.io/en/develop/model.html?highlight=onlyfields#Model::onlyFields::
+see https://agile-data.readthedocs.io/en/develop/model.html?highlight=onlyfields#Model::setOnlyFields::
 
     $form = Form::addTo($app);
     $form->setModel((new User($db))->load($current_user), ['email', 'name']);

src/Card.php

@@ -182,9 +182,7 @@ public function addContent(View $view)
      */
     public function setModel(Model $model, array $fields = null): void
     {
-        if (!$model->loaded()) {
-            throw new Exception('Model need to be loaded.');
-        }
+        $model->assertIsLoaded();
 
         parent::setModel($model);
 
@@ -290,7 +288,7 @@ public function addClickAction(Model\UserAction $action, Button $button = null,
         $btn = $this->addButton($button ?? $this->getExecutorFactory()->createTrigger($action, $this->getExecutorFactory()::CARD_BUTTON));
 
         // Setting arg for model id. $args[0] is consider to hold a model id, i.e. as a js expression.
-        if ($this->model && $this->model->loaded() && !isset($args[0])) {
+        if ($this->model && $this->model->isLoaded() && !isset($args[0])) {
             $defaults[] = $this->model->getId();
         }
 

src/CardDeck.php

@@ -228,7 +228,7 @@ protected function jsExecute($return, $action)
         } elseif (is_array($return) || $return instanceof JsExpressionable) {
             return $return;
         } elseif ($return instanceof Model) {
-            $msg = $return->loaded() ? $this->saveMsg : ($action->appliesTo === Model\UserAction::APPLIES_TO_SINGLE_RECORD ? $this->deleteMsg : $this->defaultMsg);
+            $msg = $return->isLoaded() ? $this->saveMsg : ($action->appliesTo === Model\UserAction::APPLIES_TO_SINGLE_RECORD ? $this->deleteMsg : $this->defaultMsg);
 
             return $this->jsModelReturn($action, $msg);
         }
@@ -256,7 +256,7 @@ protected function getNotifier(string $msg = null, Model\UserAction $action = nu
     protected function jsModelReturn(Model\UserAction $action = null, string $msg = 'Done!'): array
     {
         $js[] = $this->getNotifier($msg, $action);
-        if ($action->getModel()->loaded() && $card = $this->findCard($action->getModel())) {
+        if ($action->getModel()->isLoaded() && $card = $this->findCard($action->getModel())) {
             $js[] = $card->jsReload($this->getReloadArgs());
         } else {
             $js[] = $this->container->jsReload($this->getReloadArgs());

src/CardSection.php

@@ -50,9 +50,7 @@ public function addDescription($description)
      */
     public function addFields(Model $model, array $fields, bool $useLabel = false, bool $useTable = false)
     {
-        if (!$model->loaded()) {
-            throw new Exception('Model need to be loaded.');
-        }
+        $model->assertIsLoaded();
 
         if ($useTable) {
             $this->addTableSection($model, $fields);

src/CardTable.php

@@ -27,10 +27,7 @@ public function setModel(Model $model, array $columns = null): void
             return;
         }
 
-        if (!$model->loaded()) {
-            throw (new Exception('Model must be loaded'))
-                ->addMoreInfo('model', $model);
-        }
+        $model->assertIsLoaded();
 
         $data = [];
         foreach ($model->get() as $key => $value) {

src/Component/InlineEdit.php

@@ -107,7 +107,7 @@ public function setModel(Model $model): void
         parent::setModel($model);
 
         $this->fieldName = $this->fieldName ?: $this->model->title_field;
-        if ($this->autoSave && $this->model->loaded()) {
+        if ($this->autoSave && $this->model->isLoaded()) {
             $value = $_POST['value'] ?? null;
             $this->cb->set(function () use ($value) {
                 try {
@@ -190,7 +190,7 @@ protected function renderView(): void
             throw new Exception('Only string or number field can be edited inline. Field Type = ' . $type);
         }
 
-        if ($this->model && $this->model->loaded()) {
+        if ($this->model && $this->model->isLoaded()) {
             $initValue = $this->model->get($this->fieldName);
         } else {
             $initValue = $this->initValue;

src/Form/Control/Dropdown.php

@@ -254,7 +254,7 @@ protected function htmlRenderValue(): void
                 }
             } else {
                 // for standard model rendering, only load id and title field
-                $this->model->only_fields = [$this->model->title_field, $this->model->id_field];
+                $this->model->setOnlyFields([$this->model->title_field, $this->model->id_field]);
                 $this->_renderItemsForModel();
             }
         } else {

src/Form/Control/Lookup.php

@@ -278,7 +278,7 @@ protected function initQuickNewRecord()
 
             $entity = $this->model->createEntity();
 
-            $form->setModel($entity->onlyFields($this->plus['fields'] ?? []));
+            $form->setModel($entity->setOnlyFields($this->plus['fields'] ?? []));
 
             $form->onSubmit(function (\Atk4\Ui\Form $form) {
                 $form->model->save();
@@ -440,7 +440,7 @@ protected function renderView(): void
 
             $this->model = $this->model->tryLoadBy($id_field, $this->entityField->get());
 
-            if ($this->model->loaded()) {
+            if ($this->model->isLoaded()) {
                 $row = $this->renderRow($this->model);
 
                 $chain->dropdown('set value', $row['value'])->dropdown('set text', $row['title']);

src/Form/Control/Multiline.php

@@ -568,7 +568,7 @@ public function setLookupOptionValue(Field $field, string $value)
     {
         $model = $field->getReference()->refModel($this->model);
         $rec = $model->tryLoadBy($field->getReference()->getTheirFieldName(), $value);
-        if ($rec->loaded()) {
+        if ($rec->isLoaded()) {
             $option = [
                 'key' => $value,
                 'text' => $rec->get($model->title_field),

src/Form/Control/ScopeBuilder.php

@@ -742,7 +742,7 @@ protected static function getOption(string $type, string $value, Condition $cond
                 $model = $reference->refModel($condField->getOwner());
                 $fieldName = $reference->getTheirFieldName();
                 $rec = $model->tryLoadBy($fieldName, $value);
-                if ($rec->loaded()) {
+                if ($rec->isLoaded()) {
                     $option = [
                         'key' => $value,
                         'text' => $rec->get($model->title_field),