diff options
-rw-r--r-- | Interfaces/English.lproj/UserManagerView.xib | 113 | ||||
-rw-r--r-- | Source/SPUserManager.m | 9 | ||||
-rw-r--r-- | Source/SPUserManager.xcdatamodel/elements | bin | 50142 -> 50105 bytes | |||
-rw-r--r-- | Source/SPUserManager.xcdatamodel/layout | bin | 5707 -> 5719 bytes |
4 files changed, 86 insertions, 36 deletions
diff --git a/Interfaces/English.lproj/UserManagerView.xib b/Interfaces/English.lproj/UserManagerView.xib index 557617f2..70f2b215 100644 --- a/Interfaces/English.lproj/UserManagerView.xib +++ b/Interfaces/English.lproj/UserManagerView.xib @@ -2,13 +2,12 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9L30</string> + <string key="IBDocument.SystemVersion">9J61</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.54</string> + <string key="IBDocument.AppKitVersion">949.46</string> <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="27"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -75,12 +74,14 @@ <int key="NSvFlags">4352</int> <string key="NSFrameSize">{194, 467}</string> <reference key="NSSuperview" ref="310332121"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTableHeaderView" key="NSHeaderView" id="98886535"> <reference key="NSNextResponder" ref="283216473"/> <int key="NSvFlags">256</int> <string key="NSFrameSize">{194, 17}</string> <reference key="NSSuperview" ref="283216473"/> + <reference key="NSWindow"/> <reference key="NSTableView" ref="265138544"/> </object> <object class="_NSCornerView" key="NSCornerView" id="1005712676"> @@ -88,6 +89,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{-26, 0}, {16, 17}}</string> <reference key="NSSuperview" ref="848314643"/> + <reference key="NSWindow"/> </object> <object class="NSMutableArray" key="NSTableColumns"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -187,6 +189,7 @@ </object> <string key="NSFrame">{{0, 17}, {194, 467}}</string> <reference key="NSSuperview" ref="848314643"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="265138544"/> <reference key="NSDocView" ref="265138544"/> <reference key="NSBGColor" ref="898983655"/> @@ -197,6 +200,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{246, 17}, {15, 308}}</string> <reference key="NSSuperview" ref="848314643"/> + <reference key="NSWindow"/> <reference key="NSTarget" ref="848314643"/> <string key="NSAction">_doScroller:</string> <double key="NSPercent">9.969040e-01</double> @@ -206,6 +210,7 @@ <int key="NSvFlags">-2147483392</int> <string key="NSFrame">{{1, 325}, {245, 15}}</string> <reference key="NSSuperview" ref="848314643"/> + <reference key="NSWindow"/> <int key="NSsFlags">1</int> <reference key="NSTarget" ref="848314643"/> <string key="NSAction">_doScroller:</string> @@ -220,6 +225,7 @@ </object> <string key="NSFrameSize">{194, 17}</string> <reference key="NSSuperview" ref="848314643"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="98886535"/> <reference key="NSDocView" ref="98886535"/> <reference key="NSBGColor" ref="898983655"/> @@ -229,6 +235,7 @@ </object> <string key="NSFrame">{{0, 22}, {194, 484}}</string> <reference key="NSSuperview" ref="490248567"/> + <reference key="NSWindow"/> <reference key="NSNextKeyView" ref="310332121"/> <int key="NSsFlags">560</int> <reference key="NSVScroller" ref="710626046"/> @@ -248,6 +255,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{-1, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="623571747"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredButtonCell" key="NSCell" id="224905719"> <int key="NSCellFlags">67239424</int> @@ -272,6 +280,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{30, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="623571747"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredButtonCell" key="NSCell" id="297146523"> <int key="NSCellFlags">67239424</int> @@ -296,6 +305,7 @@ <int key="NSvFlags">292</int> <string key="NSFrame">{{61, -1}, {32, 24}}</string> <reference key="NSSuperview" ref="623571747"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="BWAnchoredPopUpButtonCell" key="NSCell" id="17402987"> <int key="NSCellFlags">-2076049856</int> @@ -370,6 +380,7 @@ </object> <string key="NSFrameSize">{194, 23}</string> <reference key="NSSuperview" ref="490248567"/> + <reference key="NSWindow"/> <bool key="BWABBIsResizable">YES</bool> <bool key="BWABBIsAtBottom">YES</bool> <bool key="BWABBHandleIsRightAligned">NO</bool> @@ -378,6 +389,7 @@ </object> <string key="NSFrameSize">{194, 506}</string> <reference key="NSSuperview" ref="138392961"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="755335467"> @@ -390,6 +402,7 @@ <int key="NSvFlags">274</int> <string key="NSFrame">{{13, 40}, {531, 460}}</string> <reference key="NSSuperview" ref="755335467"/> + <reference key="NSWindow"/> <object class="NSMutableArray" key="NSTabViewItems"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSTabViewItem" id="820796939"> @@ -532,7 +545,7 @@ <object class="NSTabViewItem" id="1024639412"> <string key="NSIdentifier">Global Privileges</string> <object class="NSView" key="NSView" id="202198269"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder" ref="716372522"/> <int key="NSvFlags">274</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -556,6 +569,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 72}, {133, 18}}</string> <reference key="NSSuperview" ref="507349185"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="919244938"> <int key="NSCellFlags">67239424</int> @@ -583,6 +597,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 52}, {133, 18}}</string> <reference key="NSSuperview" ref="507349185"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="3268085"> <int key="NSCellFlags">67239424</int> @@ -603,10 +618,12 @@ </object> <string key="NSFrame">{{1, 1}, {175, 98}}</string> <reference key="NSSuperview" ref="223367051"/> + <reference key="NSWindow"/> </object> </object> <string key="NSFrame">{{252, 128}, {177, 114}}</string> <reference key="NSSuperview" ref="386290455"/> + <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -640,6 +657,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 190}, {65, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="68967500"> <int key="NSCellFlags">67239424</int> @@ -662,6 +680,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 170}, {85, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="410960559"> <int key="NSCellFlags">67239424</int> @@ -684,6 +703,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 150}, {65, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="231869678"> <int key="NSCellFlags">67239424</int> @@ -706,6 +726,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 130}, {70, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="144741035"> <int key="NSCellFlags">67239424</int> @@ -728,6 +749,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 110}, {70, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="967891320"> <int key="NSCellFlags">67239424</int> @@ -750,6 +772,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 90}, {142, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="315454579"> <int key="NSCellFlags">67239424</int> @@ -772,6 +795,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 70}, {142, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="40570585"> <int key="NSCellFlags">67239424</int> @@ -794,6 +818,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 50}, {142, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="799488283"> <int key="NSCellFlags">67239424</int> @@ -816,6 +841,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 30}, {142, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1072458811"> <int key="NSCellFlags">67239424</int> @@ -838,6 +864,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 10}, {142, 18}}</string> <reference key="NSSuperview" ref="1066741257"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="205758531"> <int key="NSCellFlags">67239424</int> @@ -858,10 +885,12 @@ </object> <string key="NSFrame">{{1, 1}, {231, 216}}</string> <reference key="NSSuperview" ref="517432726"/> + <reference key="NSWindow"/> </object> </object> <string key="NSFrame">{{17, 10}, {233, 232}}</string> <reference key="NSSuperview" ref="386290455"/> + <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -885,6 +914,7 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{318, 84}, {114, 32}}</string> <reference key="NSSuperview" ref="386290455"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="674356083"> <int key="NSCellFlags">67239424</int> @@ -915,6 +945,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 92}, {63, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="856008013"> <int key="NSCellFlags">67239424</int> @@ -937,6 +968,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 72}, {63, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="754659519"> <int key="NSCellFlags">67239424</int> @@ -959,6 +991,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 52}, {67, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1032540047"> <int key="NSCellFlags">67239424</int> @@ -981,6 +1014,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 32}, {63, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="127371548"> <int key="NSCellFlags">67239424</int> @@ -1003,6 +1037,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 12}, {91, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="460476562"> <int key="NSCellFlags">67239424</int> @@ -1025,6 +1060,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{152, 92}, {63, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="143275795"> <int key="NSCellFlags">67239424</int> @@ -1047,6 +1083,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{152, 72}, {63, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1016258703"> <int key="NSCellFlags">67239424</int> @@ -1069,6 +1106,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{152, 52}, {63, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="921961521"> <int key="NSCellFlags">67239424</int> @@ -1091,6 +1129,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{152, 32}, {63, 18}}</string> <reference key="NSSuperview" ref="424144569"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="489524765"> <int key="NSCellFlags">67239424</int> @@ -1111,10 +1150,12 @@ </object> <string key="NSFrame">{{1, 1}, {231, 118}}</string> <reference key="NSSuperview" ref="1050276179"/> + <reference key="NSWindow"/> </object> </object> <string key="NSFrame">{{17, 246}, {233, 134}}</string> <reference key="NSSuperview" ref="386290455"/> + <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -1138,6 +1179,7 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{318, 52}, {114, 32}}</string> <reference key="NSSuperview" ref="386290455"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="513183495"> <int key="NSCellFlags">67239424</int> @@ -1168,6 +1210,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 92}, {97, 18}}</string> <reference key="NSSuperview" ref="851437767"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="189629129"> <int key="NSCellFlags">67239424</int> @@ -1190,6 +1233,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 72}, {97, 18}}</string> <reference key="NSSuperview" ref="851437767"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="649732615"> <int key="NSCellFlags">67239424</int> @@ -1212,6 +1256,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 52}, {116, 18}}</string> <reference key="NSSuperview" ref="851437767"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="637072733"> <int key="NSCellFlags">67239424</int> @@ -1234,6 +1279,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 32}, {105, 18}}</string> <reference key="NSSuperview" ref="851437767"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1073285410"> <int key="NSCellFlags">67239424</int> @@ -1256,6 +1302,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 12}, {97, 18}}</string> <reference key="NSSuperview" ref="851437767"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="578316308"> <int key="NSCellFlags">67239424</int> @@ -1276,10 +1323,12 @@ </object> <string key="NSFrame">{{1, 1}, {175, 118}}</string> <reference key="NSSuperview" ref="871205380"/> + <reference key="NSWindow"/> </object> </object> <string key="NSFrame">{{252, 246}, {177, 134}}</string> <reference key="NSSuperview" ref="386290455"/> + <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -1301,10 +1350,13 @@ </object> <string key="NSFrame">{{17, 11}, {446, 400}}</string> <reference key="NSSuperview" ref="202198269"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrame">{{10, 33}, {511, 414}}</string> + <reference key="NSSuperview" ref="716372522"/> + <reference key="NSWindow"/> </object> <string key="NSLabel">Global Privileges</string> <reference key="NSColor" ref="409859189"/> @@ -1313,7 +1365,7 @@ <object class="NSTabViewItem" id="285628164"> <string key="NSIdentifier">Resources</string> <object class="NSView" key="NSView" id="169019919"> - <reference key="NSNextResponder" ref="716372522"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -1578,20 +1630,19 @@ </object> </object> <string key="NSFrame">{{10, 33}, {511, 414}}</string> - <reference key="NSSuperview" ref="716372522"/> </object> <string key="NSLabel">Resources</string> <reference key="NSColor" ref="409859189"/> <reference key="NSTabView" ref="716372522"/> </object> </object> - <reference key="NSSelectedTabViewItem" ref="285628164"/> + <reference key="NSSelectedTabViewItem" ref="1024639412"/> <reference key="NSFont" ref="746597359"/> <int key="NSTvFlags">0</int> <bool key="NSDrawsBackground">YES</bool> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="169019919"/> + <reference ref="202198269"/> </object> </object> <object class="NSButton" id="445730006"> @@ -1599,6 +1650,7 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{467, 12}, {76, 32}}</string> <reference key="NSSuperview" ref="755335467"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="289173129"> <int key="NSCellFlags">-2080244224</int> @@ -1620,6 +1672,7 @@ <int key="NSvFlags">289</int> <string key="NSFrame">{{385, 12}, {82, 32}}</string> <reference key="NSSuperview" ref="755335467"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="1067684076"> <int key="NSCellFlags">-2080244224</int> @@ -1639,17 +1692,20 @@ </object> <string key="NSFrame">{{195, 0}, {557, 506}}</string> <reference key="NSSuperview" ref="138392961"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> <string key="NSFrameSize">{752, 506}</string> <reference key="NSSuperview" ref="846307432"/> + <reference key="NSWindow"/> <bool key="NSIsVertical">YES</bool> <int key="NSDividerStyle">2</int> </object> </object> <string key="NSFrameSize">{752, 506}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> </object> <string key="NSScreenRect">{{0, 0}, {1920, 1178}}</string> <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string> @@ -1730,6 +1786,7 @@ <string>replication_client_priv</string> <string>replication_slave_priv</string> <string>parent</string> + <string>create_temporary_tables_priv</string> </object> <string key="NSObjectClassName">SPUserItem</string> <bool key="NSEditable">YES</bool> @@ -2237,22 +2294,6 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: selection.create_temporary_table_priv</string> - <reference key="source" ref="460063174"/> - <reference key="destination" ref="889422316"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="460063174"/> - <reference key="NSDestination" ref="889422316"/> - <string key="NSLabel">value: selection.create_temporary_table_priv</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">selection.create_temporary_table_priv</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">535</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">value: selection.lock_tables_priv</string> <reference key="source" ref="712816655"/> <reference key="destination" ref="889422316"/> @@ -2489,6 +2530,22 @@ </object> <int key="connectionID">605</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: selection.create_temporary_tables_priv</string> + <reference key="source" ref="460063174"/> + <reference key="destination" ref="889422316"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="460063174"/> + <reference key="NSDestination" ref="889422316"/> + <string key="NSLabel">value: selection.create_temporary_tables_priv</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">selection.create_temporary_tables_priv</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">606</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -3688,7 +3745,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">605</int> + <int key="maxID">606</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -3741,7 +3798,7 @@ </object> <object class="IBPartialClassDescription"> <string key="className">SPUserManager</string> - <string key="superclassName">NSObject</string> + <string key="superclassName">NSWindowController</string> <object class="NSMutableDictionary" key="actions"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> @@ -3767,19 +3824,15 @@ <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSMutableArray" key="dict.sortedKeys"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>addHostSheet</string> <string>outlineView</string> <string>tabView</string> <string>treeController</string> - <string>window</string> </object> <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> - <string>NSPanel</string> <string>NSOutlineView</string> <string>NSTabView</string> <string>NSTreeController</string> - <string>NSWindow</string> </object> </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> diff --git a/Source/SPUserManager.m b/Source/SPUserManager.m index c77c757b..8b26b001 100644 --- a/Source/SPUserManager.m +++ b/Source/SPUserManager.m @@ -62,7 +62,7 @@ privColumnsMODict = [[[NSDictionary alloc] initWithObjectsAndKeys: @"grant_option_priv",@"Grant_priv", @"show_databases_priv",@"Show_db_priv", - @"create_temporary_table_priv",@"Create_tmp_table_priv", + @"create_temporary_tables_priv",@"Create_tmp_tables_priv", @"Replication_slave_priv",@"Repl_slave_priv", @"Replication_client_priv",@"Repl_client_priv",nil] retain]; @@ -114,8 +114,7 @@ NSMutableArray *resultAsArray = [NSMutableArray array]; NSMutableArray *usersResultArray = [NSMutableArray array]; - [[self connection] selectDB:@"mysql"]; - MCPResult *result = [[[self connection] queryString:@"select * from user order by user"] retain]; + MCPResult *result = [[[self connection] queryString:@"SELECT * FROM `mysql`.`user` ORDER BY `user`"] retain]; int rows = [result numOfRows]; if (rows > 0) { @@ -505,7 +504,6 @@ - (BOOL)deleteUsers:(NSArray *)deletedUsers { - [[self connection] selectDB:@"mysql"]; NSMutableString *droppedUsers = [NSMutableString string]; for (NSManagedObject *user in deletedUsers) { @@ -525,7 +523,6 @@ - (BOOL)insertUsers:(NSArray *)insertedUsers { - [[self connection] selectDB:@"mysql"]; for(NSManagedObject *user in insertedUsers) { if ([user parent] != nil) { @@ -587,7 +584,7 @@ // Revoke privileges if ([revokePrivileges count] > 0) { - NSString *revokeStatement = [NSString stringWithFormat:@"REVOKE %@ ON *.* TO %@@%@;", + NSString *revokeStatement = [NSString stringWithFormat:@"REVOKE %@ ON *.* FROM %@@%@;", [revokePrivileges componentsJoinedByCommas], [[[user parent] valueForKey:@"user"] tickQuotedString], [[user valueForKey:@"host"] tickQuotedString]]; diff --git a/Source/SPUserManager.xcdatamodel/elements b/Source/SPUserManager.xcdatamodel/elements Binary files differindex 6766bed3..8bca9833 100644 --- a/Source/SPUserManager.xcdatamodel/elements +++ b/Source/SPUserManager.xcdatamodel/elements diff --git a/Source/SPUserManager.xcdatamodel/layout b/Source/SPUserManager.xcdatamodel/layout Binary files differindex 07b18bfd..5c8f25a4 100644 --- a/Source/SPUserManager.xcdatamodel/layout +++ b/Source/SPUserManager.xcdatamodel/layout |