From 3939bf022711218175ee487386224c3c10394557 Mon Sep 17 00:00:00 2001
From: Rushabh Mehta <rmehta@gmail.com>
Date: Wed, 18 Apr 2012 12:34:24 +0530
Subject: [PATCH] permission engine bugfix

---
 js/core.min.js           |  6 +++++-
 js/legacy/utils/dom.js   | 19 -------------------
 js/wn/dom.js             | 33 ++++++++++++++++++++++++++++++++-
 py/webnotes/model/doc.py | 11 +++--------
 4 files changed, 40 insertions(+), 29 deletions(-)

diff --git a/js/core.min.js b/js/core.min.js
index 2aa280a80f..bff6d9d497 100644
--- a/js/core.min.js
+++ b/js/core.min.js
@@ -47,7 +47,11 @@ wn.dom.css=function(ele,s){if(ele&&s){for(var i in s)ele.style[i]=s[i];};return
 wn.get_cookie=function(c){var t=""+document.cookie;var ind=t.indexOf(c);if(ind==-1||c=="")return"";var ind1=t.indexOf(';',ind);if(ind1==-1)ind1=t.length;return unescape(t.substring(ind+c.length+1,ind1));}
 wn.dom.set_box_shadow=function(ele,spread){$(ele).css('-moz-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')
 $(ele).css('-webkit-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')
-$(ele).css('-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')}
+$(ele).css('-box-shadow','0px 0px '+spread+'px rgba(0,0,0,0.3);')};(function($){$.fn.add_options=function(options_list){for(var i=0;i<options_list.length;i++){var v=options_list[i];value=v.value||v;label=v.label||v;$('<option>').html(label).attr('value',value).appendTo(this);}
+$(this).val(options_list[0].value||options_list[0]);}
+$.fn.set_working=function(){var ele=this.get(0);if(ele.loading_img){$di(ele.loading_img)}else{ele.disabled=1;ele.loading_img=$('<img src="lib/images/ui/button-load.gif" \
+    style="margin-left: 4px; margin-bottom: -2px; display: inline;" />').insertAfter(ele);}}
+$.fn.done_working=function(){var ele=this.get(0);ele.disabled=0;if(ele.loading_img){$(ele.loading_img).toggle(false);};}})(jQuery);
 /*
  *	lib/js/wn/model.js
  */
diff --git a/js/legacy/utils/dom.js b/js/legacy/utils/dom.js
index cba34e6882..435f3a9d80 100644
--- a/js/legacy/utils/dom.js
+++ b/js/legacy/utils/dom.js
@@ -117,25 +117,6 @@ $item_pressed = function(ele) {
 	$bg(ele,'#F90'); $fg(ele,'#FFF');
 };
 
-(function($) {
-	$.fn.set_working = function() {
-		var ele = this.get(0);
-		if(ele.loading_img) { 
-			$di(ele.loading_img) 
-		} else {
-			ele.disabled = 1;
-			ele.loading_img = $a(ele.parentNode,'img','',
-				{marginLeft:'4px',marginBottom:'-2px',display:'inline'});
-			ele.loading_img.src = 'lib/images/ui/button-load.gif';
-		}		
-	}
-	$.fn.done_working = function() {
-		var ele = this.get(0);
-		ele.disabled = 0;
-		if(ele.loading_img) { $dh(ele.loading_img) };		
-	}
-})(jQuery);
-
 // set out of 100
 function set_opacity(ele, ieop) {
 	var op = ieop / 100;
diff --git a/js/wn/dom.js b/js/wn/dom.js
index 33f73d00fb..13f6973470 100644
--- a/js/wn/dom.js
+++ b/js/wn/dom.js
@@ -88,4 +88,35 @@ wn.dom.set_box_shadow = function(ele, spread) {
 	$(ele).css('-webkit-box-shadow', '0px 0px '+ spread +'px rgba(0,0,0,0.3);')
 	$(ele).css('-box-shadow', '0px 0px '+ spread +'px rgba(0,0,0,0.3);')
 	
-}
+};
+
+// add <option> list to <select>
+(function($) {
+	$.fn.add_options = function(options_list) {
+		// create options
+		for(var i=0; i<options_list.length; i++) {
+			var v = options_list[i];
+			value = v.value || v;
+			label = v.label || v;
+			$('<option>').html(label).attr('value', value).appendTo(this);
+		}
+		// select the first option
+		$(this).val(options_list[0].value || options_list[0]);
+	}
+	$.fn.set_working = function() {
+		var ele = this.get(0);
+		if(ele.loading_img) { 
+			$di(ele.loading_img) 
+		} else {
+			ele.disabled = 1;
+			ele.loading_img = $('<img src="lib/images/ui/button-load.gif" \
+				style="margin-left: 4px; margin-bottom: -2px; display: inline;" />')
+				.insertAfter(ele);			
+		}		
+	}
+	$.fn.done_working = function() {
+		var ele = this.get(0);
+		ele.disabled = 0;
+		if(ele.loading_img) { $(ele.loading_img).toggle(false); };
+	}
+})(jQuery);
diff --git a/py/webnotes/model/doc.py b/py/webnotes/model/doc.py
index 1077517f91..18497a9745 100755
--- a/py/webnotes/model/doc.py
+++ b/py/webnotes/model/doc.py
@@ -436,7 +436,9 @@ class Document:
 
 	def _get_perms(self):
 		if not self._perms:
-			self._perms = webnotes.conn.sql("select role, `match` from tabDocPerm where parent=%s and ifnull(`read`,0) = 1 and ifnull(permlevel,0)=0", self.doctype)
+			self._perms = webnotes.conn.sql("""select role, `match` from tabDocPerm
+				where parent=%s and ifnull(`read`,0) = 1 
+				and ifnull(permlevel,0)=0""", self.doctype)
 
 	def _get_roles(self):
 		# check if roles match/
@@ -485,14 +487,7 @@ class Document:
 					has_perm = 0
 					if verbose:
 						webnotes.msgprint("Value not allowed: '%s' for '%s'" % (self.fields.get(m, 'no value'), m))
-					
 	
-		# check for access key
-		if webnotes.form and webnotes.form.has_key('akey'):
-			import webnotes.utils.encrypt
-			if webnotes.utils.encrypt.decrypt(webnotes.form.getvalue('akey')) == self.name:
-				has_perm = 1
-				webnotes.response['print_access'] = 1
 				
 		return has_perm