Merge pull request #35 from ONE-F-M/staging

Staging to master-14
ONE-F-M · Aug 29, 2023 · 458839e · 458839e
2 parents ec6259b + f8bf761
commit 458839e
Show file tree

Hide file tree

Showing 5 changed files with 46 additions and 36 deletions.
diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml
@@ -28,7 +28,9 @@ jobs:
           cd /home/frappe/frappe-bench
           bench restart ${{secrets.PASSKEY}}
           # bench setup requirements
-          bench build
+          bench build --app one_wiki
+          bench clear-cache
+          bench clear-website-cache
           bench migrate # sync database
           # we remove any unused dependencies
           bench doctor

diff --git a/one_wiki/hooks.py b/one_wiki/hooks.py
@@ -198,6 +198,7 @@
 # Authentication and authorization
 # --------------------------------
 
+
 # auth_hooks = [
 #	"one_wiki.auth.validate"
 # ]
diff --git a/one_wiki/overrides/wiki_page.py b/one_wiki/overrides/wiki_page.py
@@ -68,7 +68,7 @@ def update(
 
 	if frappe.has_permission(doctype="Wiki Page Patch", ptype="submit", throw=False) and not draft:
 		patch.approved_by = frappe.session.user
-		patch.status = "Approved" if rejected=='false' else "Rejected"
+		patch.status = "Approved" if rejected in ['false',False] else "Rejected"
 		patch.submit()
 		out.approved = True
 
@@ -95,30 +95,28 @@ def get_sidebar_items_(self):
 
 	for sidebar_item in wiki_sidebar:
 		wiki_page = frappe.get_doc("Wiki Page", sidebar_item.wiki_page)
-		wiki_language = frappe.cache().get_value(f'wiki_language_{frappe.session.user}')
-		if wiki_language in ['en','ar']:
-			wiki_language_dict = {'en':'English','ar':'عربي'}
-			if wiki_page.language == wiki_language_dict[wiki_language]:
-				if sidebar_item.parent_label not in sidebar:
-					sidebar[sidebar_item.parent_label] = [
-						{
-							"name": wiki_page.name,
-							"type": "Wiki Page",
-							"title": wiki_page.title,
-							"route": wiki_page.route,
-							"group_name": sidebar_item.parent_label,
-						}
-					]
-				else:
-					sidebar[sidebar_item.parent_label] += [
-						{
-							"name": wiki_page.name,
-							"type": "Wiki Page",
-							"title": wiki_page.title,
-							"route": wiki_page.route,
-							"group_name": sidebar_item.parent_label,
-						}
-					]
+		wiki_language = self.language or 'English'	
+		if wiki_page.language == wiki_language:
+			if sidebar_item.parent_label not in sidebar:
+				sidebar[sidebar_item.parent_label] = [
+					{
+						"name": wiki_page.name,
+						"type": "Wiki Page",
+						"title": wiki_page.title,
+						"route": wiki_page.route,
+						"group_name": sidebar_item.parent_label,
+					}
+				]
+			else:
+				sidebar[sidebar_item.parent_label] += [
+					{
+						"name": wiki_page.name,
+						"type": "Wiki Page",
+						"title": wiki_page.title,
+						"route": wiki_page.route,
+						"group_name": sidebar_item.parent_label,
+					}
+				]
 
 	return self.get_items(sidebar)
 

diff --git a/one_wiki/public/js/editor.js b/one_wiki/public/js/editor.js
@@ -43,6 +43,7 @@ const getContent = () => {
 };
 
 const saveWikiPage = (draft = false) => {
+  console.log("INSIDE FUNC")
   const urlParams = new URLSearchParams(window.location.search);
   const isEmptyEditor = !!urlParams.get("newWiki");
 
@@ -385,11 +386,14 @@ buttons.deleteTable.addEventListener("click", () => {
 });
 
 buttons.saveWikiPage.addEventListener("click", () => {
-  
+
   if(window.is_wiki_manager){
+    console.log("CALLED HERE11111")
     saveWikiPage(draft = true);
   }
   else{
+    console.log("CALLED HERE222222")
+    console.log(window.is_wiki_manager)
     saveWikiPage();
   }
 

diff --git a/one_wiki/templates/wiki_page/templates/wiki_doc.html b/one_wiki/templates/wiki_page/templates/wiki_doc.html
@@ -89,14 +89,7 @@ <h5>On this page</h5>
 			$("#ar_lang").click(()=>{
 				change_lang($("#ar_lang").html())
 			})
-			if('{{lang}}'=='en'){
-				;
-
-			}
-			else{
-
-				;
-			}
+
 
 		function is_editable_page(){
 			let value = window.location.search ?  true :  false
@@ -115,7 +108,16 @@ <h5>On this page</h5>
 				$('.btn.btn-primary.save-wiki-page-btn.btn-sm').attr('data-tiptap-button', 'draftWikiPage')
 				$('.btn.btn-primary.btn-sm.dropdown-toggle.dropdown-toggle-split').hide()
 			}
-
+			if(('{{is_wiki_manager}}'=='1')&& '{{can_approve}}' != "True"){
+				$('.btn.btn-primary.save-wiki-page-btn.btn-sm').html("Submit")
+				$('.btn.btn-primary.save-wiki-page-btn.btn-sm').attr('data-tiptap-button', 'draftWikiPage');
+				$('.btn.btn-primary.save-wiki-page-btn.btn-sm').off('click', 'saveWikiPage');
+				$('[data-tiptap-button="saveWikiPage"]').hide()
+				$('.btn.btn-primary.save-wiki-page-btn.btn-sm').click(()=>{
+					saveWikiPage(draft=false)
+				})
+
+			}	
 			if('{{can_approve}}' == "True"){
 
 				$('.btn.btn-primary.save-wiki-page-btn.btn-sm').hide()
@@ -175,6 +177,9 @@ <h5>On this page</h5>
 
 		}
 		const saveWikiPage = (draft = false,rejected = false) => {
+			console.log("CLICKED OOO")
+			console.log(draft)
+			console.log(rejected)
 			const urlParams = new URLSearchParams(window.location.search);
 			const isEmptyEditor = !!urlParams.get("newWiki");