You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by jk...@apache.org on 2019/11/29 10:43:13 UTC
[netbeans-tools] branch master updated: Fixing order of JS libs
loaded, fixing img upload from public registration proces.
This is an automated email from the ASF dual-hosted git repository.
jkovalsky pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans-tools.git
The following commit(s) were added to refs/heads/master by this push:
new 65f5c0f Fixing order of JS libs loaded, fixing img upload from public registration proces.
new 82aded7 Merge pull request #19 from jpirek/master
65f5c0f is described below
commit 65f5c0fd16e1c189f0c04d75c601304b4c024bb7
Author: Jan Pirek <ja...@oracle.com>
AuthorDate: Fri Nov 29 10:51:28 2019 +0100
Fixing order of JS libs loaded, fixing img upload from public registration proces.
---
.../src/Application/Controller/PluginController.php | 12 ++++++------
pp3/module/Application/view/layout/layout.phtml | 3 +--
2 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pp3/module/Application/src/Application/Controller/PluginController.php b/pp3/module/Application/src/Application/Controller/PluginController.php
index fe1db41..dc21426 100644
--- a/pp3/module/Application/src/Application/Controller/PluginController.php
+++ b/pp3/module/Application/src/Application/Controller/PluginController.php
@@ -177,12 +177,6 @@ class PluginController extends AuthenticatedController {
}
}
}
- // save image
- $im = $this->handleImgUpload($this->_config['pp3']['catalogSavepath'].'/plugins/'.$plugin->getId());
- if ($im) {
- $plugin->setImage($im);
- }
-
// categ
$plugin->removeCategories();
$this->_pluginRepository->persist($plugin);
@@ -198,6 +192,12 @@ class PluginController extends AuthenticatedController {
$plugin->addCategory($cat2);
}
}
+ // save image
+ $im = $this->handleImgUpload($this->_config['pp3']['catalogSavepath'].'/plugins/'.$plugin->getId());
+ if ($im) {
+ $plugin->setImage($im);
+ }
+
$this->_pluginRepository->persist($plugin);
$this->flashMessenger()->setNamespace('success')->addMessage('Plugin registered.');
diff --git a/pp3/module/Application/view/layout/layout.phtml b/pp3/module/Application/view/layout/layout.phtml
index 00a0176..7096bab 100755
--- a/pp3/module/Application/view/layout/layout.phtml
+++ b/pp3/module/Application/view/layout/layout.phtml
@@ -30,7 +30,6 @@
->appendName('viewport', 'width=device-width, initial-scale=1.0')
->appendHttpEquiv('X-UA-Compatible', 'IE=edge')
?>
-
<!-- Le styles -->
<?php
echo $this->headLink()
@@ -48,8 +47,8 @@
->prependFile($this->basePath('js/jquery.ba-throttle-debounce.min.js'))
->prependFile($this->basePath('js/validator.min.js'))
->prependFile($this->basePath('js/bootstrap.min.js'))
- ->prependFile($this->basePath('js/jquery.min.js'))
->prependFile($this->basePath('js/jquery-ui-1.12.1.min.js'))
+ ->prependFile($this->basePath('js/jquery.min.js'))
->prependFile($this->basePath('js/respond.min.js'), 'text/javascript',
array('conditional' => 'lt IE 9',))
->prependFile($this->basePath('js/html5shiv.min.js'), 'text/javascript',
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists