Rename views and urls accordingly

Merge:	releng/9.1.0

gui/freeadmin/api/resources.py

@@ -824,7 +824,7 @@ def dehydrate(self, bundle):
         bundle.data['_jail_storage_add_url'] = reverse('jail_storage_add', kwargs={
             'jail_id': bundle.obj.id
         })
-        bundle.data['_plugin_install_url'] = reverse('plugin_install', kwargs={
+        bundle.data['_upload_url'] = reverse('upload', kwargs={
             'jail_id': bundle.obj.id
         })
         bundle.data['_jail_export_url'] = reverse('jail_export', kwargs={
@@ -966,7 +966,7 @@ def get_list(self, request, **kwargs):
 
     def dehydrate(self, bundle):
         bundle.data['_install_url'] = reverse(
-            'plugin_install_available',
+            'plugins_install_available',
             kwargs={'oid': bundle.obj.hash},
         )
         return bundle

gui/jails/admin.py

@@ -166,7 +166,7 @@ def get_actions(self):
 
         actions['edit'] = self._action_builder('edit', icon=_("Edit Jail"), label=_("Edit Jail"))
         actions['storage'] = self._action_builder('jail_storage_add', label=_("Add Storage"))
-        actions['plugins'] = self._action_builder('plugin_install', label=_("Install Plugins"))
+        actions['plugins'] = self._action_builder('upload', label=_("Install Plugins"))
         #actions['export'] = self._action_builder('jail_export', label=_("Export Jail"))
         #actions['import'] = self._action_builder('jail_import', label=_("Import Jail"))
         actions['start'] = self._action_builder('jail_start', label=_("Start"))

gui/plugins/urls.py

@@ -33,9 +33,9 @@
 urlpatterns = patterns('freenasUI.plugins.views',
     url(r'^plugin/home/$', 'home', name="plugins_home"),
     url(r'^plugin/plugins/$', 'plugins', name="plugins_plugins"),
-    url(r'^plugin/install/(?P<oid>[0-9a-f]{32,64})/$', 'plugin_install_available', name="plugin_install_available"),
-    url(r'^plugin/install/(?P<jail_id>\d+)/$', 'plugin_install', name="plugin_install"),
-    url(r'^plugin/install/$', 'plugin_install_nojail', name="plugin_install_nojail"),
+    url(r'^plugin/install/(?P<oid>[0-9a-f]{32,64})/$', 'install_available', name="plugins_install_available"),
+    url(r'^plugin/upload/(?P<jail_id>\d+)/$', 'upload', name="plugins_upload"),
+    url(r'^plugin/upload/$', 'upload_nojail', name="plugins_upload_nojail"),
     url(r'^plugin/install/progress/$', 'install_progress', name="plugins_install_progress"),
     url(r'^plugin/edit/(?P<plugin_id>\d+)/$', 'plugin_edit', name="plugin_edit"),
     url(r'^plugin/info/(?P<plugin_id>\d+)/$', 'plugin_info', name="plugin_info"),

gui/plugins/views.py

@@ -163,7 +163,7 @@ def plugin_update(request, plugin_id):
     })
 
 
-def plugin_install_available(request, oid):
+def install_available(request, oid):
 
     plugin = None
     conf = models.Configuration.objects.latest('id')
@@ -230,7 +230,7 @@ def install_progress(request):
     return HttpResponse('{}')
 
 
-def plugin_install(request, jail_id=-1):
+def upload(request, jail_id=-1):
     plugin_upload_path = notifier().get_plugin_upload_path()
     notifier().change_upload_location(plugin_upload_path)
 
@@ -265,13 +265,13 @@ def plugin_install(request, jail_id=-1):
     else:
         form = forms.PBIUploadForm(jail=jail)
 
-    return render(request, "plugins/plugin_install.html", {
+    return render(request, "plugins/upload.html", {
         'form': form,
     })
 
 
-def plugin_install_nojail(request):
-    return plugin_install(request)
+def upload_nojail(request):
+    return upload(request)
 
 
 @public

gui/templates/plugins/available_datagrid.html

@@ -22,7 +22,7 @@
   <img src="{{ STATIC_URL }}images/ui/buttons/plugin_install.png" />
   <p>{% trans "Upload" %}</p>
   <script type="dojo/method" data-dojo-event="onClick" data-dojo-args="evt">
-    addObject('{% trans "Install Plugin"|force_escape|force_escape %}', '{% url "plugin_install_nojail" %}', [this,]);
+    addObject('{% trans "Install Plugin"|force_escape|force_escape %}', '{% url "plugins_upload_nojail" %}', [this,]);
   </script>
 </button>
 {% endblock %}