From 8912b953e675a2922b9497dd7adca3e6d364f2b2 Mon Sep 17 00:00:00 2001
From: makkalot <makkalot@gmail.com>
Date: Mon, 16 Jun 2008 12:18:08 +0300
Subject: adding implementation for methods without arguments for those that
 birngup some info

---
 funcweb/funcweb/controllers.py | 28 ++++++++++++++++------------
 1 file changed, 16 insertions(+), 12 deletions(-)

(limited to 'funcweb')

diff --git a/funcweb/funcweb/controllers.py b/funcweb/funcweb/controllers.py
index f3ffead..b2a2ca9 100644
--- a/funcweb/funcweb/controllers.py
+++ b/funcweb/funcweb/controllers.py
@@ -34,6 +34,7 @@ class Root(controllers.RootController):
             #FIXME slow really i know !
             for module in modules.itervalues():
                 for mod in module:
+                    #if it is not empty
                     if getattr(fc,mod).get_method_args()[name]:
                         display_modules.append(mod)
             modules = {}
@@ -50,15 +51,6 @@ class Root(controllers.RootController):
                             tg_template="funcweb.templates.module")
 
 
-    @expose(template="funcweb.templates.run")
-    #@identity.require(identity.not_anonymous())
-    def run(self, minion="*", module=None, method=None, arguments=''):
-        fc = Overlord(minion)
-        results = getattr(getattr(fc, module), method)(*arguments.split())
-        cmd = "%s.%s.%s(%s)" % (minion, module, method, arguments)
-        return dict(cmd=cmd, results=results)
-
-
     @expose(template="funcweb.templates.method_args")
     #@identity.require(identity.not_anonymous())
     def method_display(self,minion=None,module=None,method=None):
@@ -68,7 +60,7 @@ class Root(controllers.RootController):
         
         if not method_args.values():
             print "Not registered method here"
-            return dict(minion_form = None)
+            return dict(minion_form = None,minion=minion,module=module,method=method)
 
         the_one = method_args[minion][method]['args']
         if the_one:
@@ -83,9 +75,9 @@ class Root(controllers.RootController):
             #print minion_form.fields
 
             #print minion_form
-            return dict(minion_form=minion_form)
+            return dict(minion_form =minion_form,minion=minion,module=module,method=method)
         else:
-            return dict(minion_form = None)
+            return dict(minion_form = None,minion=minion,module=module,method=method)
 
 
     @expose(template="funcweb.templates.login")
@@ -149,6 +141,18 @@ class Root(controllers.RootController):
         else:
             return "Missing arguments sorry can not proceess the form"
 
+    @expose(template="funcweb.templates.method_args")
+    def execute_link(self,minion=None,module=None,method=None):
+        """
+        Method is fot those minion methods that dont accept any 
+        arguments so they provide only some information,executed
+        by pressing only the link !
+        """
+        fc = Overlord(minion)
+        result = getattr(getattr(fc,module),method)()
+        return str(result)
+
+
 
     @expose()
     def logout(self):
-- 
cgit