Updates on PMA\Template class #1671
Conversation
|
Hi, |
| include $template; | ||
| } else { | ||
| throw new \LogicException( | ||
| 'The template "' . $template . '" not found.' |
There was a problem hiding this comment.
I think that we should use translation here.
There was a problem hiding this comment.
I think it is intended more for the developers if they do happen to type a wrong template name, so we may choose to skip translating it. Its thrown again in catch, so if a user does see a Fatal error, can just copy it and report to us, as user not expected to really do something about it.
|
@gzzhanghao Please update it such as to have only changes on top of the current master. (so it will just include addition of trim function and all template class unit tests) |
Signed-off-by: Madhura Jayaratne <madhura.cj@gmail.com>
gzzhanghao
force-pushed
the
template
branch
2 times, most recently
from
83856cc
to
80bd966
Compare
- Introduce `trim` method for templates - Complete template of the designer module - Update tests for template system - Use phtml as template files extension Signed-off-by: Jason <jason.daurus@gmail.com>
|
@gzzhanghao It would have been better had you done separate things in a new PR, but for now, please update the title/description as well for this PR, maybe as mentioned in your commit message. |
| if (strstr($tab_column[$t_n]["TYPE"][$j], 'char') | ||
| || strstr($tab_column[$t_n]["TYPE"][$j], 'text') | ||
| ) { | ||
| $type = '_char'; |
There was a problem hiding this comment.
This must be .= here and at other similar places.
|
Overall looks very good to me, make the changes as mentioned in above comments, and its ready to merge. |
gzzhanghao
changed the title
Signed-off-by: Jason <jason.daurus@gmail.com>
| <?php if (isset($tables_pk_or_unique_keys[$t_n . "." . $tab_column[$t_n]["COLUMN_NAME"][$j]])) : ?> | ||
| <img src="<?php echo $_SESSION['PMA_Theme']->getImgPath('pmd/FieldKey_small.png'); ?>" alt="*" /> | ||
| <?php else : | ||
| $type = 'pma/Field_small'; |
Signed-off-by: Jason <jason.daurus@gmail.com>
|
@zixtor The typo problem was fixed in the newest commit. Please merge :-) |
| @@ -18,7 +18,7 @@ xgettext \ | |||
| --from-code=utf-8 \ | |||
| --keyword=__ --keyword=_pgettext:1c,2 --keyword=_ngettext:1,2 \ | |||
| --copyright-holder="phpMyAdmin devel team" \ | |||
| `find . -name '*.php' -not -path './test/*' -not -path './po/*' -not -path './release/*' | sort` | |||
| `find . -name '*.php' -o -name '*.phtml' -not -path './test/*' -not -path './po/*' -not -path './release/*' | sort` | |||
There was a problem hiding this comment.
@gzzhanghao One more thing, this find now seems to be resulting in ./test/* files as well, using regex seems ok to me:-
find -regex '..(php|phtml)' -not -path './test/' -not -path './po/' -not -path './release/' | sort
Signed-off-by: Jason <jason.daurus@gmail.com>
|
@zixtor Thank you for providing a idea on solving this problem. Now the problem should have been fixed :-) |
|
Thanks! |
Updates on Template class.
trimmethod to Template class. Now the usage is changed to:Template::get($template_script_name)->render($data, [$trim = true]);The
$trimparameter in the render function indicate whether it should eliminate white spaces between HTML tags and its values. This feature is set to ON by default; You can disable it by simply passingfalse.trimis also provided as a static method.