Re: [Freeipa-devel] [PATCH] admiyo-0087-demo-deploy

2010-11-15 Thread Adam Young 

On 11/15/2010 01:22 PM, Adam Young wrote:



___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

Rebased ontop of current stack, to include my patch 0090.
From 2d22c0486ed069689d0d28f975aa4f40f873987c Mon Sep 17 00:00:00 2001
From: Adam Young 
Date: Mon, 15 Nov 2010 13:20:07 -0500
Subject: [PATCH] demo deploy
 Makes it easier to deploy demos.  This version will demo cleanly from html
 providing you just set

that.use_static_files = true;

in the IPA definition section
---
 install/static/ipa.js |   11 ++-
 1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/install/static/ipa.js b/install/static/ipa.js
index ab69d5a..4a01d9f 100644
--- a/install/static/ipa.js
+++ b/install/static/ipa.js
@@ -28,8 +28,13 @@ var IPA = ( function () {
 jsonrpc_id: 0
 };
 
-that.json_url = null;
 that.use_static_files = false;
+that.json_url = '/ipa/json';
+if (that.use_static_files){
+that.json_url = 'test/data'
+}
+
+
 
 that.ajax_options = {
 type: 'POST',
@@ -353,10 +358,6 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname)
 
 var url = IPA.json_url;
 
-if (!url){
-url = default_json_url;
-}
-
 if (IPA.use_static_files){
 url += '/' + method_name + '.json';
 }
-- 
1.7.1

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel

[Freeipa-devel] [PATCH] admiyo-0087-demo-deploy

2010-11-15 Thread Adam Young 


From 5a32034076d439e5fa12bcfb544d1a805f553069 Mon Sep 17 00:00:00 2001
From: Adam Young 
Date: Mon, 15 Nov 2010 13:20:07 -0500
Subject: [PATCH] demo deploy
 Makes it easier to deploy demos.  This version will demo cleanly from html
 providing you just set

that.use_static_files = true;

in the IPA definition section
---
 install/static/ipa.js |   13 +++--
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/install/static/ipa.js b/install/static/ipa.js
index 8b8052cf3f1fb914873a267a23d9a1e5cacfe1d8..aae7793bb52c9d25840807db7f4b9d4fd4d62e4f 100644
--- a/install/static/ipa.js
+++ b/install/static/ipa.js
@@ -28,8 +28,13 @@ var IPA = ( function () {
 jsonrpc_id: 0
 };
 
-that.json_url = null;
 that.use_static_files = false;
+that.json_url = '/ipa/json';
+if (that.use_static_files){
+that.json_url = 'test/data'
+}
+
+
 
 that.ajax_options = {
 type: 'POST',
@@ -297,12 +302,8 @@ function ipa_cmd(name, args, options, win_callback, fail_callback, objname)
 
 var url = IPA.json_url;
 
-if (!url){
-url = default_json_url;
-}
-
 if (IPA.use_static_files){
-url = 'test/data/' + method_name + '.json';
+url += '/' + method_name + '.json';
 }
 var data = {
 method: method_name,
-- 
1.7.1

___
Freeipa-devel mailing list
Freeipa-devel@redhat.com
https://www.redhat.com/mailman/listinfo/freeipa-devel